diff --git a/Goovy_Jenkins/groovy_script-if_step-When b/Goovy_Jenkins/groovy_script-if_step-When
new file mode 100644
index 0000000..36fe8e9
--- /dev/null
+++ b/Goovy_Jenkins/groovy_script-if_step-When
@@ -0,0 +1,32 @@
+when {
+    anyOf {
+        allOf {
+            expression { return (env.ImgVariant).startsWith('Default-') } 
+            environment name: 'BuildDefault', value: 'true'
+        }
+        allOf {
+            expression { return (env.ImgVariant).startsWith('Extra-') }
+            environment name: 'BuildExtra', value: 'true'
+        }
+    }
+}
+
+
+stage('Build Check') {
+    steps {
+        script {
+            if (env.BuildDefault == 'true' && (env.ImgVariant).startsWith('Default-')) {
+                echo 'Building Default'
+                    BuildThisLocal = true
+            } else if (env.BuildExtra == 'true' && (env.ImgVariant).startsWith('Extra-'))  {
+                BuildThisLocal = true
+                echo 'Building Extra'
+            } else {
+                BuildThisLocal = false
+                echo 'not building'
+            }
+            env.BuildThis = BuildThisLocal                                
+        }
+        
+    }
+}
\ No newline at end of file