diff --git a/environments/noop-deploy-steps.yaml b/environments/noop-deploy-steps.yaml
new file mode 100644
index 0000000000..8a5c0dfbab
--- /dev/null
+++ b/environments/noop-deploy-steps.yaml
@@ -0,0 +1,6 @@
+# Disable deploy steps, useful for upgrades where we want to disable
+# deploy steps and run them for each role manually
+resource_registry:
+  OS::TripleO::DeploymentSteps: OS::Heat::None
+  OS::TripleO::Tasks::*PreConfig: OS::Heat::None
+  OS::TripleO::Tasks::*PostConfig: OS::Heat::None