diff --git a/lib/schemas/build_metadata_schema.xsd b/lib/schemas/build_metadata_schema.xsd
index 975d0e387..faef0aced 100644
--- a/lib/schemas/build_metadata_schema.xsd
+++ b/lib/schemas/build_metadata_schema.xsd
@@ -33,6 +33,7 @@
+
@@ -84,4 +85,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/schemas/service_metadata_schema.xsd b/lib/schemas/service_metadata_schema.xsd
index 33b96cd97..01507501b 100644
--- a/lib/schemas/service_metadata_schema.xsd
+++ b/lib/schemas/service_metadata_schema.xsd
@@ -36,6 +36,10 @@
+
+
+
+
@@ -81,4 +85,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/schemas/utility_metadata_schema.xsd b/lib/schemas/utility_metadata_schema.xsd
index 2714ac8cc..d454c627b 100644
--- a/lib/schemas/utility_metadata_schema.xsd
+++ b/lib/schemas/utility_metadata_schema.xsd
@@ -36,6 +36,10 @@
+
+
+
+
@@ -81,4 +85,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/build/unix/cleanup/secgen_metadata.xml b/modules/build/unix/cleanup/secgen_metadata.xml
index 498580dc3..d49da6cd8 100644
--- a/modules/build/unix/cleanup/secgen_metadata.xml
+++ b/modules/build/unix/cleanup/secgen_metadata.xml
@@ -15,7 +15,21 @@
clobber_file_times
disable_ssh
-
+
+ true
+
+
+
+
+
+
+
+ false
+
+
+
+ false
+
utilities/unix/system/accounts
diff --git a/scenarios/simple_examples/random_vuln_with_cleanup.xml b/scenarios/simple_examples/random_vuln_with_cleanup.xml
index 6d3074c0f..30255be90 100644
--- a/scenarios/simple_examples/random_vuln_with_cleanup.xml
+++ b/scenarios/simple_examples/random_vuln_with_cleanup.xml
@@ -11,18 +11,8 @@
-
- true
-
- test
-
-
-
- false
-
-
- false
+ pwnable