diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index ae34372..23c2c25 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Login to container registry
         uses: docker/login-action@v2
         with:
-          registry: ghcr.io/${{ env.REPOSITORY_OWNER }}
+          registry: ghcr.io
           username: ${{ env.REPOSITORY_OWNER }}
           password: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
 
@@ -22,9 +22,11 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           build-args: --build-arg=DESKTOP_ENVIRONMENT_USER=${{ env.REPOSITORY_OWNER }} --build-arg=DESKTOP_ENVIRONMENT_GITHUB_USER=${{ env.REPOSITORY_OWNER }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           file: docker/Dockerfile
-          tags: desktop-environment
-          push_git_tag: true
+          push: true
+          tags: ${{ env.REPOSITORY_OWNER }}/desktop-environment:latest
 
       - name: Run desktop environment tests
         run: ./docker/scripts/test.sh