diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index b1d7121..9317db1 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -96,6 +96,7 @@
     --admin-user {{ nc_admin }} --admin-pass {{ nc_admin_pass }} \
     --data-dir {{ nc_dir }}/public_html/data
   become_user: www-data
+  register: nextcloud_install
   args:
     chdir: "{{ nc_dir }}/public_html"
     creates: "{{ nc_dir }}/public_html/config/config.php"
@@ -106,6 +107,7 @@
   become_user: www-data
   args:
     chdir: "{{ nc_dir }}/public_html"
+  when: nextcloud_install.changed
 
 - name: "Enable Apache2 Module: rewrite"
   apache2_module: name=rewrite state=present
diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml
index 1c9bce6..d614065 100644
--- a/roles/wordpress/tasks/main.yml
+++ b/roles/wordpress/tasks/main.yml
@@ -58,10 +58,16 @@
     group: "www-data"
     remote_src: yes
 
+- name: Stat WordPress Salts
+  stat:
+    path: "{{ wp_dir }}/salts.txt"
+  register: salts
+
 - name: Generate Keys and Salts
   get_url:
     url: https://api.wordpress.org/secret-key/1.1/salt/
     dest: "{{ wp_dir }}/salts.txt"
+  when: not salts.stat.exists
 
 - name: Grab Keys and Salts
   slurp: src="{{ wp_dir }}/salts.txt"