diff --git a/libvirt-qemu/executor.sh b/libvirt-qemu/executor.sh
index ed5688a72090e9ed4b70db3fbb9cb400de3f440b..6ff8df9a2bd4b68a63593c28332007406e927369 100755
--- a/libvirt-qemu/executor.sh
+++ b/libvirt-qemu/executor.sh
@@ -98,6 +98,7 @@ do_run() {
 		"after_script") ;;
 		"archive_cache") ;;
 		"upload_artifacts_on_success"|"upload_artifacts_on_failure") ;;
+		"cleanup_file_variables") ;;
 		*) fatal_error "Unsupported run stage '${RUN_STAGE}'" ;;
 	esac
 
diff --git a/windows-docker/executor.py b/windows-docker/executor.py
index 3cc6dbdbbeedb5a669fe57e61744cc0e131252dc..ff6a5d1bff8493a3ca7abee3cec63470f571b928 100644
--- a/windows-docker/executor.py
+++ b/windows-docker/executor.py
@@ -77,6 +77,7 @@ def do_run(container_name, args):
         'archive_cache',
         'upload_artifacts_on_success',
         'upload_artifacts_on_failure',
+        'cleanup_file_variables',
     ]
 
     script_src = args[0]