diff --git a/scripts/installation/openkat-empty-job-queue.sh b/scripts/installation/openkat-empty-job-queue.sh
index 7d85f5014f2..72452970756 100644
--- a/scripts/installation/openkat-empty-job-queue.sh
+++ b/scripts/installation/openkat-empty-job-queue.sh
@@ -2,7 +2,12 @@
 
 # Stop openKAT
 echo "Stopping openKAT processes"
-sudo systemctl stop xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl stop xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl stop kat-rocky-worker
+fi
 
 # Start postgres, switch to the mula_db and empty the job queue
 echo "Emptying job queue"
@@ -13,6 +18,11 @@ EOF
 
 # Start openKAT
 echo "Starting openKAT processes"
-sudo systemctl start xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl start xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl stop kat-rocky-worker
+fi
 
 echo "End of script. It might take a few more seconds for OpenKAT to be fully started and available."
diff --git a/scripts/installation/openkat-install.sh b/scripts/installation/openkat-install.sh
index b19f7b8d8ae..20b8c3183ac 100644
--- a/scripts/installation/openkat-install.sh
+++ b/scripts/installation/openkat-install.sh
@@ -285,9 +285,19 @@ echo "Step 6.11 - Set kat permissions in rabbitmq"
 sudo rabbitmqctl set_permissions -p "kat" "kat" ".*" ".*" ".*"
 
 echo "Step 7 - Configure start at system boot"
-sudo systemctl enable kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl enable kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl enable kat-rocky-worker
+fi
 
 echo "Step 8 - Restart OpenKAT"
-sudo systemctl restart kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl restart kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl restart kat-rocky-worker
+fi
 
 echo "Step 9 - End of OpenKAT install script"
diff --git a/scripts/installation/openkat-reset.sh b/scripts/installation/openkat-reset.sh
index df71266d6a4..c9c09b50a59 100644
--- a/scripts/installation/openkat-reset.sh
+++ b/scripts/installation/openkat-reset.sh
@@ -29,7 +29,12 @@ fi
 pushd /
 
 echo "Stop OpenKAT"
-sudo systemctl stop xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl stop xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl stop kat-rocky-worker
+fi
 
 echo "Delete XTDB databases"
 sudo rm -rf /var/lib/xtdb/*
@@ -89,6 +94,11 @@ if [[ ${1} != "no_super_user" ]]; then
 fi
 
 echo "Start OpenKAT"
-sudo systemctl start xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl start xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl start kat-rocky-worker
+fi
 
 popd
diff --git a/scripts/installation/openkat-restart.sh b/scripts/installation/openkat-restart.sh
index 5cecf4547d3..ae4a505f594 100644
--- a/scripts/installation/openkat-restart.sh
+++ b/scripts/installation/openkat-restart.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
 echo "Restarting openKAT..."
-sudo systemctl restart xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl restart xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl restart kat-rocky-worker
+fi
diff --git a/scripts/installation/openkat-start.sh b/scripts/installation/openkat-start.sh
index 96df24dcc6a..dd0bcc6b9f9 100644
--- a/scripts/installation/openkat-start.sh
+++ b/scripts/installation/openkat-start.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
 echo "Starting openKAT..."
-sudo systemctl start xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl start xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl start kat-rocky-worker
+fi
diff --git a/scripts/installation/openkat-stop.sh b/scripts/installation/openkat-stop.sh
index f20d71cdfcb..4182ac767da 100644
--- a/scripts/installation/openkat-stop.sh
+++ b/scripts/installation/openkat-stop.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
 echo "Stopping openKAT..."
-sudo systemctl stop xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl stop xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl stop kat-rocky-worker
+fi
diff --git a/scripts/installation/openkat-update.sh b/scripts/installation/openkat-update.sh
index b8ef24b80aa..5c25e44b1ef 100644
--- a/scripts/installation/openkat-update.sh
+++ b/scripts/installation/openkat-update.sh
@@ -82,6 +82,11 @@ sudo -u kat update-katalogus-db
 sudo -u kat update-mula-db
 
 echo "Step 7 - Restart OpenKAT"
-sudo systemctl restart xtdb-http-multinode kat-rocky kat-rocky-worker kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+sudo systemctl restart xtdb-http-multinode kat-rocky kat-mula kat-bytes kat-boefjes kat-normalizers kat-katalogus kat-keiko kat-octopoes kat-octopoes-worker
+
+# Kat-rocky-worker service was introduced in OpenKAT 1.18
+if [ -f /usr/lib/systemd/system/kat-rocky-worker.service ]; then
+    sudo systemctl restart kat-rocky-worker
+fi
 
 echo "End of OpenKAT update script"