diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml
index c519f62a4b..98d1115ab1 100644
--- a/playbooks/manual/upgrade/bodhi.yml
+++ b/playbooks/manual/upgrade/bodhi.yml
@@ -148,20 +148,22 @@
     command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi_openshift_pods }}
     when: env == "staging"
   # Redeploy the build config as it may request a newer version in the Dockerfile
+  # Only do it on prod because staging tracks a branch
   - import_role:
       name: openshift/object
     vars:
       app: bodhi
       template: buildconfig.yml
       objectname: buildconfig.yml
-    when: env == "staging"
+    when: env != "staging"
   # Start a build with the new buildconfig
+  # Only do it on prod because staging builds are triggered by Github's webhook
   - import_role:
       name: openshift/start-build
     vars:
       app: bodhi
       buildname: bodhi-base
-    when: env == "staging"
+    when: env != "staging"
 
   post_tasks:
   - name: tell nagios to unshush w.r.t. the frontend