diff --git a/jobs/swh/docs.yaml b/jobs/swh-docs.yaml
rename from jobs/swh/docs.yaml
rename to jobs/swh-docs.yaml
diff --git a/jobs/swh-packages.yaml b/jobs/swh-packages.yaml
new file mode 100644
--- /dev/null
+++ b/jobs/swh-packages.yaml
@@ -0,0 +1,165 @@
+- job-group:
+    name: 'swh-jobs-{name}'
+    jobs:
+      - "{name}"
+      - "{name}/incoming-tag"
+      - "{name}/pypi-upload"
+      - "{name}/tests"
+      - "{name}/tox"
+      - "debian/packages/{name}"
+      - "debian/packages/{name}/update-for-release"
+      - "debian/packages/{name}/automatic-backport"
+      - "debian/packages/{name}/gbp-buildpackage"
+
+- project:
+    name: DARC
+    display-name: swh-archiver
+    pkg: archiver
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DCORE
+    display-name: swh-core
+    pkg: core
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DDEP
+    display-name: swh-deposit
+    pkg: deposit
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DCIDX
+    display-name: swh-indexer
+    pkg: indexer
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DJNL
+    display-name: swh-journal
+    pkg: journal
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLS
+    display-name: swh-lister
+    pkg: lister
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDBASE
+    display-name: swh-loader-core
+    pkg: loader.core
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDDEB
+    display-name: swh-loader-debian
+    pkg: loader.debian
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDDIR
+    display-name: swh-loader-dir
+    pkg: loader.dir
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDG
+    display-name: swh-loader-git
+    pkg: loader.git
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDHG
+    display-name: swh-loader-mercurial
+    pkg: loader.mercurial
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDPY
+    display-name: swh-loader-pypi
+    pkg: loader.pypi
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDSVN
+    display-name: swh-loader-svn
+    pkg: loader.svn
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DLDTAR
+    display-name: swh-loader-tar
+    pkg: loader.tar
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DMOD
+    display-name: swh-model
+    pkg: model
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DOBJS
+    display-name: swh-objstorage
+    pkg: objstorage
+    deb-extra-repositories: ceph
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: TSBX
+    display-name: swh-sandbox
+    pkg: sandbox
+    incoming-tag-auto-pypi-host: test.pypi.org
+    jobs:
+      - "{name}"
+      - "{name}/incoming-tag"
+      - "{name}/pypi-upload"
+      - "{name}/tests"
+      - "{name}/tox"
+
+- project:
+    name: DSCH
+    display-name: swh-scheduler
+    pkg: scheduler
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DSTO
+    display-name: swh-storage
+    pkg: storage
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DVAU
+    display-name: swh-vault
+    pkg: vault
+    jobs:
+      - 'swh-jobs-{name}'
+
+- project:
+    name: DWAPPS
+    display-name: swh-web
+    pkg: web
+    jobs:
+      - 'swh-jobs-{name}'
diff --git a/jobs/swh/archiver.yaml b/jobs/swh/archiver.yaml
deleted file mode 100644
--- a/jobs/swh/archiver.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DARC
-    display-name: swh-archiver
-    pkg: archiver
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/core.yaml b/jobs/swh/core.yaml
deleted file mode 100644
--- a/jobs/swh/core.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DCORE
-    display-name: swh-core
-    pkg: core
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/deposit.yaml b/jobs/swh/deposit.yaml
deleted file mode 100644
--- a/jobs/swh/deposit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DDEP
-    display-name: swh-deposit
-    pkg: deposit
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/indexer.yaml b/jobs/swh/indexer.yaml
deleted file mode 100644
--- a/jobs/swh/indexer.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DCIDX
-    display-name: swh-indexer
-    pkg: indexer
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/journal.yaml b/jobs/swh/journal.yaml
deleted file mode 100644
--- a/jobs/swh/journal.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DJNL
-    display-name: swh-journal
-    pkg: journal
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/lister.yaml b/jobs/swh/lister.yaml
deleted file mode 100644
--- a/jobs/swh/lister.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLS
-    display-name: swh-lister
-    pkg: lister
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-core.yaml b/jobs/swh/loader-core.yaml
deleted file mode 100644
--- a/jobs/swh/loader-core.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDBASE
-    display-name: swh-loader-core
-    pkg: loader.core
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-debian.yaml b/jobs/swh/loader-debian.yaml
deleted file mode 100644
--- a/jobs/swh/loader-debian.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDDEB
-    display-name: swh-loader-debian
-    pkg: loader.debian
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-dir.yaml b/jobs/swh/loader-dir.yaml
deleted file mode 100644
--- a/jobs/swh/loader-dir.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDDIR
-    display-name: swh-loader-dir
-    pkg: loader.dir
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-git.yaml b/jobs/swh/loader-git.yaml
deleted file mode 100644
--- a/jobs/swh/loader-git.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDG
-    display-name: swh-loader-git
-    pkg: loader.git
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-mercurial.yaml b/jobs/swh/loader-mercurial.yaml
deleted file mode 100644
--- a/jobs/swh/loader-mercurial.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDHG
-    display-name: swh-loader-mercurial
-    pkg: loader.mercurial
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-pypi.yaml b/jobs/swh/loader-pypi.yaml
deleted file mode 100644
--- a/jobs/swh/loader-pypi.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDPY
-    display-name: swh-loader-pypi
-    pkg: loader.pypi
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-svn.yaml b/jobs/swh/loader-svn.yaml
deleted file mode 100644
--- a/jobs/swh/loader-svn.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDSVN
-    display-name: swh-loader-svn
-    pkg: loader.svn
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/loader-tar.yaml b/jobs/swh/loader-tar.yaml
deleted file mode 100644
--- a/jobs/swh/loader-tar.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DLDTAR
-    display-name: swh-loader-tar
-    pkg: loader.tar
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/model.yaml b/jobs/swh/model.yaml
deleted file mode 100644
--- a/jobs/swh/model.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DMOD
-    display-name: swh-model
-    pkg: model
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/objstorage.yaml b/jobs/swh/objstorage.yaml
deleted file mode 100644
--- a/jobs/swh/objstorage.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: DOBJS
-    display-name: swh-objstorage
-    pkg: objstorage
-    deb-extra-repositories: ceph
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/sandbox.yaml b/jobs/swh/sandbox.yaml
deleted file mode 100644
--- a/jobs/swh/sandbox.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: TSBX
-    display-name: swh-sandbox
-    pkg: sandbox
-    incoming-tag-auto-pypi-host: test.pypi.org
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
diff --git a/jobs/swh/scheduler.yaml b/jobs/swh/scheduler.yaml
deleted file mode 100644
--- a/jobs/swh/scheduler.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DSCH
-    display-name: swh-scheduler
-    pkg: scheduler
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/storage.yaml b/jobs/swh/storage.yaml
deleted file mode 100644
--- a/jobs/swh/storage.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DSTO
-    display-name: swh-storage
-    pkg: storage
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/vault.yaml b/jobs/swh/vault.yaml
deleted file mode 100644
--- a/jobs/swh/vault.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DVAU
-    display-name: swh-vault
-    pkg: vault
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"
diff --git a/jobs/swh/web.yaml b/jobs/swh/web.yaml
deleted file mode 100644
--- a/jobs/swh/web.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: DWAPPS
-    display-name: swh-web
-    pkg: web
-    jobs:
-      - "{name}"
-      - "{name}/incoming-tag"
-      - "{name}/pypi-upload"
-      - "{name}/tests"
-      - "{name}/tox"
-      - "debian/packages/{name}"
-      - "debian/packages/{name}/update-for-release"
-      - "debian/packages/{name}/automatic-backport"
-      - "debian/packages/{name}/gbp-buildpackage"