diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff10b8b..247d66e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
   ICINGA_BUILD_TYPE: snapshot
   #ICINGA_BUILD_RELEASE_TYPE:
   #ICINGA_BUILD_TYPE:
-  #ICINGA_BUILD_UPSTREAM_BRANCH:
+  ICINGA_BUILD_UPSTREAM_BRANCH: support/2.11
 
 .build: &build
   stage: build
@@ -101,182 +101,3 @@ upload/epel/6:
   <<: *upload
   dependencies:
     - build/centos/6
-
-###################################
-# Fedora
-###################################
-build/fedora/32:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/32
-
-test/fedora/32:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/32
-  dependencies:
-    - build/fedora/32
-
-upload/fedora/32:
-  <<: *upload
-  dependencies:
-    - build/fedora/32
-
-build/fedora/31:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/31
-
-test/fedora/31:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/31
-  dependencies:
-    - build/fedora/31
-
-upload/fedora/31:
-  <<: *upload
-  dependencies:
-    - build/fedora/31
-
-build/fedora/30:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/30
-
-test/fedora/30:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/30
-  dependencies:
-    - build/fedora/30
-
-upload/fedora/30:
-  <<: *upload
-  dependencies:
-    - build/fedora/30
-
-build/fedora/29:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: fedora/29
-
-test/fedora/29:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: fedora/29
-  dependencies:
-    - build/fedora/29
-
-upload/fedora/29:
-  <<: *upload
-  dependencies:
-    - build/fedora/29
-
-###################################
-# SLES
-###################################
-build/sles/15.1:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/15.1
-
-test/sles/15.1:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/15.1
-  dependencies:
-    - build/sles/15.1
-
-upload/SUSE/15.1:
-  <<: *upload
-  dependencies:
-    - build/sles/15.1
-
-build/sles/15.0:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/15.0
-
-test/sles/15.0:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/15.0
-  dependencies:
-    - build/sles/15.0
-
-upload/SUSE/15.0:
-  <<: *upload
-  dependencies:
-    - build/sles/15.0
-
-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
-
-build/sles/12.4:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: sles/12.4
-
-test/sles/12.4:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: sles/12.4
-  dependencies:
-    - build/sles/12.4
-
-upload/SUSE/12.4:
-  <<: *upload
-  dependencies:
-    - build/sles/12.4
-
-###################################
-# openSUSE
-###################################
-build/opensuse/15.1:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: opensuse/15.1
-
-test/opensuse/15.1:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: opensuse/15.1
-  dependencies:
-    - build/opensuse/15.1
-
-upload/openSUSE/15.1:
-  <<: *upload
-  dependencies:
-    - build/opensuse/15.1
-
-build/opensuse/15.0:
-  <<: *build
-  variables:
-    DOCKER_IMAGE: opensuse/15.0
-
-test/opensuse/15.0:
-  <<: *test
-  variables:
-    DOCKER_IMAGE: opensuse/15.0
-  dependencies:
-    - build/opensuse/15.0
-
-upload/openSUSE/15.0:
-  <<: *upload
-  dependencies:
-    - build/opensuse/15.0