diff --git a/Jenkinsfile-Squential b/Jenkinsfile-Squential
index 62daf2a..a080b2f 100644
--- a/Jenkinsfile-Squential
+++ b/Jenkinsfile-Squential
@@ -29,31 +29,31 @@ pipeline {
                 script{
                     for(ImgRelease in ImgReleaseList){
                         for(ImgVariant in ImgVariantList){
-                            stage('Build image') {
-                                when {
-                                    anyOf {
-                                        allOf {
-                                            expression { return (ImgVariant).startsWith('Default-') } 
-                                            environment name: 'BuildDefault', value: 'true'
-                                        }
-                                        allOf {
-                                            expression { return (ImgVariant).startsWith('Extra-') }
-                                            environment name: 'BuildExtra', value: 'true'
-                                        }
-                                    }
-                                }
-                                steps {
-                                // Build script
-                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                        sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant"
-                                        ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-}
-                                        sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName
-                                        sudo chown jenkins:jenkins -R $WORKSPACE/REL
-                                        mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz
-                                        '''
-                                    }
-                                }
+                            if (BuildDefault == 'true' && (ImgVariant).startsWith('Default-')) {
+                            echo 'Building Default'
+                                    BuildThisLocal = true
+                            } else if (BuildExtra == 'true' && (ImgVariant).startsWith('Extra-'))  {
+                                BuildThisLocal = true
+                                echo 'Building Extra'
+                            } else {
+                                BuildThisLocal = false
+                                echo 'not building'
                             }
+    	                    if (BuildThisLocal == 'true') {
+                                stage('Build image') {
+                                    steps {
+                                    // Build script
+                                        catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                            sh '''echo "$(date) Do Build for $ImgRelease - $ImgVariant"
+                                            ImgVariantName${ImgVariant#Default-} && ImgVariantName${ImgVariantName#Extra-}
+                                            sudo $WORKSPACE/distrobuilder build-lxc Alpine.yaml $WORKSPACE/REL/$ImgRelease-$ImgVariant/ -o image.release=$ImgRelease -o image.variant=$ImgVariantName
+                                            sudo chown jenkins:jenkins -R $WORKSPACE/REL
+                                            mv $WORKSPACE/REL/$ImgRelease-$ImgVariant/rootfs.tar.xz $ImgVariant-$ImgRelease.tar.xz
+                                            '''
+                                        }
+                                    }
+                                }
+                        }
                         }
                     }
                 }