diff --git a/Dockerfile b/Dockerfile
index 82b915d14e1801984c0023aed1552af398a746ab..14beddc5945282682136e0a9d326fc24cac9fa18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,13 +13,10 @@ RUN apt-get update \
  && rm -rf /usr/share/doc/* /usr/share/locales/* /usr/share/man/* \
  && rm -rf /var/lib/apt/lists/*
 
-RUN curl https://packages.icinga.com/icinga.key | \
-    gpg --dearmor -o /usr/share/keyrings/icinga-archive-keyring.gpg
-
-RUN deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] \
-    https://packages.icinga.com/raspbian icinga-buster main \
- && deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] \
-    https://packages.icinga.com/raspbian icinga-buster main
+RUN curl https://packages.icinga.com/icinga.key | apt-key add - \
+ && DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release) \
+ && DIST=buster \
+ && echo "deb http://packages.icinga.com/raspbian icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list
 
 # Install build deps for Icinga 2 and Icinga Web 2
 RUN apt-get update \