diff --git a/helpers/build_image.yaml b/helpers/build_image.yaml
index 2541dbf46dd7d18ec420677dc433a8bd95ad811e..dcfc9eb2942dd203507b185f5ed032017903aa1b 100644
--- a/helpers/build_image.yaml
+++ b/helpers/build_image.yaml
@@ -17,6 +17,7 @@
   variables:
     IMAGE_NAME: ""
     IMAGE_DIR: ""
+    TEST_SCRIPTS: ""
   stage: build image
   script:
     - image_url="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}"
@@ -28,5 +29,8 @@
     - echo $docker_tag
     - docker pull ${image_url}:latest || true
     - docker build --cache-from ${image_url}:latest -t "${image_url}:latest" -t "${image_url}:${docker_tag}" ${IMAGE_DIR}
+    - for test_script in ${TEST_SCRIPTS}; do
+        $test_script;
+      done
     - docker push ${image_url}:${docker_tag}
     - docker push ${image_url}:latest
diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml
index 137f30a6c745cb3bd8dc21a4e9e086ea57045e58..eb88b4de46858ea74707a6a3034f48de18960aa2 100644
--- a/helpers/helm_base.yaml
+++ b/helpers/helm_base.yaml
@@ -4,6 +4,7 @@
   image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/gcloud-kubectl-helm/gcloud-kubectl-helm:6d3e308b
   before_script:
     - export KUBECONFIG="$kubekorner_k3s_config"
+    - export HELM_EXPERIMENTAL_OCI="1"
     - docker info
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
 #    - source ./helpers/shell_aliases.sh