diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adcb0848c99daeb18f2f96eb106578bc04042029..d13b256ddeefc79abc4d685e8b314881008ff784 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,34 +36,6 @@ image:
 
 ## WRITE YOUR TEST RULE HERE AFTER BRANCHING ON SUBMISSION AND CREATE A MERGE REQUEST
 
-hiddendomains-31-test:
-  extends: .templateTest
-  variables:
-    BASENAME: hiddendomains
-    TAG: 31
-    RECIPE_PATH: recipes/peakcallers/hiddendomains
-
-macs2-2271-test:
-  extends: .templateTest
-  variables:
-    BASENAME: macs2
-    TAG: 2271
-    RECIPE_PATH: recipes/peakcallers/macs2
-
-
-picardtools-2221-test:
-  extends: .templateTest
-  variables:
-    BASENAME: picardtools
-    TAG: 2221
-    RECIPE_PATH: recipes/analysis-suites/picardtools
-
-picardtools-2271-test:
-  extends: .templateTest
-  variables:
-    BASENAME: picardtools
-    TAG: 2271
-    RECIPE_PATH: recipes/analysis-suites/picardtools
 
     
 #####################
@@ -95,3 +67,11 @@ include:
 
 include:
   - local: "yaml-files/analysis-suites/deeptools-deploy.yaml"
+
+
+#####################
+# Peaks callers
+#####################
+
+include:
+  - local: "yaml-files/peakcallers/hiddendomains-deploy.yaml"
diff --git a/yaml-files/peakcallers/hiddendomains-deploy.yaml b/yaml-files/peakcallers/hiddendomains-deploy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..94aef5a753ed9778cb06495240944ab5ca919e74
--- /dev/null
+++ b/yaml-files/peakcallers/hiddendomains-deploy.yaml
@@ -0,0 +1,9 @@
+hiddendomains-31-builddeploy:
+  extends: .templateBuildDeploy
+  variables:
+    BASENAME: hiddendomains
+    TAG: 31
+    RECIPE_PATH: recipes/peakcallers/hiddendomains
+  only:
+    changes:
+      - recipes/peakcallers/hiddendomains/Singularity.hiddendomains-31
diff --git a/yaml-files/peakcallers/hiddendomains-test.backup b/yaml-files/peakcallers/hiddendomains-test.backup
new file mode 100644
index 0000000000000000000000000000000000000000..959888a6b013c39bd6e8bf99d6b2bb3d1d5ab1ce
--- /dev/null
+++ b/yaml-files/peakcallers/hiddendomains-test.backup
@@ -0,0 +1,6 @@
+hiddendomains-31-test:
+  extends: .templateTest
+  variables:
+    BASENAME: hiddendomains
+    TAG: 31
+    RECIPE_PATH: recipes/peakcallers/hiddendomains