diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bf2a11..12f7323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ build_container:
   stage: build
   image:  deps.global.bsf.tools/quay.io/buildah/stable:latest
   variables:
-    IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+    IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI__COMMIT_SHORT_SHA"
   before_script:
     - mkdir -p /tmp/buildah-storage
     - export BUILDAH_ROOT="/tmp/buildah-storage"
@@ -16,7 +16,7 @@ build_container:
     # - buildah bud --build-arg NPM_REGISTRY=https://deps.global.bsf.tools/artifactory/api/npm/registry.npmjs.org/ --storage-driver vfs --isolation chroot -t $IMAGE_NAME .
     - buildah pull git.bitstorm.ca/bitforge/warehouse13:latest
     - buildah tag git.bitstorm.ca/bitforge/warehouse13:latest $IMAGE_NAME
-    - buildah push --storage-driver vfs $IMAGE_NAME
+    - buildah push $IMAGE_NAME
 
 deploy_helm_charts:
   stage: deploy
@@ -37,4 +37,4 @@ deploy_helm_charts:
   script:
     - kubectl config use-context $CONTEXT
     - |
-      helm upgrade --install warehouse13-dev ./helm/warehouse13 --namespace $NAMESPACE -f $VALUES_FILE
\ No newline at end of file
+      helm upgrade --install warehouse13-dev ./helm/warehouse13 --namespace $NAMESPACE -f $VALUES_FILE --set api.repository=$CI_REGISTRY_NAME --set api.tag=#CI_COMMIT_REF_SLUG-$CI__COMMIT_SHORT_SHA
\ No newline at end of file