diff --git a/tasks/glance_init_systemd.yml b/tasks/glance_init_systemd.yml
deleted file mode 100644
index 04063e64..00000000
--- a/tasks/glance_init_systemd.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Create TEMP run dir
-  file:
-    path: "/var/run/{{ item.service_name }}"
-    state: directory
-    owner: "{{ glance_system_user_name }}"
-    group: "{{ glance_system_group_name }}"
-    mode: "02755"
-  with_items: "{{ filtered_glance_services }}"
-
-- name: Create TEMP lock dir
-  file:
-    path: "/var/lock/{{ item.service_name }}"
-    state: directory
-    owner: "{{ glance_system_user_name }}"
-    group: "{{ glance_system_group_name }}"
-    mode: "02755"
-  with_items: "{{ filtered_glance_services }}"
-
-- name: Create tmpfiles.d entry
-  template:
-    src: "glance-systemd-tmpfiles.j2"
-    dest: "/etc/tmpfiles.d/openstack-{{ item.service_name }}.conf"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-  with_items: "{{ filtered_glance_services }}"
-  notify:
-    - Manage LB
-    - Restart glance services
-
-- name: Place the systemd init script
-  config_template:
-    src: "glance-systemd-init.j2"
-    dest: "/etc/systemd/system/{{ item.service_name }}.service"
-    mode: "0644"
-    owner: "root"
-    group: "root"
-    config_overrides: "{{ item.init_config_overrides }}"
-    config_type: "ini"
-  with_items: "{{ filtered_glance_services }}"
-  notify:
-    - Manage LB
-    - Restart glance services
diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index c52d5c22..68cf22d4 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -210,3 +210,47 @@
     section: glance
     option: venv_tag
     value: "{{ glance_venv_tag }}"
+
+- name: Create TEMP run dir
+  file:
+    path: "/var/run/{{ item.service_name }}"
+    state: directory
+    owner: "{{ glance_system_user_name }}"
+    group: "{{ glance_system_group_name }}"
+    mode: "02755"
+  with_items: "{{ filtered_glance_services }}"
+
+- name: Create TEMP lock dir
+  file:
+    path: "/var/lock/{{ item.service_name }}"
+    state: directory
+    owner: "{{ glance_system_user_name }}"
+    group: "{{ glance_system_group_name }}"
+    mode: "02755"
+  with_items: "{{ filtered_glance_services }}"
+
+- name: Create tmpfiles.d entry
+  template:
+    src: "glance-systemd-tmpfiles.j2"
+    dest: "/etc/tmpfiles.d/openstack-{{ item.service_name }}.conf"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+  with_items: "{{ filtered_glance_services }}"
+  notify:
+    - Manage LB
+    - Restart glance services
+
+- name: Place the systemd init script
+  config_template:
+    src: "glance-systemd-init.j2"
+    dest: "/etc/systemd/system/{{ item.service_name }}.service"
+    mode: "0644"
+    owner: "root"
+    group: "root"
+    config_overrides: "{{ item.init_config_overrides }}"
+    config_type: "ini"
+  with_items: "{{ filtered_glance_services }}"
+  notify:
+    - Manage LB
+    - Restart glance services
diff --git a/tasks/main.yml b/tasks/main.yml
index e614fc97..cc7a188e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -33,10 +33,6 @@
   tags:
     - glance-config
 
-- include_tasks: "glance_init_{{ ansible_service_mgr }}.yml"
-  tags:
-    - glance-config
-
 - include_tasks: glance_db_setup.yml
   when:
     - "glance_services['glance-api']['group'] in group_names"