diff --git a/.github/actions/build_container/action.yaml b/.github/actions/build_container/action.yaml
index 14339e1..2216468 100644
--- a/.github/actions/build_container/action.yaml
+++ b/.github/actions/build_container/action.yaml
@@ -21,6 +21,12 @@ inputs:
     description: Extra args to pass to buildah
     required: false
     default: ''
+  DOCKERHUB_USER:
+    description: Username for Dockerhub authentication
+    required: true
+  DOCKERHUB_PASSWORD:
+    description: Password for Dockerhub authentication
+    required: true
   GHCR_USER:
     description: Username for GHCR authentication
     required: true
@@ -52,6 +58,7 @@ runs:
         echo "${{ inputs.SPACK_DEPLOYMENT_KEY_PUB }}" > ${{ inputs.BUILD_PATH }}/key.pub
         echo "${{ inputs.SPACK_DEPLOYMENT_KEY_PRIVATE }}" > ${{ inputs.BUILD_PATH }}/key
         aws ecr get-login-password --region us-east-1 | buildah login --username AWS --password-stdin ${{ inputs.AWS_ECR_URL }}
+        buildah login --username ${{ inputs.DOCKERHUB_USER }} --password ${{ inputs.DOCKERHUB_PASSWORD }} docker.io
         buildah login --username ${{ inputs.GHCR_USER }} --password ${{ inputs.GHCR_TOKEN }} ghcr.io
         # This is written like that in case $BUILDAH_EXTRA_ARGS has args that require spaces,
         # which is tricky with shell variable expansion.  Similar to Kaniko, see also:
diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
index 7e5152f..5aa96cd 100644
--- a/.github/workflows/spacktainer.yaml
+++ b/.github/workflows/spacktainer.yaml
@@ -28,6 +28,8 @@ jobs:
             --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg
             SPACK_BRANCH=develop
          # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
           SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
           SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
   runtime-container-job:
@@ -56,6 +58,8 @@ jobs:
             --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME" --build-arg
             SPACK_BRANCH=develop
          # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
           SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
           SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}
   spacktainer-build-job:
@@ -111,5 +115,7 @@ jobs:
             --build-arg MIRROR_AUTH_ARG="\"--s3-access-key-id='${{ secrets.AWS_CACHE_ACCESS_KEY_ID }}
             --s3-access-key-secret=${{ secrets.AWS_CACHE_SECRET_ACCESS_KEY }}'\""
           # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
           SPACK_DEPLOYMENT_KEY_PUB: ${{ secrets.SPACK_DEPLOYMENT_KEY_PUB }}
           SPACK_DEPLOYMENT_KEY_PRIVATE: ${{ secrets.SPACK_DEPLOYMENT_KEY_PRIVATE }}