diff --git a/.github/workflows/singularity-quicktest.yml b/.github/workflows/singularity-quicktest.yml
index ea6a3007b4..88513dd13d 100644
--- a/.github/workflows/singularity-quicktest.yml
+++ b/.github/workflows/singularity-quicktest.yml
@@ -23,8 +23,6 @@ jobs:
       #     remove-dotnet: 'true'
       - name: Check docker images
         run: docker images
-      - name: Check docker containers
-        run: docker ps -a
       - name: Prune docker images
         run: docker image prune -a -f
       - name: Check docker images
@@ -63,11 +61,14 @@ jobs:
           echo $PWD
           echo $HOME
           echo $APPTAINER_TMPDIR
+          echo $APPTAINER_CACHEDIR
           echo $TMPDIR
       - name: Build Singularity image
         run: |
           mkdir $PWD/singularity_tmp
+          mkdir $PWD/singularity_cache
           export APPTAINER_TMPDIR=$PWD/singularity_tmp
+          export APPTAINER_CACHEDIR=$PWD/singularity_cache
           singularity build finn_singularity_image.sif docker-daemon://finn_docker_export:latest
         continue-on-error: true
       - name: Check free space
@@ -75,6 +76,7 @@ jobs:
       - name: Run quicktest
         run: |
           export APPTAINER_TMPDIR=$PWD/singularity_tmp
+          export APPTAINER_CACHEDIR=$PWD/singularity_cache
           export FINN_SINGULARITY=finn_singularity_image.sif
           ./run-docker.sh quicktest
       - name: Check free space
diff --git a/run-docker.sh b/run-docker.sh
index d939543a7d..f03dd145be 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -259,6 +259,7 @@ else
   SINGULARITY_EXEC="${SINGULARITY_EXEC//"-v "/"-B "}"
   SINGULARITY_EXEC="${SINGULARITY_EXEC//"-w "/"--pwd "}"
   CMD_TO_RUN="$SINGULARITY_BASE $SINGULARITY_EXEC $FINN_SINGULARITY /usr/local/bin/finn_entrypoint.sh $DOCKER_CMD"
+  gecho "FINN_SINGULARITY is set, launching Singularity container instead of Docker"
 fi
 
 $CMD_TO_RUN