diff --git a/Jenkinsfile b/Jenkinsfile
index 0235a79e5..3d4fc2caa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,9 +36,6 @@ pipeline {
                         case 'test':
                             env.NODE_ENV = 'test'
                             break
-                        default:
-                            env.NODE_ENV = 'development'
-                            break
                     }
                 }
                 echo "Committer: ${env.GIT_COMMITTER_EMAIL}"
@@ -124,9 +121,10 @@ pipeline {
             }
         }
         stage('Cleanup') {
-            when {
-                not { branch 'dev' }
-            }
+            when { anyOf {
+                branch 'test'
+                branch 'master'
+            }}
             steps {
                 sh 'docker logout $REGISTRY'
             }