diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 70a9aa86..1e7d9174 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -84,7 +84,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.1.1
+        uses: docker/setup-buildx-action@v2
         with:
           driver-opts: network=host
 
@@ -97,7 +97,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build & push the Fedora base image to local registry
-        uses: docker/build-push-action@v2.2.2
+        uses: docker/build-push-action@v3
         with:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -107,11 +107,12 @@ jobs:
           push: true
           tags: localhost:5000/fedora-base:latest
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1.8.0
+      - 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: |
@@ -122,10 +123,10 @@ jobs:
           RUN --security=insecure flatpak install -y --noninteractive ${{matrix.runtime.remote}} ${{ matrix.runtime.packages }}
 
       - name: Build & push the ${{ matrix.runtime.name }} image to Docker Hub
-        uses: docker/build-push-action@v2.2.2
+        uses: docker/build-push-action@v3
         with:
           allow: security.insecure
           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 7f2282a6..52a9c40a 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/${{ github.repository }}:gnome-40
       options: --privileged
     strategy:
       fail-fast: false
@@ -23,7 +23,7 @@ jobs:
           dnf -y install docker
       - name: Set up QEMU
         if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
       - uses: ./flatpak-builder
diff --git a/Dockerfile b/Dockerfile
index 9551edc5..b04c8444 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:latest
+FROM registry.fedoraproject.org/fedora:latest
 
 RUN dnf update -y && \
     dnf install -y dbus-daemon flatpak flatpak-builder git-lfs python3-aiohttp python3-tenacity python3-gobject xorg-x11-server-Xvfb ccache zstd && \
diff --git a/README.md b/README.md
index 4eb21003..9385827d 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ jobs:
         dnf -y install docker
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
       with:
         platforms: arm64
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v4