diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index 3ae6630d..ed4c109f 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -78,10 +78,11 @@ jobs:
           tags: |
             ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }}
             ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest
-            frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
-            frikky/shuffle-${{ matrix.app }}:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }}
             ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:latest
+            frikky/shuffle-${{ matrix.app }}:${{ matrix.version }}
+            frikky/shuffle-${{ matrix.app }}:latest
+            frikky/shuffle:${{ matrix.app }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}