#!/bin/bash
         set -e -o pipefail
         cd kubernetes/
-        if [ "$GERRIT_BRANCH" != "staging" ]; then
-          if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-            echo "[ERROR] Only release images are allowed in helm charts."
-            exit 1
-          fi
-        fi
         make all
     subproject_build_script: |
         #!/bin/bash
         cd kubernetes/
-        if [ "$GERRIT_BRANCH" != "staging" ]; then
-          if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-            echo "[ERROR] Only release images are allowed in helm charts."
-            exit 1
-          fi
-        fi
         make common
         make {subproject}
     oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: 'kubernetes/vnfsdk/**'
 
     jobs:
+      - '{project-name}-{stream}-image-verify':
+          files: '**'
       - '{project-name}-{stream}-verify-helm':
           build_script: '{oom_build_script}'
           files: '**'
 
--- /dev/null
+---
+- job-template:
+    name: '{project-name}-{stream}-image-verify'
+    project-type: freestyle
+    path: '$WORKSPACE'
+    concurrent: true
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: '{project}-Helm-Verify'
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - shell: 'make check-for-staging-images | true'
+
+    publishers:
+      - infra-shiplogs: