diff --git a/docs/02-installation.md b/docs/02-installation.md
index 54a4f677..52572d8c 100644
--- a/docs/02-installation.md
+++ b/docs/02-installation.md
@@ -9,8 +9,18 @@ commands:
 #### Debian
 
 ``` shell
-wget -O - https://packages.icinga.com/icinga.key | apt-key add -
-echo 'deb http://packages.icinga.com/debian icinga-stretch main' > etc/apt/sources.list.d/icinga.list
+apt update
+apt -y install apt-transport-https wget
+
+wget -O icinga-archive-keyring.deb "https://packages.icinga.com/icinga-archive-keyring_latest+debian$(
+ . /etc/os-release; echo "$VERSION_ID"
+).deb"
+
+apt install ./icinga-archive-keyring.deb
+
+DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \
+ echo "deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/debian icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
 ```
 
 ``` shell
@@ -21,8 +31,18 @@ apt-get install icingabeat
 #### Ubuntu
 
 ``` shell
-wget -O - https://packages.icinga.com/icinga.key | apt-key add -
-echo 'deb http://packages.icinga.com/ubuntu icinga-xenial main' > etc/apt/sources.list.d/icinga.list
+apt update
+apt -y install apt-transport-https wget
+
+wget -O icinga-archive-keyring.deb "https://packages.icinga.com/icinga-archive-keyring_latest+ubuntu$(
+ . /etc/os-release; echo "$VERSION_ID"
+).deb"
+
+apt install ./icinga-archive-keyring.deb
+
+. /etc/os-release; if [ ! -z ${UBUNTU_CODENAME+x} ]; then DIST="${UBUNTU_CODENAME}"; else DIST="$(lsb_release -c| awk '{print $2}')"; fi; \
+ echo "deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] https://packages.icinga.com/ubuntu icinga-${DIST} main" > \
+ /etc/apt/sources.list.d/${DIST}-icinga.list
 ```
 
 ``` shell