diff --git a/cobald.yml b/cobald.yml
index a42512a..aae8866 100644
--- a/cobald.yml
+++ b/cobald.yml
@@ -57,4 +57,4 @@
       container_name: cobald
       # docker_network: slurm # overriden by vars/slurm.yml
     when: '"cobald" in group_names'
-    tags: cobald, influxdb
+    tags: cobald, influxdb, singularity
diff --git a/htcondor.yml b/htcondor.yml
index 809497c..8288f9c 100644
--- a/htcondor.yml
+++ b/htcondor.yml
@@ -20,7 +20,7 @@
     tags: htcondor
 
   - name: "setup singularity"
-    import_tasks: "singularity.yml"
+    import_role: name="singularity"
     tags: singularity
 
   - name: "setup docker"
diff --git a/roles/cobald/tasks/main.yml b/roles/cobald/tasks/main.yml
index 4ef9df5..553e376 100644
--- a/roles/cobald/tasks/main.yml
+++ b/roles/cobald/tasks/main.yml
@@ -109,6 +109,13 @@
   include_tasks: facts.yml
   when: cobald_container_hostname is not defined
 
+- name: build singularity container
+  include_tasks:
+    file: singularity.yml
+    apply:
+      tags: singularity
+  tags: singularity
+
 - name: run cobald container
   docker_container:
     name: "{{ container_name | default('cobald') }}"
diff --git a/roles/cobald/tasks/singularity.yml b/roles/cobald/tasks/singularity.yml
new file mode 100644
index 0000000..1dfb3cb
--- /dev/null
+++ b/roles/cobald/tasks/singularity.yml
@@ -0,0 +1,8 @@
+- name: "setup singularity"
+  import_role: name="singularity"
+  tags: singularity
+
+#- name: copy slurm def file
+# - name: export docker image
+#- name: build container
+
diff --git a/singularity.yml b/roles/singularity/tasks/main.yml
similarity index 89%
rename from singularity.yml
rename to roles/singularity/tasks/main.yml
index e3f7c94..2fd6505 100644
--- a/singularity.yml
+++ b/roles/singularity/tasks/main.yml
@@ -8,7 +8,7 @@
     value: "15000"
     sysctl_file: /etc/sysctl.d/90-max_net_namespaces.conf
 
-- name: "enable user thoto for fakeroot access"
+- name: "enable user {{unpriv_user}} for fakeroot access"
   lineinfile:
     line: "{{unpriv_user}}:4294836224:65536"
     dest: "{{item}}"
diff --git a/roles/slurm/files/slurmd.Dockerfile b/roles/slurm/files/slurmd.Dockerfile
index 84e8dc2..2fc4081 100644
--- a/roles/slurm/files/slurmd.Dockerfile
+++ b/roles/slurm/files/slurmd.Dockerfile
@@ -9,3 +9,6 @@ RUN chmod 755 /etc/docker-init.d/30-slurmd
 ENV SLURMCTLD_LOG_PATH="/var/log/slurm/slurmctld.log"
 ENV SLURMD_LOG_PATH="/var/log/slurm/slurmd.log"
 ENV SLURM_SCHED_LOG_PATH="/var/log/slurm/slurmsched.log"
+
+RUN yum install -y singularity && \
+	yum clean all && rm -rf /var/cache/yum