diff --git a/build-k8s-lenz.jenkins b/build-k8s-lenz.jenkins
index a796221..e211203 100644
--- a/build-k8s-lenz.jenkins
+++ b/build-k8s-lenz.jenkins
@@ -6,6 +6,7 @@ def repositoryCreds = "harbor-repository-creds"
 def workspace
 def k8slensVersion
 def jsNodeID
+def skipBuild = true
 
 def label = "kubernetes-${UUID.randomUUID().toString()}"
 def templateName = "pipeline-worker"
@@ -68,10 +69,26 @@ pipeline {
                         ).trim()
                     }
                 }
+            if (k8slensVersion ==~ 'refs\\/tags\\/([5-9]|[0-9]{2,})\\.[0-9]+\\.[0-9]+$') {
+                if (k8slensVersion ==~ 'refs\\/tags\\/5\\.5\\.[0-9]+$') {
+                        echo "Version (${k8slensVersion}) is valid, we will build it with node 14."
+                        jsNodeID = 'node-14'
+                    } else if (k8slensVersion ==~ 'refs\\/tags\\/5\\.6\\.[0-9]+$') {
+                        echo "Version (${k8slensVersion}) is valid, we will build it with node 16."
+                        jsNodeID = 'node-16'
+                    }
+                    echo "Version (${k8slensVersion}) is not valid, we will not build it."
+                    skipBuild = false
+                }
             }
         }
 
         stage('Pull K8S Lens Source Code') {
+            when {
+                expression {
+                    return skipBuild
+                }
+            }
             steps {
                 script {
                     dir("lens") {
@@ -106,16 +123,7 @@ pipeline {
         stage ('Build K8S Lens') {
             when {
                 expression {
-                    if (k8slensVersion ==~ 'refs\\/tags\\/([5-9]|[0-9]{2,})\\.[0-9]+\\.[0-9]+$') {
-                        if (k8slensVersion ==~ 'refs\\/tags\\/5\\.5\\.[0-9]+$') {
-                            jsNodeID = 'node-14'
-                            return true
-                        } else if (k8slensVersion ==~ 'refs\\/tags\\/5\\.6\\.[0-9]+$') {
-                            jsNodeID = 'node-16'
-                            return true
-                        }
-                        return false
-                    }
+                    return skipBuild
                 }
             }
             steps {
@@ -135,14 +143,7 @@ pipeline {
         stage ('Push Artifacts') {
             when {
                 expression {
-                    if (k8slensVersion ==~ 'refs\\/tags\\/([5-9]|[0-9]{2,})\\.[0-9]+\\.[0-9]+$') {
-                        if (k8slensVersion ==~ 'refs\\/tags\\/5\\.5\\.[0-9]+$') {
-                            return true
-                        } else if (k8slensVersion ==~ 'refs\\/tags\\/5\\.6\\.[0-9]+$') {
-                            return true
-                        }
-                        return false
-                    }
+                    return skipbuild
                 }
             }
             steps {