diff --git a/.github/workflows/apptainer-image.yml b/.github/workflows/apptainer-image.yml
index 004b0e0..4b9d8ed 100644
--- a/.github/workflows/apptainer-image.yml
+++ b/.github/workflows/apptainer-image.yml
@@ -23,8 +23,9 @@ jobs:
           cont_name=$(echo "${GITHUB_REF_NAME:-}" | sed -E 's/^sif-//; s/-v[0-9]+[.].*$//')
           echo "Container name is $cont_name."
           [ -d "${cont_name:-}" ] || exit 1
-          cd "${cont_name}"
-          apptainer build --fakeroot --fix-perms --warn-unused-build-args --build-arg ORAS_REPO="${{ github.repository }}" ../${cont_name}.sif Singularity && popd
+          pushd "${cont_name}"
+          apptainer build --fakeroot --fix-perms --warn-unused-build-args --build-arg ORAS_REPO="${{ github.repository }}" ../${cont_name}.sif Singularity
+          popd
           tag="${tag:-latest}"
           echo "Tag is $tag."
           echo "tag=$tag" >> $GITHUB_ENV