diff --git a/bmc/config-bios.json.in b/bmc/config-bios.json.in
index 90dbff9..2267704 100644
--- a/bmc/config-bios.json.in
+++ b/bmc/config-bios.json.in
@@ -10,9 +10,8 @@
 			"unit": "@PREPARATION_BIOS_TARGET@"
 		},
 		"verification": {
-			"type": "fileSystemdVerify",
-			"unit": "@VERIFY_BIOS_TARGET@",
-			"path": "@BIOS_VERIFY_STATUS_FILENAME@"
+			"type": "systemd",
+			"unit": "@VERIFY_BIOS_TARGET@"
 		},
 		"update": {
 			"type": "systemd",
diff --git a/bmc/config-static-bmc-reboot.json.in b/bmc/config-static-bmc-reboot.json.in
index d5536e0..e2618e8 100644
--- a/bmc/config-static-bmc-reboot.json.in
+++ b/bmc/config-static-bmc-reboot.json.in
@@ -10,9 +10,8 @@
 			"unit": "@PREPARATION_DBUS_SERVICE@"
 		},
 		"verification": {
-			"type": "fileSystemdVerify",
-			"unit": "@VERIFY_DBUS_SERVICE@",
-			"path": "@VERIFY_STATUS_FILENAME@"
+			"type": "systemd",
+			"unit": "@VERIFY_DBUS_SERVICE@"
 		},
 		"update": {
 			"type": "reboot"
diff --git a/bmc/config-static-bmc-with-update-status.json.in b/bmc/config-static-bmc-with-update-status.json.in
index 65d856a..e2077a8 100644
--- a/bmc/config-static-bmc-with-update-status.json.in
+++ b/bmc/config-static-bmc-with-update-status.json.in
@@ -10,14 +10,12 @@
 			"unit": "@PREPARATION_DBUS_SERVICE@"
 		},
 		"verification": {
-			"type": "fileSystemdVerify",
-			"unit": "@VERIFY_DBUS_SERVICE@",
-			"path": "@VERIFY_STATUS_FILENAME@"
+			"type": "systemd",
+			"unit": "@VERIFY_DBUS_SERVICE@"
 		},
 		"update": {
-			"type": "fileSystemdUpdate",
-			"unit": "@UPDATE_DBUS_SERVICE@",
-			"path": "@UPDATE_STATUS_FILENAME@"
+			"type": "systemd",
+			"unit": "@UPDATE_DBUS_SERVICE@"
 		}
 	}
-}]
\ No newline at end of file
+}]
diff --git a/bmc/config-static-bmc.json.in b/bmc/config-static-bmc.json.in
index e3bc813..e2077a8 100644
--- a/bmc/config-static-bmc.json.in
+++ b/bmc/config-static-bmc.json.in
@@ -10,9 +10,8 @@
 			"unit": "@PREPARATION_DBUS_SERVICE@"
 		},
 		"verification": {
-			"type": "fileSystemdVerify",
-			"unit": "@VERIFY_DBUS_SERVICE@",
-			"path": "@VERIFY_STATUS_FILENAME@"
+			"type": "systemd",
+			"unit": "@VERIFY_DBUS_SERVICE@"
 		},
 		"update": {
 			"type": "systemd",