diff --git a/.github/actions/docker-push-variables/action.yml b/.github/actions/docker-push-variables/action.yml
index ee52f8d740..2e4931c15f 100644
--- a/.github/actions/docker-push-variables/action.yml
+++ b/.github/actions/docker-push-variables/action.yml
@@ -68,10 +68,12 @@ runs:
             for name in image_names:
                 image_tags += [
                     f"{name}:{version}",
-                    f"{name}:{version_family}",
                 ]
             if not prerelease:
-                image_tags += [f"{name}:latest"]
+                image_tags += [
+                    f"{name}:latest",
+                    f"{name}:{version_family}",
+                ]
         else:
             suffix = ""
             if image_arch and image_arch != "amd64":
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index c6d0ec87bf..909592c9c7 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -172,8 +172,8 @@ jobs:
           image-name: ghcr.io/goauthentik/server
       - name: Get static files from docker image
         run: |
-          docker pull ghcr.io/goauthentik/server:${{ steps.ev.outputs.imageMainTag }}
-          container=$(docker container create ghcr.io/goauthentik/server:${{ steps.ev.outputs.imageMainTag }})
+          docker pull ${{ steps.ev.outputs.imageMainTag }}
+          container=$(docker container create ${{ steps.ev.outputs.imageMainTag }})
           docker cp ${container}:web/ .
       - name: Create a Sentry.io release
         uses: getsentry/action-release@v1