diff --git a/plist b/plist
index 760d68bb6..1db7df480 100644
--- a/plist
+++ b/plist
@@ -1122,7 +1122,6 @@
 /usr/local/opnsense/service/conf/actions.d/actions_netflow.conf
 /usr/local/opnsense/service/conf/actions.d/actions_openssh.conf
 /usr/local/opnsense/service/conf/actions.d/actions_openvpn.conf
-/usr/local/opnsense/service/conf/actions.d/actions_pfplugin.conf
 /usr/local/opnsense/service/conf/actions.d/actions_syslog.conf
 /usr/local/opnsense/service/conf/actions.d/actions_system.conf
 /usr/local/opnsense/service/conf/actions.d/actions_template.conf
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
index 56cfeff77..ca04d624f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
@@ -124,7 +124,7 @@ abstract class FilterBaseController extends ApiMutableModelControllerBase
         if ($this->request->isPost()) {
             if ($rollback_revision != null) {
                 // background rollback timer
-                (new Backend())->configdpRun('pfplugin rollback_timer', [$rollback_revision], true);
+                (new Backend())->configdpRun('filter rollback_timer', [$rollback_revision], true);
             }
             return array("status" => (new Backend())->configdRun('filter reload'));
         } else {
@@ -136,7 +136,7 @@ abstract class FilterBaseController extends ApiMutableModelControllerBase
     {
         if ($this->request->isPost()) {
             return array(
-                "status" => (new Backend())->configdpRun('pfplugin cancel_rollback', [$rollback_revision])
+                "status" => (new Backend())->configdpRun('filter cancel_rollback', [$rollback_revision])
             );
         } else {
             return array("status" => "error");
diff --git a/src/opnsense/service/conf/actions.d/actions_filter.conf b/src/opnsense/service/conf/actions.d/actions_filter.conf
index abaa1fd68..b90a6cd46 100644
--- a/src/opnsense/service/conf/actions.d/actions_filter.conf
+++ b/src/opnsense/service/conf/actions.d/actions_filter.conf
@@ -142,3 +142,15 @@ command:/usr/local/opnsense/scripts/filter/find_table_references.py
 parameters: %s
 type:script_output
 message:check which aliases match the given IP
+
+[rollback_timer]
+command:/usr/local/bin/flock -n -E 0 -o /tmp/filter_rollback_timer.lock /usr/local/opnsense/scripts/filter/rollback_timer.php
+parameters: %s
+type:script
+message:wait for api feedback or revert to previous filter plugin config
+
+[cancel_rollback]
+command:/usr/local/opnsense/scripts/filter/rollback_cancel.php
+parameters: %s
+type:script_output
+message:cancel filter rollback
diff --git a/src/opnsense/service/conf/actions.d/actions_pfplugin.conf b/src/opnsense/service/conf/actions.d/actions_pfplugin.conf
deleted file mode 100644
index 91fab897c..000000000
--- a/src/opnsense/service/conf/actions.d/actions_pfplugin.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[rollback_timer]
-command:/usr/local/bin/flock -n -E 0 -o /tmp/filter_rollback_timer.lock /usr/local/opnsense/scripts/filter/rollback_timer.php
-parameters: %s
-type:script
-message:wait for api feedback or revert to previous filter plugin config
-
-[cancel_rollback]
-command:/usr/local/opnsense/scripts/filter/rollback_cancel.php
-parameters: %s
-type:script_output
-message:cancel filter rollback