diff --git a/workbooks/deployment.yaml b/workbooks/deployment.yaml
index 0a492dc79..f6d7ede19 100644
--- a/workbooks/deployment.yaml
+++ b/workbooks/deployment.yaml
@@ -366,7 +366,6 @@ workflows:
           inventory: <% $.inventory %>
           playbook: <% $.get('work_dir') %>/<% execution().id %>/deploy_steps_playbook.yaml
           remote_user: tripleo-admin
-          ssh_extra_args: '-o StrictHostKeyChecking=no'
           ssh_private_key: <% $.private_key %>
           use_openstack_credentials: true
           verbosity: <% $.get('verbosity') %>
diff --git a/workbooks/octavia_post.yaml b/workbooks/octavia_post.yaml
index 53f18642b..77a9a52cf 100644
--- a/workbooks/octavia_post.yaml
+++ b/workbooks/octavia_post.yaml
@@ -108,8 +108,6 @@ workflows:
           become: true
           become_user: root
           ssh_private_key: <% $.private_key %>
-          ssh_common_args: '-o StrictHostKeyChecking=no'
-          ssh_extra_args: '-o UserKnownHostsFile=/dev/null'
           extra_env_variables: <% $.ansible_extra_env_variables %>
           extra_vars:
             os_password: <% $.overcloud_password %>
diff --git a/workbooks/swift_ring_rebalance.yaml b/workbooks/swift_ring_rebalance.yaml
index 510e05143..8e858d465 100644
--- a/workbooks/swift_ring_rebalance.yaml
+++ b/workbooks/swift_ring_rebalance.yaml
@@ -20,8 +20,6 @@ workflows:
           output: <% task().result %>
         input:
           ssh_private_key: <% task(get_private_key).result %>
-          ssh_common_args: '-o StrictHostKeyChecking=no'
-          ssh_extra_args: '-o UserKnownHostsFile=/dev/null'
           verbosity: 1
           remote_user: heat-admin
           become: true