diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2
index 28b73f1b2f..159f39c5e5 100644
--- a/docker/neutron/neutron-agents/Dockerfile.j2
+++ b/docker/neutron/neutron-agents/Dockerfile.j2
@@ -35,6 +35,9 @@ COPY config-sudoers.sh /var/lib/kolla/
 
 COPY start.sh /
 
+# We will remove this line in Docker 1.10 when namespace propogation works
+VOLUME /run/netns
+
 CMD ["/start.sh"]
 
 {{ include_footer }}
diff --git a/docker/neutron/neutron-agents/start.sh b/docker/neutron/neutron-agents/start.sh
index e156506592..fb17322774 100755
--- a/docker/neutron/neutron-agents/start.sh
+++ b/docker/neutron/neutron-agents/start.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -o errexit
 
+# We must remove all of the stale namespaces if they exist
+rm -f /run/netns/*
+
 # Processing /var/lib/kolla/config_files/config.json
 python /usr/local/bin/kolla_set_configs