diff --git a/.github/workflows/global-api-tag.yml b/.github/workflows/global-api-tag.yml
index b9ee4d0de..b2a0193c5 100644
--- a/.github/workflows/global-api-tag.yml
+++ b/.github/workflows/global-api-tag.yml
@@ -37,7 +37,7 @@ jobs:
           export MAJOR=${VERSION%.*.*}
           export MINOR=${VERSION%.*}
           echo Version: ${VERSION} Major: ${MAJOR} Minor: ${MINOR}
-          docker build -t $IMAGE:$SHA .
+          docker build -t $IMAGE:$SHA global-api
           docker tag $IMAGE:$SHA $IMAGE:$VERSION
           docker tag $IMAGE:$SHA $IMAGE:$MAJOR
           docker tag $IMAGE:$SHA $IMAGE:$MINOR
diff --git a/.github/workflows/web-tag.yml b/.github/workflows/web-tag.yml
index 68a4f38e7..d9394a21f 100644
--- a/.github/workflows/web-tag.yml
+++ b/.github/workflows/web-tag.yml
@@ -72,14 +72,15 @@ jobs:
     - name: Pushing citycatalyst to GHCR
       env:
         SHA: ${{ github.sha }}
+        REF: ${{ github.ref }}
         IMAGE: ghcr.io/open-earth-foundation/citycatalyst
 
       run: |
-        export VERSION=`node -pe "require('./package.json').version"`
+        export VERSION=${REF#refs/tags/v}
         export MAJOR=${VERSION%.*.*}
         export MINOR=${VERSION%.*}
         echo Version: ${VERSION} Major: ${MAJOR} Minor: ${MINOR}
-        docker build -t $IMAGE:$SHA .
+        docker build -t $IMAGE:$SHA app
         docker tag $IMAGE:$SHA $IMAGE:$VERSION
         docker tag $IMAGE:$SHA $IMAGE:$MAJOR
         docker tag $IMAGE:$SHA $IMAGE:$MINOR