diff --git a/roles/freeipa_server/tasks/install_freeipa_server.yml b/roles/freeipa_server/tasks/install_freeipa_server.yml
index 8b3b83a79..c657d3394 100644
--- a/roles/freeipa_server/tasks/install_freeipa_server.yml
+++ b/roles/freeipa_server/tasks/install_freeipa_server.yml
@@ -29,4 +29,6 @@
 - name: 'Run FreeIPA Install'
   become: true
   shell:
-    cmd: ipa-server-install -U -r {{ freeipa_server_realm }} -p {{ freeipa_server_directory_manager_password }} -a {{ freeipa_server_directory_admin_password }} creates=/etc/krb5.keytab
+    cmd: ipa-server-install -U -r {{ freeipa_server_realm }} -p {{ freeipa_server_directory_manager_password }} -a {{ freeipa_server_directory_admin_password }}
+  args:
+    creates: /etc/krb5.keytab
diff --git a/roles/freeipa_server/tasks/main.yml b/roles/freeipa_server/tasks/main.yml
index 54f095122..90de1a17d 100644
--- a/roles/freeipa_server/tasks/main.yml
+++ b/roles/freeipa_server/tasks/main.yml
@@ -1,3 +1,4 @@
 ---
 - include_tasks: install_freeipa_server.yml
 - include_tasks: install_freeipa_client.yml
+  when: katello_server_origin is defined