diff --git a/cmake/cpack/CMakeCPackOptions.cmake b/cmake/cpack/CMakeCPackOptions.cmake
index 9c530b90..6c3b4c85 100644
--- a/cmake/cpack/CMakeCPackOptions.cmake
+++ b/cmake/cpack/CMakeCPackOptions.cmake
@@ -4,7 +4,7 @@ if(CPACK_GENERATOR MATCHES "DEB" OR CPACK_GENERATOR MATCHES "RPM")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-kmod.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-modern-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
-	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-plugin.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-custom.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falcoctl-artifact-follow.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 endif()
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 6ebae12c..1ad7f6b1 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -24,7 +24,7 @@ configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-bpf.service"
 		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
 configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-modern-bpf.service"
 		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
-configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-plugin.service"
+configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-custom.service"
 		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
 configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falcoctl-artifact-follow.service"
 		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
diff --git a/scripts/debian/postinst.in b/scripts/debian/postinst.in
index bdbb002c..78cfc06b 100755
--- a/scripts/debian/postinst.in
+++ b/scripts/debian/postinst.in
@@ -23,12 +23,12 @@ echo "[POST-INSTALL] Disable all possible 'falco' services:"
 systemctl --system stop 'falco-kmod.service' || true
 systemctl --system stop 'falco-bpf.service' || true
 systemctl --system stop 'falco-modern-bpf.service' || true
-systemctl --system stop 'falco-plugin.service' || true
+systemctl --system stop 'falco-custom.service' || true
 systemctl --system stop 'falcoctl-artifact-follow.service' || true
 systemctl --system disable 'falco-kmod.service' || true
 systemctl --system disable 'falco-bpf.service' || true
 systemctl --system disable 'falco-modern-bpf.service' || true
-systemctl --system disable 'falco-plugin.service' || true
+systemctl --system disable 'falco-custom.service' || true
 systemctl --system disable 'falcoctl-artifact-follow.service' || true
 
 # unmask falcoctl if it was masked
@@ -37,12 +37,11 @@ systemctl --system unmask falcoctl-artifact-follow.service || true
 if [ "$1" = "configure" ]; then
         if [ -x /usr/bin/dialog ]; then
           # If dialog is installed, create a dialog to let users choose the correct driver for them
-          CHOICE=$(dialog --clear --title "Falco drivers" --menu "Choose your preferred driver:" 12 40 5 \
-                1 "Don't start" \
+          CHOICE=$(dialog --clear --title "Falco drivers" --menu "Choose your preferred driver:" 12 55 4 \
+                1 "Manual configuration (no unit is stared)" \
                 2 "Kmod" \
                 3 "eBPF" \
                 4 "Modern eBPF" \
-                5 "Plugin (needs manual configuration)" \
                 2>&1 >/dev/tty)
           case $CHOICE in
                   2)
@@ -54,9 +53,6 @@ if [ "$1" = "configure" ]; then
                   4)
                       chosen_driver="modern-bpf"
                       ;;
-                  5)
-                      chosen_driver="plugin"
-                      ;;
           esac
           if [ -n "$chosen_driver" ]; then
             CHOICE=$(dialog --clear --title "Falcoctl" --menu "Do you want to follow automatic ruleset updates?" 10 40 2 \
diff --git a/scripts/debian/postrm.in b/scripts/debian/postrm.in
index 9f4b1da8..16bef26f 100755
--- a/scripts/debian/postrm.in
+++ b/scripts/debian/postrm.in
@@ -26,7 +26,7 @@ if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
         systemctl --system disable 'falco-kmod.service' || true
         systemctl --system disable 'falco-bpf.service' || true
         systemctl --system disable 'falco-modern-bpf.service' || true
-        systemctl --system disable 'falco-plugin.service' || true
+        systemctl --system disable 'falco-custom.service' || true
         systemctl --system disable 'falcoctl-artifact-follow.service' || true
 
         echo "[POST-REMOVE] Trigger deamon-reload:"
diff --git a/scripts/debian/prerm.in b/scripts/debian/prerm.in
index 855a6a96..137f81e2 100755
--- a/scripts/debian/prerm.in
+++ b/scripts/debian/prerm.in
@@ -27,7 +27,7 @@ case "$1" in
       systemctl --system stop 'falco-kmod.service' || true
       systemctl --system stop 'falco-bpf.service' || true
       systemctl --system stop 'falco-modern-bpf.service' || true
-      systemctl --system stop 'falco-plugin.service' || true
+      systemctl --system stop 'falco-custom.service' || true
       systemctl --system stop 'falcoctl-artifact-follow.service' || true
 
       echo "[PRE-REMOVE] Call 'falco-driver-loader --clean:'"
diff --git a/scripts/rpm/postinstall.in b/scripts/rpm/postinstall.in
index 8a014013..62769681 100755
--- a/scripts/rpm/postinstall.in
+++ b/scripts/rpm/postinstall.in
@@ -22,12 +22,12 @@ echo "[POST-INSTALL] Disable all possible enabled 'falco' service:"
 systemctl --system stop 'falco-kmod.service' || true
 systemctl --system stop 'falco-bpf.service' || true
 systemctl --system stop 'falco-modern-bpf.service' || true
-systemctl --system stop 'falco-plugin.service' || true
+systemctl --system stop 'falco-custom.service' || true
 systemctl --system stop 'falcoctl-artifact-follow.service' || true
 systemctl --system disable 'falco-kmod.service' || true
 systemctl --system disable 'falco-bpf.service' || true
 systemctl --system disable 'falco-modern-bpf.service' || true
-systemctl --system disable 'falco-plugin.service' || true
+systemctl --system disable 'falco-custom.service' || true
 systemctl --system disable 'falcoctl-artifact-follow.service' || true
 
 # unmask falcoctl if it was masked
@@ -36,12 +36,11 @@ systemctl --system unmask falcoctl-artifact-follow.service || true
 if [ $1 -eq 1 ]; then
         if [ -x /usr/bin/dialog ]; then
             # If dialog is installed, create a dialog to let users choose the correct driver for them
-            CHOICE=$(dialog --clear --title "Falco drivers" --menu "Choose your preferred driver:" 12 40 5 \
-                    1 "Don't start" \
+            CHOICE=$(dialog --clear --title "Falco drivers" --menu "Choose your preferred driver:" 12 55 4 \
+                    1 "Manual configuration (no unit is started)" \
                     2 "Kmod" \
                     3 "eBPF" \
                     4 "Modern eBPF" \
-                    5 "Plugin (needs manual configuration)" \
                     2>&1 >/dev/tty)
             case $CHOICE in
                 2)
diff --git a/scripts/rpm/postuninstall.in b/scripts/rpm/postuninstall.in
index 3091c411..58626323 100755
--- a/scripts/rpm/postuninstall.in
+++ b/scripts/rpm/postuninstall.in
@@ -22,7 +22,7 @@ if [ -d /run/systemd/system ] && [ $1 -eq 0 ]; then
         systemctl --system disable 'falco-kmod.service'|| true
         systemctl --system disable 'falco-bpf.service' || true
         systemctl --system disable 'falco-modern-bpf.service' || true
-        systemctl --system disable 'falco-plugin.service' || true
+        systemctl --system disable 'falco-custom.service' || true
         systemctl --system disable 'falcoctl-artifact-follow.service' || true
 
         echo "[POST-REMOVE] Trigger deamon-reload:"
diff --git a/scripts/rpm/preuninstall.in b/scripts/rpm/preuninstall.in
index 0d34074e..46ff2938 100755
--- a/scripts/rpm/preuninstall.in
+++ b/scripts/rpm/preuninstall.in
@@ -21,7 +21,7 @@ echo "[PRE-REMOVE] Stop all Falco services:"
 systemctl --system stop 'falco-kmod.service' || true
 systemctl --system stop 'falco-bpf.service' || true
 systemctl --system stop 'falco-modern-bpf.service' || true
-systemctl --system stop 'falco-plugin.service' || true
+systemctl --system stop 'falco-custom.service' || true
 systemctl --system stop 'falcoctl-artifact-follow.service' || true
 
 echo "[PRE-REMOVE] Call 'falco-driver-loader --clean:'"
@@ -37,5 +37,5 @@ falco-driver-loader --clean
 %systemd_preun 'falco-kmod.service'
 %systemd_preun 'falco-bpf.service'
 %systemd_preun 'falco-modern-bpf.service'
-%systemd_preun 'falco-plugin.service'
+%systemd_preun 'falco-custom.service'
 %systemd_preun 'falcoctl-artifact-follow.service'
diff --git a/scripts/systemd/falco-bpf.service b/scripts/systemd/falco-bpf.service
index 51ac8b6b..6bcdd06d 100644
--- a/scripts/systemd/falco-bpf.service
+++ b/scripts/systemd/falco-bpf.service
@@ -5,7 +5,7 @@ Before=falcoctl-artifact-follow.service
 Wants=falcoctl-artifact-follow.service
 Conflicts=falco-kmod.service
 Conflicts=falco-modern-bpf.service
-Conflicts=falco-plugin.service
+Conflicts=falco-custom.service
 
 [Service]
 Type=simple
diff --git a/scripts/systemd/falco-plugin.service b/scripts/systemd/falco-custom.service
similarity index 87%
rename from scripts/systemd/falco-plugin.service
rename to scripts/systemd/falco-custom.service
index 56e4c83e..9ec70ad2 100644
--- a/scripts/systemd/falco-plugin.service
+++ b/scripts/systemd/falco-custom.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Falco: Container Native Runtime Security with plugin
+Description=Falco: Container Native Runtime Security with custom configuration
 Documentation=https://falco.org/docs/
 Before=falcoctl-artifact-follow.service
 Wants=falcoctl-artifact-follow.service
diff --git a/scripts/systemd/falco-kmod.service b/scripts/systemd/falco-kmod.service
index fa5f37ce..6e7b8c54 100644
--- a/scripts/systemd/falco-kmod.service
+++ b/scripts/systemd/falco-kmod.service
@@ -7,7 +7,7 @@ Before=falcoctl-artifact-follow.service
 Wants=falcoctl-artifact-follow.service
 Conflicts=falco-bpf.service
 Conflicts=falco-modern-bpf.service
-Conflicts=falco-plugin.service
+Conflicts=falco-custom.service
 
 [Service]
 Type=simple
diff --git a/scripts/systemd/falco-modern-bpf.service b/scripts/systemd/falco-modern-bpf.service
index 05813835..fc9c6f42 100644
--- a/scripts/systemd/falco-modern-bpf.service
+++ b/scripts/systemd/falco-modern-bpf.service
@@ -5,7 +5,7 @@ Before=falcoctl-artifact-follow.service
 Wants=falcoctl-artifact-follow.service
 Conflicts=falco-kmod.service
 Conflicts=falco-bpf.service
-Conflicts=falco-plugin.service
+Conflicts=falco-custom.service
 
 [Service]
 Type=simple
diff --git a/scripts/systemd/falcoctl-artifact-follow.service b/scripts/systemd/falcoctl-artifact-follow.service
index 04538b25..1fe73980 100644
--- a/scripts/systemd/falcoctl-artifact-follow.service
+++ b/scripts/systemd/falcoctl-artifact-follow.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Falcoctl Artifact Follow: automatic artifacts update service
 Documentation=https://falco.org/docs/
-PartOf=falco-bpf.service falco-kmod.service falco-modern-bpf.service falco-plugin.service
+PartOf=falco-bpf.service falco-kmod.service falco-modern-bpf.service falco-custom.service
 
 [Service]
 Type=simple