diff --git a/.github/workflows/build-env-image.yml b/.github/workflows/build-env-image.yml
index ab0eac66..c156fd73 100644
--- a/.github/workflows/build-env-image.yml
+++ b/.github/workflows/build-env-image.yml
@@ -17,10 +17,10 @@ jobs:
       matrix:
         include:
           - arch: arm64
-            image: mgrigorov/bioconda-utils-build-env-cos7-aarch64
+            image: ${{ secrets.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-aarch64
             base_image: quay.io/condaforge/linux-anvil-aarch64
           - arch: amd64
-            image: mgrigorov/bioconda-utils-build-env-cos7
+            image: ${{ secrets.QUAY_BIOCONDA_USERNAME }}/bioconda-utils-build-env-cos7-x86_64
             base_image: quay.io/condaforge/linux-anvil-cos7-x86_64
     steps:
     - name: Checkout bioconda-containers
@@ -72,12 +72,9 @@ jobs:
       with:
         image: ${{ steps.buildah-build.outputs.image }}
         tags: ${{ steps.buildah-build.outputs.tags }}
-        # registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
-        # username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
-        # password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
-        registry: quay.io
-        username: mgrigorov
-        password: ${{ secrets.QUAY_PASSWORD }}
+        registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
+        username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
+        password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
 
   build-manifest:
     needs: [build]
@@ -88,9 +85,8 @@ jobs:
       fail-fast: false
       matrix:
         # docker-registry: [quay.io/bioconda]
-        docker-registry: [quay.io/mgrigorov]
+        docker-registry: [quay.io/${{ secrets.QUAY_BIOCONDA_USERNAME }}]
         cfg:
-          # TODO: What name to use for the manifest list ?
           - DOCKER_MANIFEST: bioconda-utils-build-env-cos7
             DOCKER_TAG: "latest"
             DOCKER_IMAGES: "<<ORG>>/bioconda-utils-build-env-cos7:<<TAG>>,<<ORG>>/bioconda-utils-build-env-cos7-aarch64:<<TAG>>"
@@ -110,12 +106,9 @@ jobs:
       - name: Login to Quay.io registry
         uses: docker/login-action@v2
         with:
-          # registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
-          # username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
-          # password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
-          registry: quay.io
-          username: mgrigorov
-          password: ${{ secrets.QUAY_PASSWORD }}
+          registry: ${{ secrets.QUAY_BIOCONDA_REPO }}
+          username: ${{ secrets.QUAY_BIOCONDA_USERNAME }}
+          password: ${{ secrets.QUAY_BIOCONDA_TOKEN }}
     
       - name: Push Docker manifest list for ${{ matrix.docker-registry }}
         uses: Noelware/docker-manifest-action@v0.3.0