diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 447c65e..3cafc91 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -64,7 +64,7 @@ jobs:
       - name: "Build flatpak"
         run: |
           # Pull the Docker image
-          docker pull ghcr.io/retrodeck/retrodeck-builder:latest
+          docker pull ebassi/flathub:base
       
           # Configure Git
           git config --global protocol.file.allow always
@@ -73,8 +73,8 @@ jobs:
           docker run --rm \
             -v "${GITHUB_WORKSPACE}:/workspace" \
             -w /workspace \
-            ghcr.io/retrodeck/retrodeck-builder:latest \
-            --user --force-clean \
+            ebassi/flathub:base \
+            flatpak-builder --user --force-clean \
             --install-deps-from=flathub \
             --install-deps-from=flathub-beta \
             --repo="/workspace/artifacts-repo" \