diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 5a1c512fd..ad01154af 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -183,8 +183,8 @@ jobs:
       with:
         images: quay.io/natlibfi/annif
         tags: |
-          type=semver,pattern={{version}}
           type=semver,pattern={{version}},suffix=-{{date 'YYYYMMDD'}}
+          type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
     - name: Build and push to Quay.io
       uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5  # v3.2.0
diff --git a/.github/workflows/docker-rebuild.yml b/.github/workflows/docker-rebuild.yml
index 207d50c49..682ed4265 100644
--- a/.github/workflows/docker-rebuild.yml
+++ b/.github/workflows/docker-rebuild.yml
@@ -29,20 +29,23 @@ jobs:
     - name: Login to Quay.io
       uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc  # v2.2.0
       with:
-        registry: quay.io
-        username: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_USERNAME }}
-        password: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_PASSWORD }}
+        # registry: quay.io
+        # username: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_USERNAME }}
+        # password: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_PASSWORD }}
+        username: ${{ secrets.JUHON_DOCKERHUB_USERNAME }}
+        password: ${{ secrets.JUHON_DOCKERHUB_TOKEN }}
     - name: Docker meta
       id: meta
       uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176  # v4.5.0
       with:
         context: git
-        images: quay.io/natlibfi/annif
+        # images: quay.io/natlibfi/annif
+        images: jinkinen/annif
         flavor: |
           latest=false
         tags: |
-          type=semver,pattern={{version}}
           type=semver,pattern={{version}},suffix=-{{date 'YYYYMMDD'}}
+          type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
     - name: Build and push to Quay.io
       uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf  # v4.1.0