diff --git a/lib/cinder b/lib/cinder
index 17005af..5477e26 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -253,6 +253,7 @@
     # Create cache dir
     sudo mkdir -p $CINDER_AUTH_CACHE_DIR
     sudo chown `whoami` $CINDER_AUTH_CACHE_DIR
+    rm -f $CINDER_AUTH_CACHE_DIR/*
 }
 
 # install_cinder() - Collect source and prepare
diff --git a/lib/glance b/lib/glance
index 4f631b2..8ba04b3 100644
--- a/lib/glance
+++ b/lib/glance
@@ -162,8 +162,10 @@
     # Create cache dir
     sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/api
     sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/api
+    rm -f $GLANCE_AUTH_CACHE_DIR/api/*
     sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/registry
     sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/registry
+    rm -f $GLANCE_AUTH_CACHE_DIR/registry/*
 }
 
 # install_glanceclient() - Collect source and prepare
diff --git a/lib/keystone b/lib/keystone
index 2185f6f..7950fa9 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -259,11 +259,13 @@
 
     if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then
         # Set up certificates
+        rm -rf $KEYSTONE_CONF_DIR/ssl
         $KEYSTONE_DIR/bin/keystone-manage pki_setup
 
         # Create cache dir
         sudo mkdir -p $KEYSTONE_AUTH_CACHE_DIR
         sudo chown `whoami` $KEYSTONE_AUTH_CACHE_DIR
+        rm -f $KEYSTONE_AUTH_CACHE_DIR/*
     fi
 }
 
diff --git a/lib/nova b/lib/nova
index 840965e..e07e61c 100644
--- a/lib/nova
+++ b/lib/nova
@@ -435,6 +435,7 @@
     # Create cache dir
     sudo mkdir -p $NOVA_AUTH_CACHE_DIR
     sudo chown `whoami` $NOVA_AUTH_CACHE_DIR
+    rm -f $NOVA_AUTH_CACHE_DIR/*
 }
 
 # install_novaclient() - Collect source and prepare
diff --git a/lib/quantum b/lib/quantum
index 288a327..480aaa1 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -127,6 +127,7 @@
     # Create cache dir
     sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR
     sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR
+    rm -f $QUANTUM_AUTH_CACHE_DIR/*
 }
 
 function quantum_setup_ovs_bridge() {