diff --git a/tasks/octavia_keypair.yml b/tasks/octavia_keypair.yml
index c8ae8270..250c1f23 100644
--- a/tasks/octavia_keypair.yml
+++ b/tasks/octavia_keypair.yml
@@ -13,38 +13,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Create keypair for Octavia
+- name: Create keypair
+  register: _octavia_keypair
+  openstack.cloud.keypair:
+    auth:
+      auth_url: "{{ keystone_service_adminurl }}"
+      username: "{{ octavia_service_user_name }}"
+      password: "{{ octavia_service_password }}"
+      project_name: "{{ octavia_service_project_name }}"
+      user_domain_name: "{{ octavia_service_user_domain_id }}"
+      project_domain_name: "{{ octavia_service_project_domain_id }}"
+    state: "{{ (octavia_ssh_enabled | bool) | ternary('present', 'absent') }}"
+    interface: admin
+    verify: "{{ not keystone_service_adminuri_insecure }}"
+    name: "{{ octavia_ssh_key_name }}"
   delegate_to: "{{ octavia_keypair_setup_host }}"
   vars:
     ansible_python_interpreter: "{{ octavia_keypair_setup_host_python_interpreter }}"
-  block:
-    - name: Create keypair
-      register: _octavia_keypair
-      openstack.cloud.keypair:
-        auth:
-          auth_url: "{{ keystone_service_adminurl }}"
-          username: "{{ octavia_service_user_name }}"
-          password: "{{ octavia_service_password }}"
-          project_name: "{{ octavia_service_project_name }}"
-          user_domain_name: "{{ octavia_service_user_domain_id }}"
-          project_domain_name: "{{ octavia_service_project_domain_id }}"
-        state: "{{ (octavia_ssh_enabled | bool) | ternary('present', 'absent') }}"
-        interface: admin
-        verify: "{{ not keystone_service_adminuri_insecure }}"
-        name: "{{ octavia_ssh_key_name }}"
 
-    - name: Write private key locally
-      copy:
-        content: "{{ _octavia_keypair.key.private_key }}"
-        dest: "{{ lookup('env', 'HOME') }}/.ssh/{{ octavia_ssh_key_name }}"
-      when:
-        - _octavia_keypair is changed
-        - octavia_ssh_enabled
+- name: Write private key locally
+  copy:
+    content: "{{ _octavia_keypair.key.private_key }}"
+    dest: "{{ lookup('env', 'HOME') }}/.ssh/{{ octavia_ssh_key_name }}"
+  delegate_to: localhost
+  when:
+    - _octavia_keypair is changed
+    - octavia_ssh_enabled
 
-    - name: Remove private key from deploy host after use
-      file:
-        path: "{{ lookup('env', 'HOME') }}/.ssh/{{ octavia_ssh_key_name }}"
-        state: absent
-      when:
-        - _octavia_keypair is changed
-        - not octavia_ssh_enabled
+- name: Remove private key from deploy host after use
+  file:
+    path: "{{ lookup('env', 'HOME') }}/.ssh/{{ octavia_ssh_key_name }}"
+    state: absent
+  delegate_to: localhost
+  when:
+    - not octavia_ssh_enabled