diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml
index aedd1c12..fdc9387f 100644
--- a/.github/workflows/dockerbuild.yaml
+++ b/.github/workflows/dockerbuild.yaml
@@ -41,28 +41,24 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-#        Use below configuration for ghcr.io
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.repository_owner }}
-#          password: ${{ secrets.CR_PAT }} 
-      - name: Dockerhub Build and push 
-        id: docker_build_dockerhub
-        uses: docker/build-push-action@v2
-        env:
-          BUILDX_NO_DEFAULT_LOAD: true
-        with:
-          context: ${{ matrix.path }}/
-          file: ${{ matrix.path }}/Dockerfile          
-          platforms: linux/amd64,linux/arm64
-          #,linux/386 - no node image I guess?
-          push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
+      #- name: Login to DockerHub
+      #  uses: docker/login-action@v2
+      #  with:
+      #    username: ${{ secrets.DOCKERHUB_USERNAME }}
+      #    password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      #- name: Dockerhub Build and push 
+      #  id: docker_build_dockerhub
+      #  uses: docker/build-push-action@v2
+      #  env:
+      #    BUILDX_NO_DEFAULT_LOAD: true
+      #  with:
+      #    context: ${{ matrix.path }}/
+      #    file: ${{ matrix.path }}/Dockerfile          
+      #    platforms: linux/amd64,linux/arm64
+      #    #,linux/386 - no node image I guess?
+      #    push: true
+      #    tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
 
       - name: Login to Ghcr 
         uses: docker/login-action@v2
@@ -81,7 +77,7 @@ jobs:
           file: ${{ matrix.path }}/Dockerfile          
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
+          tags: frikky/shuffle-${{ matrix.app }}:nightly
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}