diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 198b66ed..c1d443b7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -91,11 +91,12 @@ jobs:
           push: true
           tags: localhost:5000/fedora-base:latest
 
-      - name: Login to Docker Hub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Write the Dockerfile for the ${{ matrix.runtime.name }} runtime
         run: |
@@ -112,4 +113,4 @@ jobs:
           context: .
           file: ${{ matrix.runtime.name }}.Dockerfile
           push: true
-          tags: bilelmoussaoui/flatpak-github-actions:${{ matrix.runtime.name }}
+          tags: ghcr.io/${{ github.repository }}:${{ matrix.runtime.name }}
diff --git a/.github/workflows/flatpak-test.yml b/.github/workflows/flatpak-test.yml
index 81a89715..e6fc896f 100644
--- a/.github/workflows/flatpak-test.yml
+++ b/.github/workflows/flatpak-test.yml
@@ -9,7 +9,7 @@ jobs:
     name: Flatpak Builder
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      image: ghcr.io/bilelmoussaoui/flatpak-github-actions:gnome-40
       options: --privileged
     strategy:
       fail-fast: false