diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8e66c873abd45ef6e6d0c71cc7c2166954fcb09..3e3432b1c90fbcb485f00395a13c207b1875fda7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,3 +23,6 @@ before_script:
 
 '34':
   <<: *build_job
+
+'35':
+  <<: *build_job
diff --git a/35/Dockerfile b/35/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..161f0b0755bca697e26033dbc9894d1b92dff8a9
--- /dev/null
+++ b/35/Dockerfile
@@ -0,0 +1,25 @@
+FROM fedora:35
+
+RUN dnf update -y --setopt=install_weak_deps=False
+
+RUN dnf install -y --allowerasing \
+  sudo wget curl which tar expect git \
+  patch rpm-build redhat-rpm-config rpmlint \
+  patch ccache make util-linux \
+  dnf-utils rpmdevtools createrepo gcc \
+ && dnf clean all
+
+RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
+ https://packages.icinga.com/fedora/ICINGA-release.repo
+
+RUN groupadd -g 1000 build \
+ && useradd -u 1000 -g 1000 -m build \
+ && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
+ && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \
+ && chown build.build /usr/local/bin
+
+RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
+RUN icinga-provide-go
+USER build
+ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
+CMD ["icinga-build-package"]
diff --git a/35/Makefile b/35/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..f451fe153997996b75db9be5b1b9b967fad97fc4
--- /dev/null
+++ b/35/Makefile
@@ -0,0 +1,2 @@
+VARIANT := x86_64
+include ../image.mk
diff --git a/Makefile b/Makefile
index 881ba2d3af4f8d4aa712028beebdc613fbfd14b3..bfb57ca654379085c47ec2327d17ac803dd6c462 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 all:
 	$(MAKE) -C 33
 	$(MAKE) -C 34
+	$(MAKE) -C 35
 
 push:
 	$(MAKE) -C 33 push
 	$(MAKE) -C 34 push
+	$(MAKE) -C 35 push