diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
index 1be942778..30ec70822 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_template.md
@@ -10,7 +10,7 @@ labels: bug, needs triage
 ### What I did
 
 <!--
-i.e. `I installed the raspberry pi with above mentioned buster image and ran the installer script`
+i.e. `I installed the raspberry pi with below mentioned image and ran the installer script`
 -->
 
 ### What happened
diff --git a/ci/README.md b/ci/README.md
index 4ed2910e7..6ecbf00c4 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -8,7 +8,7 @@ This is a work in progress so expect things to fail or being flaky.
 ## Howto
 
 * First you need a raspberry pi with some decent performance (RPi 3 or 4 would be recommended)
-* Flash its sd card with **raspbian buster lite**
+* Flash its sd card with **Raspberry Pi OS lite**
 * use raspi-config to resize the filesystem to the whole sd card (menu: 7 -> A1)
 * install some tools and reboot:
 ```bash
@@ -30,18 +30,18 @@ This is a work in progress so expect things to fail or being flaky.
 ```
 * build the docker image:
     ```bash
-    docker build -t rpi-jukebox-rfid:buster-latest -f ci/Dockerfile.debian --platform=linux/arm/v7 --target=code --build-arg="DEBIAN_VERSION_NAME=buster" .
+    docker build -t rpi-jukebox-rfid:debian-latest -f ci/Dockerfile.debian --platform=linux/arm/v7 --target=code .
     ```
     * additional arguments
         * for builds
-          on normal PCs use `--platform=linux/amd64`
-          on a raspberry pi use `--platform=linux/arm/v7`
-        * to use a different debian version change `--build-arg="DEBIAN_VERSION_NAME=buster"` appropriately.
+          - on normal PCs use `--platform=linux/amd64`
+          - on a raspberry pi use `--platform=linux/arm/v7`
+        * to use a different debian version as base add parameter `--build-arg="DEBIAN_VERSION_NAME=<code_name>"` (<code_name> = e.g. buster, bullseye, ...).
 
 * get something to drink or eat
 * run the freshly built docker image and start testing. For example:
     ```bash
-      docker run --rm -ti rpi-jukebox-rfid:buster-latest /bin/bash
+      docker run --rm -ti rpi-jukebox-rfid:debian-latest /bin/bash
       cd /home/pi/
       cp /code/scripts/installscripts/buster-install-default.sh /home/pi/
       # set GIT_URL and GIT_BRANCH appropriately to your checkout
diff --git a/scripts/installscripts/buster-install-default-with-autohotspot.sh b/scripts/installscripts/buster-install-default-with-autohotspot.sh
index d51f0d758..bc37290fc 100644
--- a/scripts/installscripts/buster-install-default-with-autohotspot.sh
+++ b/scripts/installscripts/buster-install-default-with-autohotspot.sh
@@ -10,7 +10,6 @@
 #
 # 1. download the install file from github
 #    https://github.com/MiczFlor/RPi-Jukebox-RFID/tree/master/scripts/installscripts
-#    (note: currently only works for buster and newer OS)
 # 2. make the file executable: chmod +x
 # 3. place the PhonieboxInstall.conf in the folder $HOME
 # 4. run the installscript with option -a like this:
@@ -37,7 +36,7 @@ JUKEBOX_HOME_DIR="${HOME_DIR}/RPi-Jukebox-RFID"
 LOGDIR="${HOME_DIR}"/phoniebox_logs
 JUKEBOX_BACKUP_DIR="${HOME_DIR}/BACKUP"
 
-# Get the RaspberryPi OS code name (e.g. buster or bullseye)
+# Get the RaspberryPi OS code name (e.g. buster, bullseye, ...)
 OS_CODENAME="$( . /etc/os-release; printf '%s\n' "$VERSION_CODENAME"; )"
 printf "Used RaspberryPi OS: ${OS_CODENAME}\n"
 
diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
index afe8b0415..17976134e 100644
--- a/scripts/installscripts/buster-install-default.sh
+++ b/scripts/installscripts/buster-install-default.sh
@@ -10,7 +10,6 @@
 #
 # 1. download the install file from github
 #    https://github.com/MiczFlor/RPi-Jukebox-RFID/tree/master/scripts/installscripts
-#    (note: currently only works for buster and newer OS)
 # 2. make the file executable: chmod +x
 # 3. place the PhonieboxInstall.conf in the folder $HOME
 # 4. run the installscript with option -a like this:
@@ -37,7 +36,7 @@ JUKEBOX_HOME_DIR="${HOME_DIR}/RPi-Jukebox-RFID"
 LOGDIR="${HOME_DIR}"/phoniebox_logs
 JUKEBOX_BACKUP_DIR="${HOME_DIR}/BACKUP"
 
-# Get the RaspberryPi OS code name (e.g. buster or bullseye)
+# Get the RaspberryPi OS code name (e.g. buster, bullseye, ...)
 OS_CODENAME="$( . /etc/os-release; printf '%s\n' "$VERSION_CODENAME"; )"
 printf "Used RaspberryPi OS: ${OS_CODENAME}\n"