diff --git a/src/nf_modules/sambamba/index_bams.config b/src/nf_modules/sambamba/index_bams.config
index 22fc18de5046b1bdd0f3626b0dad76715c98b4b4..c76c7313f8c02f63a61f97cf77a44c0082aaabcb 100644
--- a/src/nf_modules/sambamba/index_bams.config
+++ b/src/nf_modules/sambamba/index_bams.config
@@ -5,6 +5,16 @@ profiles {
     process {
       withName: index_bam {
         container = "sambamba:0.6.7"
+        cpus = 4
+      }
+    }
+  }
+  singularity {
+    singularity.enabled = true
+    process {
+      withName: index_bam {
+        container = "file://bin/sambamba:0.6.7.sif"
+        cpus = 4
       }
     }
   }
@@ -15,6 +25,7 @@ profiles {
         module = "sambamba/0.6.7"
         executor = "sge"
         clusterOptions = "-m e -cwd -V"
+        cpus = 16
         memory = "30GB"
         time = "24h"
         queue = 'E5-2670deb128A,E5-2670deb128B,E5-2670deb128C,E5-2670deb128D,E5-2670deb128E,E5-2670deb128F'
diff --git a/src/nf_modules/sambamba/index_bams.nf b/src/nf_modules/sambamba/index_bams.nf
index 0dc2dac682b103c043018bb9e7522eb2bfcf932a..3ea36df4a3e512fba7b577b4b2c6916a4e0bb940 100644
--- a/src/nf_modules/sambamba/index_bams.nf
+++ b/src/nf_modules/sambamba/index_bams.nf
@@ -10,7 +10,6 @@ Channel
 
 process index_bam {
   tag "$file_id"
-  cpus 4
 
   input:
     set file_id, file(bam) from bam_files
diff --git a/src/nf_modules/sambamba/sort_bams.config b/src/nf_modules/sambamba/sort_bams.config
index 9dd63fcaf6aee0afdc36daf4c2750a88c27a26f5..93a826733831f7aa0d0e3aa66baf12c6d3fa46be 100644
--- a/src/nf_modules/sambamba/sort_bams.config
+++ b/src/nf_modules/sambamba/sort_bams.config
@@ -5,6 +5,16 @@ profiles {
     process {
       withName: sort_bam {
         container = "sambamba:0.6.7"
+        cpus = 4
+      }
+    }
+  }
+  singularity {
+    singularity.enabled = true
+    process {
+      withName: sort_bam {
+        container = "file://bin/sambamba:0.6.7.sif"
+        cpus = 4
       }
     }
   }
@@ -15,6 +25,7 @@ profiles {
         module = "sambamba/0.6.7"
         executor = "sge"
         clusterOptions = "-m e -cwd -V"
+        cpus = 4
         memory = "30GB"
         time = "24h"
         queue = 'E5-2670deb128A,E5-2670deb128B,E5-2670deb128C,E5-2670deb128D,E5-2670deb128E,E5-2670deb128F'
diff --git a/src/nf_modules/sambamba/split_bams.config b/src/nf_modules/sambamba/split_bams.config
index 3b9acd7257269b8f009e1f277cbc68645afa7efe..13d3925965b5d541a612a4b70a7696c5011b1bad 100644
--- a/src/nf_modules/sambamba/split_bams.config
+++ b/src/nf_modules/sambamba/split_bams.config
@@ -5,6 +5,16 @@ profiles {
     process {
       withName: split_bam {
         container = "sambamba:0.6.7"
+        cpus = 4
+      }
+    }
+  }
+  singularity {
+    singularity.enabled = true
+    process {
+      withName: split_bam {
+        container = "file://bin/sambamba:0.6.7.sif"
+        cpus = 4
       }
     }
   }
@@ -15,6 +25,7 @@ profiles {
         module = "sambamba/0.6.7"
         executor = "sge"
         clusterOptions = "-m e -cwd -V"
+        cpus = 16
         memory = "30GB"
         time = "24h"
         queue = 'E5-2670deb128A,E5-2670deb128B,E5-2670deb128C,E5-2670deb128D,E5-2670deb128E,E5-2670deb128F'
diff --git a/src/nf_modules/sambamba/tests.sh b/src/nf_modules/sambamba/tests.sh
index d76db22cd3f3675675dbe660704ec114f1ba7b02..256df65f9ed23efac640aea6548f15397479ca60 100755
--- a/src/nf_modules/sambamba/tests.sh
+++ b/src/nf_modules/sambamba/tests.sh
@@ -1,14 +1,37 @@
 ./nextflow src/nf_modules/sambamba/sort_bams.nf \
   -c src/nf_modules/sambamba/sort_bams.config \
   -profile docker \
-  --bam "data/tiny_dataset/map/tiny_v2.bam"
+  --bam "data/tiny_dataset/map/tiny_v2.bam" \
+  -resume
 
 ./nextflow src/nf_modules/sambamba/index_bams.nf \
   -c src/nf_modules/sambamba/index_bams.config \
   -profile docker \
-  --bam "data/tiny_dataset/map/tiny_v2.sort.bam"
+  --bam "data/tiny_dataset/map/tiny_v2.sort.bam" \
+  -resume
 
 ./nextflow src/nf_modules/sambamba/split_bams.nf \
   -c src/nf_modules/sambamba/split_bams.config \
   -profile docker \
-  --bam "data/tiny_dataset/map/tiny_v2.bam"
+  --bam "data/tiny_dataset/map/tiny_v2.bam" \
+  -resume
+
+if [ -x "$(command -v singularity)" ]; then
+./nextflow src/nf_modules/sambamba/sort_bams.nf \
+  -c src/nf_modules/sambamba/sort_bams.config \
+  -profile singularity \
+  --bam "data/tiny_dataset/map/tiny_v2.bam" \
+  -resume
+
+./nextflow src/nf_modules/sambamba/index_bams.nf \
+  -c src/nf_modules/sambamba/index_bams.config \
+  -profile singularity \
+  --bam "data/tiny_dataset/map/tiny_v2.sort.bam" \
+  -resume
+
+./nextflow src/nf_modules/sambamba/split_bams.nf \
+  -c src/nf_modules/sambamba/split_bams.config \
+  -profile singularity \
+  --bam "data/tiny_dataset/map/tiny_v2.bam" \
+  -resume
+fi
diff --git a/src/singularity_modules/sambamba/0.6.7/build.sh b/src/singularity_modules/sambamba/0.6.7/build.sh
index 008e43fbe43f13767c6df6f9fec486a0e237e234..7afad494b2e479a8a1f2fc297d81ad47b7c39e0e 100755
--- a/src/singularity_modules/sambamba/0.6.7/build.sh
+++ b/src/singularity_modules/sambamba/0.6.7/build.sh
@@ -1,2 +1,2 @@
 #/bin/sh
-sudo singularity build --force /bin/sambamba:0.6.7.sif src/singularity_modules/sambamba/0.6.7/sambamba.def
+sudo singularity build --force bin/sambamba:0.6.7.sif src/singularity_modules/sambamba/0.6.7/sambamba.def