diff --git a/.github/workflows/release-selfhost.yml b/.github/workflows/release-selfhost.yml
index 1d1ee381be..2a31eccf2e 100644
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@@ -25,15 +25,16 @@ jobs:
           docker pull budibase/worker:$release_tag
 
           # Tag apps and worker images
-          docker tag budibase/apps:$release_tag latest
-          docker tag budibase/worker:$release_tag latest
+          docker tag budibase/apps:$release_tag budibase/apps:$SELFHOST_TAG
+          docker tag budibase/worker:$release_tag budibase/worker:$SELFHOST_TAG
           
           # Push images
-          docker push --all-tags budibase/apps
-          docker push --all-tags budibase/apps
+          docker push budibase/apps:$SELFHOST_TAG
+          docker push budibase/worker:$SELFHOST_TAG
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
+          SELFHOST_TAG: latest
       
       - name: Setup Helm 
         uses: azure/setup-helm@v1