diff --git a/tasks/keystone_init_common.yml b/tasks/keystone_init_common.yml
index 31d631f7..044d8e35 100644
--- a/tasks/keystone_init_common.yml
+++ b/tasks/keystone_init_common.yml
@@ -15,11 +15,13 @@
 
 - include: keystone_init_upstart.yml
   static: no
-  when: pid1_name == "init"
+  when:
+    - ansible_service_mgr == 'upstart'
 
 - include: keystone_init_systemd.yml
   static: no
-  when: pid1_name == "systemd"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Load service
   service:
diff --git a/tasks/main.yml b/tasks/main.yml
index 24f9fb73..e54f1e3d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -42,19 +42,6 @@
   tags:
     - always
 
-- name: Check init system
-  command: cat /proc/1/comm
-  changed_when: false
-  register: _pid1_name
-  tags:
-    - always
-
-- name: Set the name of pid1
-  set_fact:
-    pid1_name: "{{ _pid1_name.stdout }}"
-  tags:
-    - always
-
 - include: keystone_pre_install.yml
   tags:
     - keystone-install