diff --git a/.github/workflows/create_containers.yml b/.github/workflows/create_containers.yml
index 9b70ee815..932fef48b 100644
--- a/.github/workflows/create_containers.yml
+++ b/.github/workflows/create_containers.yml
@@ -19,6 +19,9 @@ jobs:
         env:
           OS: ${{ matrix.os }}
         run: ./contrib/ci/generate_docker.py
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -30,6 +33,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: fwupd/fwupd/fwupd-${{matrix.os}}:latest
-          secrets: |
-            "github_token=${{ secrets.GITHUB_TOKEN }}"
+          tags: ghcr.io/fwupd/fwupd/fwupd-${{matrix.os}}:latest