diff --git a/tasks/keystone_post_install.yml b/tasks/keystone_post_install.yml
index 5a97c520..62ac99d8 100644
--- a/tasks/keystone_post_install.yml
+++ b/tasks/keystone_post_install.yml
@@ -13,6 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Generate the keystone system user ssh key
+  user:
+    name: "{{ keystone_system_user_name }}"
+    generate_ssh_key: "yes"
+  delegate_to: "{{ item }}"
+  with_items: "{{ ansible_play_hosts }}"
+  when: "inventory_hostname == ansible_play_hosts[0]"
+
 - name: Retrieve default configuration files
   uri:
     url: "{{ item }}"
diff --git a/tasks/keystone_pre_install.yml b/tasks/keystone_pre_install.yml
index cc2c7e8a..e97a1065 100644
--- a/tasks/keystone_pre_install.yml
+++ b/tasks/keystone_pre_install.yml
@@ -57,7 +57,6 @@
     system: "yes"
     createhome: "yes"
     home: "{{ keystone_system_user_home }}"
-    generate_ssh_key: "yes"
   delegate_to: "{{ item }}"
   with_items: "{{ ansible_play_hosts }}"
   when: "inventory_hostname == ansible_play_hosts[0]"