diff --git a/bin/create_dual_intermediate_CA.sh b/bin/create_dual_intermediate_CA.sh
index 254aa357d9..2cb1ae38fc 100755
--- a/bin/create_dual_intermediate_CA.sh
+++ b/bin/create_dual_intermediate_CA.sh
@@ -27,6 +27,7 @@ set -x -e
 
 CA_PATH=dual_ca
 
+rm -rf $CA_PATH
 mkdir $CA_PATH
 chmod 700 $CA_PATH
 cd $CA_PATH
diff --git a/bin/create_single_CA_intermediate_CA.sh b/bin/create_single_CA_intermediate_CA.sh
index 2c6d19b572..7403c33ca5 100755
--- a/bin/create_single_CA_intermediate_CA.sh
+++ b/bin/create_single_CA_intermediate_CA.sh
@@ -27,6 +27,7 @@ set -x -e
 
 CA_PATH=single_ca
 
+rm -rf $CA_PATH
 mkdir $CA_PATH
 chmod 700 $CA_PATH
 cd $CA_PATH
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 9021bb692f..96707ea66a 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -590,6 +590,9 @@ function octavia_cleanup {
         _cleanup_octavia_apache_wsgi
     fi
 
+    sudo rm -rf $OCTAVIA_DIR/bin/dual_ca
+    sudo rm -rf $OCTAVIA_DIR/bin/single_ca
+
     sudo rm -rf $NOVA_STATE_PATH $NOVA_AUTH_CACHE_DIR
 
     sudo rm -f /etc/rsyslog.d/10-octavia-log-offloading.conf