diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 457e8029d..e58e25d4b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 /components/controls/buttons_usb_encoder/ @jeripeierSBB
 /components/synchronisation/sync-shared @AlvinSchiller
-/scripts/installscripts/buster-install-default.sh @jeripeierSBB
+/scripts/installscripts/install-jukebox.sh @jeripeierSBB
 /scripts/helperscripts/setup_autohotspot.sh @Groovylein
diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
index 30ec70822..222325940 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_template.md
@@ -56,7 +56,7 @@ the following command will help with that
 ### Installscript
 
 <!--
-i.e. `scripts/installscripts/buster-install-default.sh`
+i.e. `scripts/installscripts/install-jukebox.sh`
 -->
 
 
diff --git a/ci/Dockerfile.debian b/ci/Dockerfile.debian
index 06d14df94..eb545e6b3 100644
--- a/ci/Dockerfile.debian
+++ b/ci/Dockerfile.debian
@@ -96,7 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
   && sed 's/#.*//g' packages-raspberrypi.txt | xargs apt-get -y install \
   && rm -rf /var/lib/apt/lists/*
 
-COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/buster-install-default.sh ./
+COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/install-jukebox.sh ./
 WORKDIR /tests
 COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/tests/*.sh ./
 
diff --git a/ci/README.md b/ci/README.md
index bbade3f34..674dedd64 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -43,9 +43,9 @@ This is a work in progress so expect things to fail or being flaky.
     ```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/
+      cp /code/scripts/installscripts/install-jukebox.sh /home/pi/
       # set GIT_URL and GIT_BRANCH appropriately to your checkout
-      bash GIT_URL=https://github.com/MiczFlor/RPi-Jukebox-RFID.git GIT_BRANCH=main buster-install-default.sh
+      bash GIT_URL=https://github.com/MiczFlor/RPi-Jukebox-RFID.git GIT_BRANCH=main install-jukebox.sh
     ```
 
     NOTE: Get familiar with docker and its flags - `--rm` for example will remove the
diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/install-jukebox.sh
similarity index 99%
rename from scripts/installscripts/buster-install-default.sh
rename to scripts/installscripts/install-jukebox.sh
index cf3a7d1f0..9ce101dbb 100644
--- a/scripts/installscripts/buster-install-default.sh
+++ b/scripts/installscripts/install-jukebox.sh
@@ -13,7 +13,7 @@
 # 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:
-#    buster-install-default.sh -a
+#    install-jukebox.sh -a
 
 # The absolute path to the folder which contains this script
 PATHDATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -138,7 +138,7 @@ an existing configuration file, do the following:
 1. exit this install script (press n)
 2. place your PhonieboxInstall.conf in the folder ${HOME_DIR}
 3. run the installscript with option -a. For example like this:
-   ${HOME_DIR}/buster-install-default.sh -a
+   ${HOME_DIR}/install-jukebox.sh -a
    "
     read -rp "Continue interactive installation? [Y/n] " response
     case "$response" in
@@ -522,7 +522,7 @@ https://github.com/MiczFlor/RPi-Jukebox-RFID/wiki/Using-GPIO-hardware-buttons"
             *)
                 cd "${local_home_dir}"
                 clear
-                ./buster-install-default.sh -a
+                ./install-jukebox.sh -a
                 exit
                 ;;
         esac
diff --git a/scripts/installscripts/tests/run_installation_tests.sh b/scripts/installscripts/tests/run_installation_tests.sh
index a67f726a5..2f75d063a 100644
--- a/scripts/installscripts/tests/run_installation_tests.sh
+++ b/scripts/installscripts/tests/run_installation_tests.sh
@@ -26,7 +26,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 # n no RFID registration
 # n No reboot
 
-./../buster-install-default.sh <<< $'y\nn\n\ny\ny\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
+./../install-jukebox.sh <<< $'y\nn\n\ny\ny\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
 INSTALLATION_EXITCODE=$?
 
 # Test installation
diff --git a/scripts/installscripts/tests/run_installation_tests2.sh b/scripts/installscripts/tests/run_installation_tests2.sh
index 1d5842ad0..17b51f893 100644
--- a/scripts/installscripts/tests/run_installation_tests2.sh
+++ b/scripts/installscripts/tests/run_installation_tests2.sh
@@ -27,7 +27,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 # yes, reader is connected
 # n No reboot
 
-./../buster-install-default.sh <<< $'y\nn\n\nn\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\ny\n2\ny\nn\n'
+./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\ny\n2\ny\nn\n'
 INSTALLATION_EXITCODE=$?
 
 # Test installation
diff --git a/scripts/installscripts/tests/run_installation_tests3.sh b/scripts/installscripts/tests/run_installation_tests3.sh
index 905434f04..dc7e889d6 100644
--- a/scripts/installscripts/tests/run_installation_tests3.sh
+++ b/scripts/installscripts/tests/run_installation_tests3.sh
@@ -25,7 +25,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
 # n no RFID registration
 # n No reboot
 
-./../buster-install-default.sh <<< $'y\nn\n\nn\n\ny\n\ny\nmyuser\nmypassword\nmyclient_id\nmyclient_secret\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
+./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\ny\nmyuser\nmypassword\nmyclient_id\nmyclient_secret\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
 INSTALLATION_EXITCODE=$?
 
 # Test installation