diff --git a/Dockerfile b/Dockerfile
index a963006a..e9dde71b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -152,22 +152,6 @@ RUN <<EOF
   chmod 644 /etc/amavis/conf.d/*
 EOF
 
-# overcomplication necessary for CI
-# hadolint ignore=SC2086
-RUN <<EOF
-  for _ in {1..10}; do
-    su - amavis -c "razor-admin -create"
-    sleep 3
-    if su - amavis -c "razor-admin -register"; then
-      EC=0
-      break
-    else
-      EC=${?}
-    fi
-  done
-  exit ${EC}
-EOF
-
 # -----------------------------------------------
 # --- Fail2Ban, DKIM & DMARC --------------------
 # -----------------------------------------------
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index ece78b2c..6f9d7786 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -83,8 +83,7 @@ function _install_packages() {
 
   local ANTI_VIRUS_SPAM_PACKAGES=(
     clamav clamav-daemon
-    # spamassassin is used only with amavisd-new, while pyzor + razor are used by spamassasin
-    amavisd-new spamassassin pyzor razor
+    amavisd-new spamassassin
   )
 
   # predominantly for Amavis support