diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 12e75c74b..33bfa735a 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -11,17 +11,22 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Truncate ref
+        run:
+          echo "##[set-output name=tag;]${GITHUB_REF#refs/tags/}"
+        id: tref
+
       - name: Build App CI container
-        run: docker build -f docker/app_ci . --build-arg="extra_vars=--extra-vars ccf_ver=$GITHUB_REF" -t ccfciteam/ccf-app-ci:$GITHUB_REF
+        run: docker build -f docker/app_ci . --build-arg="extra_vars=--extra-vars ccf_ver=${{steps.tref.outputs.tag}}" -t ccfciteam/ccf-app-ci:${{steps.tref.outputs.tag}}
         
       - name: Build App Run container
-        run: docker build -f docker/app_run . --build-arg="extra_vars=--extra-vars ccf_ver=$GITHUB_REF" -t ccfciteam/ccf-app-run:$GITHUB_REF
+        run: docker build -f docker/app_run . --build-arg="extra_vars=--extra-vars ccf_ver=${{steps.tref.outputs.tag}}" -t ccfciteam/ccf-app-run:${{steps.tref.outputs.tag}}
 
       - name: Log in
         run: docker login -u amchamay -p ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Push App CI container
-        run: docker push ccfciteam/ccf-app-ci:$GITHUB_REF
+        run: docker push ccfciteam/ccf-app-ci:${{steps.tref.outputs.tag}}
 
       - name: Build App Run container
-        run: docker push ccfciteam/ccf-app-run:$GITHUB_REF
\ No newline at end of file
+        run: docker push ccfciteam/ccf-app-run:${{steps.tref.outputs.tag}}
\ No newline at end of file