diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index a6b2fe2e18..5e8f230a7b 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -635,6 +635,13 @@ outputs:
                       - /var/lib/container-config-scripts/:/container-config-scripts/
                 user: root
                 command: "/usr/bin/bootstrap_host_exec nova_compute su nova -s /bin/bash -c '/container-config-scripts/pyshim.sh /container-config-scripts/nova_cell_v2_discover_hosts.py'"
+                environment:
+                  # NOTE: this should force this container to re-run on each
+                  # update (scale-out, etc.)
+                  - list_join:
+                      - ''
+                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                        - {get_param: DeployIdentifier}
             - {}
       host_prep_tasks:
         list_concat:
diff --git a/releasenotes/notes/nova_run_cell_discovery_on_each_run-11dbb6096ebbf51b.yaml b/releasenotes/notes/nova_run_cell_discovery_on_each_run-11dbb6096ebbf51b.yaml
new file mode 100644
index 0000000000..b52d69f520
--- /dev/null
+++ b/releasenotes/notes/nova_run_cell_discovery_on_each_run-11dbb6096ebbf51b.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Change-Id: I1a159a7c2ac286373df2b7c566426b37b7734961 moved the dicovery
+    to run on a single compute host to not race on simultanious nova-manage
+    commands. This change make sure we run the discover on every deploy run
+    which is required for scaling up events.