diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3696b8dc09c188e882d192516c5156326cc184bf..87b4efb5dd128c11d4af151afc672e135e2dcf0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ before_script:
     - make -C ${CI_JOB_NAME}
     - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
 
+jammy:
+  <<: *build_job
+
 impish:
   <<: *build_job
 
diff --git a/Makefile b/Makefile
index 4654553e1cc64c07cb0595caebdf1e1c89691423..9c2356ccbd7022887d7c170d0aae66e5519687f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := bionic focal hirsute impish
+TARGETS := bionic focal hirsute impish jammy
 TARGETS_PUSH := $(TARGETS:=-push)
 TARGETS_CLEAN := $(TARGETS:=-clean)
 
diff --git a/jammy/Makefile b/jammy/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..5a52fcc8a4ea35a325a15f3df702306ba16ef69b
--- /dev/null
+++ b/jammy/Makefile
@@ -0,0 +1 @@
+include ../dist_x86_64.mk
diff --git a/jammy/x86_64/Dockerfile b/jammy/x86_64/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..dad8d5f431ade6f43365081467c7b7c88d1e3c0a
--- /dev/null
+++ b/jammy/x86_64/Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:jammy
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+ && apt-get install -y eatmydata \
+ && eatmydata apt-get upgrade -y
+
+RUN eatmydata apt-get install -y \
+  sudo wget curl tar expect git \
+  devscripts build-essential lintian ccache pbuilder aptitude apt-utils
+
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST="$(lsb_release -sc)" \
+ && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
+
+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/jammy/x86_64/Makefile b/jammy/x86_64/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..15497f28d78567a8e18e399400d9e251ae31c60b
--- /dev/null
+++ b/jammy/x86_64/Makefile
@@ -0,0 +1 @@
+include ../../image.mk