diff --git a/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-cleanup b/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-cleanup
index 46c9b5a0..35e7de0e 100755
--- a/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-cleanup
+++ b/agent/charms/testflinger-agent-host-charm/src/tf-cmd-scripts/tf-cleanup
@@ -2,6 +2,10 @@
 
 AGENT=$(echo $agent_id | sed 's/-\([0-9]*\)$/\1/g')
 PROVISION_TYPE="$provision_type"
+
+# The following variables are set by the agent charm
+AGENT_CONFIGS_PATH={{ agent_configs_path }}
+CONFIG_DIR="{{ config_dir }}"
 VIRTUAL_ENV_PATH="{{ virtual_env_path }}"
 
 echo Cleaning up container if it exists... && docker rm -f $AGENT || /bin/true