diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85085dd4a0bec55e66c1229bf9b6a9c568744a28..53abef6708fbd5b6a224e41f63de6374d0d5c9fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ eic_docker:
 eic_singularity:
   stage: phase2
   tags:
-     - singularity
+     - eic0 docker
   script:
      - cp containers/singularity/eic.def .
      - /bin/bash .gitlabci/setup.sh
diff --git a/.gitlabci/build.sh b/.gitlabci/build.sh
index 24fbda85cbdd4365783291a646edade10d2143c3..4509e96b0c52d71c06c2d6a30659aca821170809 100644
--- a/.gitlabci/build.sh
+++ b/.gitlabci/build.sh
@@ -132,9 +132,8 @@ if [ -f "$recipe" ]; then
     imagefile="`basename ${recipe} .def`.sif"
 
     echo "Creating $imagefile using $recipe..."
-    mkdir -p /home/tmp_singularity
     
-    TMPDIR=/home/tmp_singularity singularity build $imagefile $recipe
+   singularity build $imagefile $recipe
 
     # If the image is successfully built, test it and upload (examples)