diff --git a/templates/deploy.yml b/templates/deploy.yml
index 4ea206be911030e0157faf90e4feb7d0c661fa5c..8a0371e7769d0f13b8cf428f2fb65f3a2ae7761a 100644
--- a/templates/deploy.yml
+++ b/templates/deploy.yml
@@ -31,15 +31,15 @@ spec:
   after_script:
     - dokku-unlock
 
-deploy-prod:
+"deploy-$[[ inputs.environment ]]":
   extends: .dokku
   environment:
     name: $[[ inputs.environment ]]
     url: $[[ inputs.url ]]
     action: start
-    on_stop: stop-prod
+    on_stop: stop-deploy-$[[ inputs.environment ]]
 
-stop-deploy-dokku:
+"stop-deploy-$[[ inputs.environment ]]":
   extends: .dokku-stop
   environment:
     name: $[[ inputs.environment ]]