diff --git a/lib/keystone b/lib/keystone
index b31cc57a56..ba3a519508 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -450,6 +450,8 @@ function start_keystone {
 function stop_keystone {
     # Kill the Keystone screen window
     screen_stop key
+    # Cleanup the WSGI files and VHOST
+    _cleanup_keystone_apache_wsgi
 }