diff --git a/.github/workflows/docker-rebuild.yml b/.github/workflows/docker-rebuild.yml
index 8f6139acf..9d45ea3be 100644
--- a/.github/workflows/docker-rebuild.yml
+++ b/.github/workflows/docker-rebuild.yml
@@ -28,16 +28,15 @@ jobs:
     - name: Login to Quay.io
       uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc  # v2.2.0
       with:
-        # registry: quay.io  # TODO Switch back to quay.io
-        username: ${{ secrets.JUHON_DOCKERHUB_USERNAME }}
-        password: ${{ secrets.JUHON_DOCKERHUB_TOKEN }}
+        registry: quay.io
+        username: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_USERNAME }}
+        password: ${{ secrets.YHTEENTOIMIVUUSPALVELUT_QUAY_IO_PASSWORD }}
     - name: Docker meta
       id: meta
       uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176  # v4.5.0
       with:
         context: git
-        images: jinkinen/annif
-        # images: quay.io/natlibfi/annif # TODO Switch back
+        images: quay.io/natlibfi/annif
         flavor: |
           latest=false
         tags: |