diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index ac58fd51..7d95cd0c 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -25,14 +25,6 @@ jobs:
         with:
           ref: ${{ github.GITHUB_REF }}
 
-      # Log into the GitHub Container Registry so we can push the image
-      - name: Log in to Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       # Get tag/release information for docker tags
       - name: Docker Metadata
         id: metadata
@@ -68,6 +60,14 @@ jobs:
       - name: Assert no outputs present in jupyter notebook
         uses: ResearchSoftwareActions/EnsureCleanNotebooksAction@1.1
 
+      # Log into the GitHub Container Registry so we can push the image
+      - name: Log in to Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
diff --git a/Dockerfile b/Dockerfile
index 110647b0..389ff315 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ RUN conda config --quiet --add channels conda-forge \
     && conda config --quiet --add channels bioconda \
     && conda config --quiet --add channels r \
     # Remove python from pinned versions; this allows us to update python. From: https://stackoverflow.com/a/11245372 \
-    && sed -i "s/^python*/${PYTHON_VERSION}/" /opt/conda/conda-meta/pinned \
+    && sed -i "/^python 3/s/.*/python ${PYTHON_VERSION}" /opt/conda/conda-meta/pinned \
     # && mamba install --quiet --yes python=${PYTHON_VERSION} \
     && mamba env update --quiet --name=base --file="${HOME}/environment.yaml" \
     && mamba clean --quiet --all --force-pkgs-dirs --yes \