diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af506b9..cc90e2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,20 @@
 include:
   # Alpine container builder template
   - project: 'wayland/ci-templates'
+    ref: *template_sha
     file: '/templates/alpine.yml'
   # Arch container builder template
   - project: 'wayland/ci-templates'
     ref: *template_sha
     file: '/templates/arch.yml'
+  # Centos container builder template
+  - project: 'wayland/ci-templates'
+    ref: *template_sha
+    file: '/templates/centos.yml'
+  # Debian container builder template
+  - project: 'wayland/ci-templates'
+    ref: *template_sha
+    file: '/templates/debian.yml'
   # Fedora container builder template
   - project: 'wayland/ci-templates'
     ref: *template_sha
@@ -24,14 +33,6 @@ include:
   - project: 'wayland/ci-templates'
     ref: *template_sha
     file: '/templates/ubuntu.yml'
-  # Debian container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/debian.yml'
-  # CentOS container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/centos.yml'
 
 stages:
   - prep             # rebuild the container images if there is a change
diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl
index 99d7f3d..489c21c 100644
--- a/.gitlab-ci/gitlab-ci.tmpl
+++ b/.gitlab-ci/gitlab-ci.tmpl
@@ -11,29 +11,12 @@
 .templates_sha: &template_sha b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
-  # Alpine container builder template
-  - project: 'wayland/ci-templates'
-    file: '/templates/alpine.yml'
-  # Arch container builder template
+  {% for distribution in distributions|map(attribute='name')|unique()|sort() %}
+  # {{ distribution.capitalize() }} container builder template
   - project: 'wayland/ci-templates'
     ref: *template_sha
-    file: '/templates/arch.yml'
-  # Fedora container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/fedora.yml'
-  # Ubuntu container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/ubuntu.yml'
-  # Debian container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/debian.yml'
-  # CentOS container builder template
-  - project: 'wayland/ci-templates'
-    ref: *template_sha
-    file: '/templates/centos.yml'
+    file: '/templates/{{distribution}}.yml'
+  {% endfor %}
 
 stages:
   - prep             # rebuild the container images if there is a change