diff --git a/playbooks/step_stop_ns_metadata_proxy.yml b/playbooks/step_stop_ns_metadata_proxy.yml
new file mode 100644
index 0000000..afee351
--- /dev/null
+++ b/playbooks/step_stop_ns_metadata_proxy.yml
@@ -0,0 +1,24 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Work around bug in init script that causes status to malfunction on tgt
+# The service will happily start over and over but stopping is tricky
+---
+# After shutdown of neutron services, neutron-ns-metadata-proxy is still present
+# This services logs to the ephemeral partition, so un-mounting is not possible
+# No upstart scripts for this service, so needs to be killed.
+- name: Kill neutron metadata proxy service
+  command: pkill -9 -f neutron-ns-metadata-proxy
+  ignore_errors: yes
diff --git a/playbooks/update_cloud.yml b/playbooks/update_cloud.yml
index c5ad48b..6691976 100644
--- a/playbooks/update_cloud.yml
+++ b/playbooks/update_cloud.yml
@@ -59,12 +59,9 @@
       with_items: overcloud_compute_services
       when: helion is not defined and instance_status == "ACTIVE" and item in existing_services
     - service: name=nova-compute state=stopped enabled=no
-    # After shutdown of neutron services, neutron-ns-metadata-proxy is still present
-    # This services logs to the ephemeral partition, so un-mounting is not possible
-    # No upstart scripts for this service, so needs to be killed.
-    - name: Kill neutron metadata proxy service
-      command: pkill -9 -f neutron-ns-metadata-proxy
-      ignore_errors: yes
+      when: instance_status == "ACTIVE"
+    - include: step_stop_ns_metadata_proxy.yml
+      when: instance_status == "ACTIVE"
 - hosts: swift-storage
   name: swift-storage
   tags: shutdown-cloud
@@ -117,6 +114,8 @@
       when: helion is not defined and instance_status == "ACTIVE" and item in existing_services
     - include: stop_tgt.yml
       when: instance_status == "ACTIVE"
+    - include: step_stop_ns_metadata_proxy.yml
+      when: instance_status == "ACTIVE"
 - hosts: controller-bootstrap
   name: Disable Overcloud Controller Bootstrap node
   tags: shutdown-cloud
@@ -133,6 +132,8 @@
       when: helion is defined and instance_status == "ACTIVE" and item in existing_services
     - include: stop_tgt.yml
       when: instance_status == "ACTIVE"
+    - include: step_stop_ns_metadata_proxy.yml
+      when: instance_status == "ACTIVE"
 # Critically, we need to select a single node of the galera cluster to
 # be the 'last'. So controller-bootstrap fits that bill for now. We will have
 # to select one to be the "special" node eventually, we can do that with