diff --git a/src/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star b/src/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star
index 17f3735..14d001b 100644
--- a/src/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star
+++ b/src/prelaunch_data_generator/cl_validator_keystores/cl_validator_keystore_generator.star
@@ -120,8 +120,8 @@ def generate_cl_validator_keystores(
 		keystore_files,
 	)
 
-	# we cleanup as the data generation is done
-	plan.remove_service(service_name)
+	# TODO replace this with a task so that we can get the container removed
+	# we are removing  a call to remove_service for idempotency
 	return result