diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 463c6f6..c042bf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
-  - build
-  - test
-  - upload
+- build
+- test
+- upload
 
 variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
@@ -11,169 +11,57 @@ variables:
 .build: &build
   stage: build
   tags:
-    - docker
+  - docker
   image: ${DOCKER_IMAGE_BASE}/${DOCKER_IMAGE}
   script:
-    - icinga-build-package
+  - icinga-build-package
   cache:
     key: "${CI_JOB_NAME}"
     paths:
-      - ccache/
-      - 'icinga2.git'
+    - ccache/
+    - 'icinga2.git'
   artifacts:
     paths:
-      - build/*
+    - build/*
     expire_in: 1 week
 
 .test: &test
   stage: test
   tags:
-    - docker
+  - docker
   image: ${DOCKER_IMAGE_BASE}/${DOCKER_IMAGE}
   script:
-    - find build/
-    - icinga-build-test
+  - find build/
+  - icinga-build-test
 
 .upload: &upload
   stage: upload
   tags:
-    - docker
+  - docker
   image: ${DOCKER_IMAGE_BASE}/upload
   script:
-    - find build/
-    - icinga-build-upload-aptly
+  - find build/
+  - icinga-build-upload-aptly
   only:
-    - master
-    - tags
+  - master
+  - tags
 
 ###################################
 # EPEL
 ###################################
-build/centos/8:
+build/rhel/6:
   <<: *build
   variables:
-    DOCKER_IMAGE: centos/8
+    DOCKER_IMAGE: rhel/6
 
-test/centos/8:
+test/rhel/6:
   <<: *test
   variables:
-    DOCKER_IMAGE: centos/8
+    DOCKER_IMAGE: rhel/6
   dependencies:
-    - build/centos/8
+  - build/rhel/6
 
-upload/epel/8:
+upload/rhel/6:
   <<: *upload
   dependencies:
-    - build/centos/8
-
-build/centos/7:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: centos/7
-
-test/centos/7:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: centos/7
-  dependencies:
-    - build/centos/7
-
-upload/epel/7:
-  <<: *upload
-  dependencies:
-    - build/centos/7
-
-###################################
-# Fedora
-###################################
-build/fedora/34:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/34
-    RPM_BUILD_NCPUS: '1'
-
-test/fedora/34:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/34
-  dependencies:
-    - build/fedora/34
-
-upload/fedora/34:
-  <<: *upload
-  dependencies:
-    - build/fedora/34
-
-build/fedora/33:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/33
-
-test/fedora/33:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/33
-  dependencies:
-    - build/fedora/33
-
-upload/fedora/33:
-  <<: *upload
-  dependencies:
-    - build/fedora/33
-
-###################################
-# SLES
-###################################
-build/sles/15.2:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/15.2
-
-test/sles/15.2:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/15.2
-  dependencies:
-    - build/sles/15.2
-
-upload/SUSE/15.2:
-  <<: *upload
-  dependencies:
-    - build/sles/15.2
-
-build/sles/12.5:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/12.5
-
-test/sles/12.5:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/12.5
-  dependencies:
-    - build/sles/12.5
-
-upload/SUSE/12.5:
-  <<: *upload
-  dependencies:
-    - build/sles/12.5
-
-###################################
-# openSUSE
-###################################
-build/opensuse/15.2:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: opensuse/15.2
-
-test/opensuse/15.2:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: opensuse/15.2
-  dependencies:
-    - build/opensuse/15.2
-
-upload/openSUSE/15.2:
-  <<: *upload
-  dependencies:
-    - build/opensuse/15.2
+  - build/rhel/6
\ No newline at end of file