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",
diff --git a/bmc_json_config.md b/bmc_json_config.md
index 5d457b5..5aed44b 100644
--- a/bmc_json_config.md
+++ b/bmc_json_config.md
@@ -31,9 +31,8 @@
             "unit": "phosphor-ipmi-flash-bios-prepare.target"
         },
         "verification": {
-            "type": "fileSystemdVerify",
-            "unit": "phosphor-ipmi-flash-bios-verify.target",
-            "path": "/tmp/bios.verify"
+            "type": "systemd",
+            "unit": "phosphor-ipmi-flash-bios-verify.target"
         },
         "update": {
             "type": "systemd",
@@ -104,16 +103,12 @@
 `phosphor-ipmi-flash-bios-prepare.target`. This can be a single service name, or
 a target.
 
-In this configuration the `verification` type is `fileSystemdVerify`. This is
-similar to the `systemd` type except it also expects a `path`. The `path` is
-used to read back the status of whatever was triggered via the `unit` field. Was
-the verification successful? Is the verification still in progress? This
-information is read back from the file specified by the `path` field.
+In this configuration the `verification` type is `systemd`. This will query
+systemd for the status of the verification unit to determine running, success,
+or failure.
 
 In this configuration the `update` type is `systemd`. This is the same object as
-with the `preparation` action. In this case, though the status cannot be read
-back with something useful. Typically, the `fileSystemdVerify` type should be
-used as it provides information on success.
+with the `preparation` action.
 
 ## config-static-bmc-reboot.json
 
@@ -133,9 +128,8 @@
             "unit": "phosphor-ipmi-flash-bmc-prepare.target"
         },
         "verification": {
-            "type": "fileSystemdVerify",
-            "unit": "phosphor-ipmi-flash-bmc-verify.target",
-            "path": "/tmp/bmc.verify"
+            "type": "systemd",
+            "unit": "phosphor-ipmi-flash-bmc-verify.target"
         },
         "update": {
             "type": "reboot"
@@ -166,9 +160,8 @@
             "unit": "phosphor-ipmi-flash-bmc-prepare.target"
         },
         "verification": {
-            "type": "fileSystemdVerify",
-            "unit": "phosphor-ipmi-flash-bmc-verify.target",
-            "path": "/tmp/bmc.verify"
+            "type": "systemd",
+            "unit": "phosphor-ipmi-flash-bmc-verify.target"
         },
         "update": {
             "type": "systemd",