diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 61f48e5..3c294a3 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -80,12 +80,12 @@ jobs:
         echo "PUBLIC_DASH_NOTEBOOK_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" > .env
         if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
         echo "Workflow_dispatch: Reuse existing frontend image tag"
-        echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }}" >> .env
+        echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }}" >> .env
         else
         echo "Push event: Update frontend image tag"
         echo "PUBLIC_DASH_FRONTEND_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.date.outputs.date }}" >> .env
         fi
-        echo "SERVER_IMAGE_TAG=${GITHUB_REF##*/}_${{ steps.get-server-tag.outputs.SERVER_IMAGE_TAG }}" >> .env
+        echo "SERVER_IMAGE_TAG=${{ steps.get-server-tag.outputs.SERVER_IMAGE_TAG }}" >> .env
 
     - name: Add, Commit, Push changes to .env file
       run: |
@@ -104,7 +104,7 @@ jobs:
         if [ "${{ github.event_name }}" == "push" ]; then
           echo ${GITHUB_REF##*/}_${{ steps.date.outputs.date }} > frontend_tag_file.txt
         else
-          echo ${GITHUB_REF##*/}_${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }} > frontend_tag_file.txt
+          echo ${{ steps.set-tags.outputs.PUBLIC_DASH_FRONTEND_IMAGE_TAG }} > frontend_tag_file.txt
         fi
         echo ${GITHUB_REF##*/}_${{ steps.date.outputs.date }} > notebook_tag_file.txt
         echo "Created tag text files"