diff --git a/repos/gems/recipes/pkg/test-file_vault/runtime b/repos/gems/recipes/pkg/test-file_vault/runtime
index 5f95dfb303..524eb42c7b 100644
--- a/repos/gems/recipes/pkg/test-file_vault/runtime
+++ b/repos/gems/recipes/pkg/test-file_vault/runtime
@@ -6,11 +6,11 @@
 
 	<fail after_seconds="70"/>
 	<succeed>
-			&lt;ui_report version="step_*" state="uninitialized"*
-			&lt;ui_report version="step_*" state="initializing"*
-			&lt;ui_report version="step_*" state="unlocked"*
-			&lt;ui_report version="step_*" state="locked"*
-			&lt;ui_report version="step_*" state="unlocked"*
+			&lt;ui_report state="uninitialized"*
+			&lt;ui_report state="initializing"*
+			&lt;ui_report state="unlocked"*
+			&lt;ui_report state="locked"*
+			&lt;ui_report state="unlocked"*
 	</succeed>
 
 	<content>
@@ -40,43 +40,18 @@
 			<provides><service name="ROM"/> </provides>
 			<config verbose="no">
 				<rom name="file_vault_ui_config">
-					<inline>
-
-						<ui_config version="step_1_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_2_init" passphrase="abcdefgh" client_fs_size="1M" journaling_buf_size="1M"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh" client_fs_size="1M" journaling_buf_size="1M"/> </inline>
 					<sleep milliseconds="10000"/>
-					<inline>
-
-						<ui_config version="step_3_lock"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_4_bad_unlock" passphrase="00000001"/>
-
-					</inline>
+					<inline> <ui_config passphrase="00000001"/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_5_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_6_unlock" passphrase="abcdefgh"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh"/> </inline>
 					<sleep milliseconds="600000"/>
-
 				</rom>
 			</config>
 			<route>
diff --git a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime
index ababdda86b..0d4fe756e5 100644
--- a/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime
+++ b/repos/gems/recipes/pkg/test-file_vault_no_entropy/runtime
@@ -6,11 +6,11 @@
 
 	<fail after_seconds="70"/>
 	<succeed>
-			&lt;ui_report version="step_*" state="uninitialized"*
-			&lt;ui_report version="step_*" state="initializing"*
-			&lt;ui_report version="step_*" state="unlocked"*
-			&lt;ui_report version="step_*" state="locked"*
-			&lt;ui_report version="step_*" state="unlocked"*
+			&lt;ui_report state="uninitialized"*
+			&lt;ui_report state="initializing"*
+			&lt;ui_report state="unlocked"*
+			&lt;ui_report state="locked"*
+			&lt;ui_report state="unlocked"*
 	</succeed>
 
 	<content>
@@ -40,43 +40,18 @@
 			<provides><service name="ROM"/> </provides>
 			<config verbose="no">
 				<rom name="file_vault_ui_config">
-					<inline>
-
-						<ui_config version="step_1_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_2_init" passphrase="abcdefgh" client_fs_size="1M" journaling_buf_size="1M"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh" client_fs_size="1M" journaling_buf_size="1M"/> </inline>
 					<sleep milliseconds="10000"/>
-					<inline>
-
-						<ui_config version="step_3_lock"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_4_bad_unlock" passphrase="00000001"/>
-
-					</inline>
+					<inline> <ui_config passphrase="00000001"/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_5_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_6_unlock" passphrase="abcdefgh"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh"/> </inline>
 					<sleep milliseconds="600000"/>
-
 				</rom>
 			</config>
 			<route>
diff --git a/repos/gems/run/file_vault.run b/repos/gems/run/file_vault.run
index acf94758cc..7fafcc0d62 100644
--- a/repos/gems/run/file_vault.run
+++ b/repos/gems/run/file_vault.run
@@ -72,47 +72,20 @@ append config {
 		<start name="dynamic_rom" caps="100">
 			<resource name="RAM" quantum="4M"/>
 			<provides><service name="ROM"/> </provides>
-			<config verbose="no">
+			<config verbose="yes">
 				<rom name="file_vault_ui_config">
-					<inline>
-
-						<ui_config version="step_1_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_2_init" passphrase="abcdefgh"
-						                                 client_fs_size="1M"
-						                                 journaling_buf_size="1M"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh" client_fs_size="1M" journaling_buf_size="1M"/> </inline>
 					<sleep milliseconds="10000"/>
-					<inline>
-
-						<ui_config version="step_3_lock"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_4_bad_unlock" passphrase="00000001"/>
-
-					</inline>
+					<inline> <ui_config passphrase="00000001"/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_5_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="6000"/>
-					<inline>
-
-						<ui_config version="step_6_unlock" passphrase="abcdefgh"/>
-
-					</inline>
+					<inline> <ui_config passphrase="abcdefgh"/> </inline>
 					<sleep milliseconds="600000"/>
-
 				</rom>
 			</config>
 			<route>
diff --git a/repos/gems/run/file_vault_client.run b/repos/gems/run/file_vault_client.run
index dd771fd192..118cd26669 100644
--- a/repos/gems/run/file_vault_client.run
+++ b/repos/gems/run/file_vault_client.run
@@ -110,31 +110,22 @@ append config {
 		<start name="dynamic_rom" caps="100">
 			<resource name="RAM" quantum="4M"/>
 			<provides><service name="ROM"/> </provides>
-			<config>
+			<config verbose="yes">
 				<rom name="file_vault_ui_config">
-					<inline>
-
-						<ui_config version="step_1_wait"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="3000"/>
 					<inline>}
 
 if {[container_initialized]} { append config "
-						<ui_config version=\"step_2_unlock\" passphrase=\"[passphrase]\"/>"
+						<ui_config passphrase=\"[passphrase]\"/>"
 } else { append config "
-						<ui_config version=\"step_2_init\" passphrase=\"[passphrase]\" client_fs_size=\"1M\" journaling_buf_size=\"1M\"/>"
+						<ui_config passphrase=\"[passphrase]\" client_fs_size=\"1M\" journaling_buf_size=\"1M\"/>"
 }
 append config {
 					</inline>
 					<sleep milliseconds="50000"/>
-					<inline>
-
-						<ui_config version="step_3_lock"/>
-
-					</inline>
+					<inline> <ui_config/> </inline>
 					<sleep milliseconds="3600000"/>
-
 				</rom>
 
 				<rom name="dynamic_init_config">
@@ -437,7 +428,7 @@ lappend_if [have_board linux] boot_modules [file tail [lx_fs_dir]]
 build_boot_image $boot_modules
 
 append qemu_args " -display none "
-run_genode_until "<ui_report version=\"step_3_lock\" state=\"locked\".*\n" 100
+run_genode_until "child \"bash\" exited with exit value 0.*\n" 100
 
 grep_output {\[init -> dynamic_init -> log_terminal\].*}
 
diff --git a/repos/gems/src/app/file_vault/include/file_vault/types.h b/repos/gems/src/app/file_vault/include/file_vault/types.h
index 8d7a859eed..ada4a55864 100644
--- a/repos/gems/src/app/file_vault/include/file_vault/types.h
+++ b/repos/gems/src/app/file_vault/include/file_vault/types.h
@@ -44,8 +44,6 @@ namespace File_vault {
 			fn(); });
 	}
 
-	using Version_string = String<80>;
-
 	inline size_t min_journal_buf(Number_of_bytes capacity)
 	{
 		size_t result { (size_t)capacity >> 8 };
@@ -122,7 +120,6 @@ namespace File_vault {
 		};
 
 		State state { INVALID };
-		Version_string version { };
 		Number_of_bytes image_size { };
 		Number_of_bytes capacity { };
 		Number_of_clients num_clients { };
@@ -134,7 +131,6 @@ namespace File_vault {
 		Ui_report(Xml_node const &node)
 		:
 			state(string_to_state(node.attribute_value("state", State_string()))),
-			version(node.attribute_value("version", Version_string())),
 			image_size(node.attribute_value("image_size", Number_of_bytes())),
 			capacity(node.attribute_value("capacity", Number_of_bytes())),
 			num_clients(node.attribute_value("num_clients", 0ULL))
@@ -146,7 +142,6 @@ namespace File_vault {
 		void generate(Xml_generator &xml)
 		{
 			xml.attribute("state", state_to_string(state));
-			xml.attribute("version", version);
 			xml.attribute("image_size", image_size);
 			xml.attribute("capacity", capacity);
 			xml.attribute("num_clients", num_clients.value);
@@ -212,7 +207,6 @@ namespace File_vault {
 			void generate(Xml_generator &xml) { xml.attribute("id", id.value); }
 		};
 
-		Version_string version { };
 		Passphrase passphrase { };
 		Number_of_bytes client_fs_size { };
 		Number_of_bytes journaling_buf_size { };
@@ -221,7 +215,6 @@ namespace File_vault {
 
 		Ui_config(Xml_node const &node)
 		:
-			version(node.attribute_value("version", Version_string())),
 			passphrase(node.attribute_value("passphrase", Passphrase())),
 			client_fs_size(node.attribute_value("client_fs_size", Number_of_bytes())),
 			journaling_buf_size(node.attribute_value("journaling_buf_size", Number_of_bytes()))