diff --git a/podvm/files/etc/systemd/system/kata-agent.service b/podvm/files/etc/systemd/system/kata-agent.service
index 8f76f8e57..f3a5924e8 100644
--- a/podvm/files/etc/systemd/system/kata-agent.service
+++ b/podvm/files/etc/systemd/system/kata-agent.service
@@ -5,7 +5,9 @@ Wants=process-user-data.service
 After=netns@podns.service process-user-data.service
 
 [Service]
-ExecStart=/usr/local/bin/kata-agent --config /run/peerpod/agent-config.toml
+# Temporary fix for
+ExecStartPre=mkdir -p /run/kata-containers
+ExecStart=/usr/local/bin/kata-agent --config /etc/agent-config.toml
 ExecStartPre=-umount /sys/fs/cgroup/misc
 ExecStopPost=/usr/local/bin/kata-agent-clean --config /run/peerpod/agent-config.toml
 # Now specified in the agent-config.toml Environment="KATA_AGENT_SERVER_ADDR=unix:///run/kata-containers/agent.sock"
diff --git a/podvm/files/etc/systemd/system/run-image.mount b/podvm/files/etc/systemd/system/run-image.mount
deleted file mode 100644
index f4afe119c..000000000
--- a/podvm/files/etc/systemd/system/run-image.mount
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mount unit for /run/image
-Before=kata-agent.service
-
-[Mount]
-What=/image
-Where=/run/image
-Type=none
-Options=bind
-
-[Install]
-WantedBy=multi-user.target
diff --git "a/podvm/files/etc/systemd/system/run-kata\\x2dcontainers.mount" "b/podvm/files/etc/systemd/system/run-kata\\x2dcontainers.mount"
deleted file mode 100644
index 64d5e27f6..000000000
--- "a/podvm/files/etc/systemd/system/run-kata\\x2dcontainers.mount"
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mount unit for /run/kata-containers
-Before=kata-agent.service
-
-[Mount]
-What=/kata-containers
-Where=/run/kata-containers
-Type=none
-Options=bind
-
-[Install]
-WantedBy=multi-user.target