diff --git a/tasks/keystone_service_setup.yml b/tasks/keystone_service_setup.yml
index 47c81e0b..5e40ffc4 100644
--- a/tasks/keystone_service_setup.yml
+++ b/tasks/keystone_service_setup.yml
@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Restart service
-  service:
-    name: "{{ keystone_system_service_name }}"
-    state: restarted
-    pattern: "{{ keystone_system_service_name }}"
-
 - name: Wait for keystone admin to come up
   wait_for:
     host: "{{ ansible_ssh_host }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 7d4cf96a..a3139bc4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -87,6 +87,9 @@
     - keystone-install
     - keystone-config
 
+- name: Flush handlers
+  meta: flush_handlers
+
 - include: keystone_service_setup.yml
   tags:
     - keystone-install