diff --git a/tasks/glance_init_common.yml b/tasks/glance_init_common.yml
index fc7d958c..f6eb25cb 100644
--- a/tasks/glance_init_common.yml
+++ b/tasks/glance_init_common.yml
@@ -14,10 +14,12 @@
 # limitations under the License.
 
 - include: glance_init_upstart.yml
-  when: pid1_name == "init"
+  when:
+    - ansible_service_mgr == 'upstart'
 
 - include: glance_init_systemd.yml
-  when: pid1_name == "systemd"
+  when:
+    - ansible_service_mgr == 'systemd'
 
 - name: Load service
   service:
diff --git a/tasks/main.yml b/tasks/main.yml
index 92015b63..379fc2f8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,19 +25,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: glance_pre_install.yml
   tags:
     - glance-install