diff --git a/setup-controller.sh b/setup-controller.sh
index 9110dc043c79e35594de39984fac35f99722a229..ec548f8f66dcfe1d41cf633569fdf9d4c95275e6 100755
--- a/setup-controller.sh
+++ b/setup-controller.sh
@@ -311,6 +311,9 @@ EOF
 	service_restart keystone
 	service_enable keystone
     else
+	service_stop keystone
+	service_disable keystone
+
 	service_restart apache2
 	service_enable apache2
     fi