diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index bded59ee9e..84342cd394 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -381,26 +381,24 @@ outputs:
                 comment: qemu user
       post_upgrade_tasks:
         - when:
-            - step|int == 4
-          tags:
-            - never
-            - system_upgrade_stop_services
+            - step|int == 3
           environment:
             OS_CLOUD: {get_param: RootStackName}
           block:
             - name: Get nova-consoleauth service ID
               command: openstack compute service list --service nova-consoleauth --column ID  --column Host --format yaml
               register: nova_compute_service_result
-              delegate_to: localhost
-              check_mode: no
-              run_once: yes
+              check_mode: false
+              run_once: true
               changed_when: false
+              failed_when: false
+              delegate_to: undercloud
             - name: Deleting nova-consoleauth
               command: "openstack compute service delete {{ item.ID }}"
-              loop: "{{ nova_compute_service_result.stdout | from_yaml }}"
-              run_once: yes
-              delegate_to: localhost
-              ignore_errors: yes
+              loop: "{{ nova_compute_service_result.stdout | from_yaml | default([]) }}"
+              run_once: true
+              delegate_to: undercloud
+              failed_when: false
       external_upgrade_tasks:
         - when:
             - step|int == 1