diff --git a/tasks/keystone_init_systemd.yml b/tasks/keystone_init_systemd.yml
index b1ba7279..2848bb08 100644
--- a/tasks/keystone_init_systemd.yml
+++ b/tasks/keystone_init_systemd.yml
@@ -13,16 +13,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Create Keystone TEMP dirs
+- name: Create TEMP run dir
   file:
-    path: "{{ item.path }}/{{ program_name }}"
+    path: "/var/run/{{ item }}"
     state: directory
-    owner: "{{ system_user }}"
-    group: "{{ system_group }}"
+    owner: "{{ keystone_system_user_name }}"
+    group: "{{ keystone_system_group_name }}"
     mode: "02755"
-  with_items:
-    - { path: "/var/run" }
-    - { path: "/var/lock" }
+  with_items: "{{ keystone_wsgi_program_names }}"
+
+- name: Create TEMP lock dir
+  file:
+    path: "/var/lock/{{ item }}"
+    state: directory
+    owner: "{{ keystone_system_user_name }}"
+    group: "{{ keystone_system_group_name }}"
+    mode: "02755"
+  with_items: "{{ keystone_wsgi_program_names }}"
 
 - name: Create tempfile.d entry
   template:
@@ -38,12 +45,13 @@
 - name: Place the systemd init script
   config_template:
     src: "keystone-uwsgi_systemd-init.j2"
-    dest: "/etc/systemd/system/{{ program_name }}.service"
+    dest: "/etc/systemd/system/{{ item }}.service"
     mode: "0644"
     owner: "root"
     group: "root"
     config_overrides: "{{ keystone_uwsgi_init_overrides }}"
     config_type: "ini"
+  with_items: "{{ keystone_wsgi_program_names }}"
   notify:
     - Restart uWSGI
     - Restart web server
diff --git a/tasks/keystone_uwsgi.yml b/tasks/keystone_uwsgi.yml
index 20c4218e..1660cc04 100644
--- a/tasks/keystone_uwsgi.yml
+++ b/tasks/keystone_uwsgi.yml
@@ -30,17 +30,3 @@
     - Restart uWSGI
 
 - include: "keystone_init_{{ ansible_service_mgr }}.yml"
-  vars:
-    program_name: "{{ keystone_wsgi_public_program_name }}"
-    service_name: "{{ keystone_wsgi_public_program_name }}"
-    system_user: "{{ keystone_system_user_name }}"
-    system_group: "{{ keystone_system_group_name }}"
-    service_home: "{{ keystone_system_user_home }}"
-
-- include: "keystone_init_{{ ansible_service_mgr }}.yml"
-  vars:
-    program_name: "{{ keystone_wsgi_admin_program_name }}"
-    service_name: "{{ keystone_wsgi_admin_program_name }}"
-    system_user: "{{ keystone_system_user_name }}"
-    system_group: "{{ keystone_system_group_name }}"
-    service_home: "{{ keystone_system_user_home }}"
diff --git a/templates/keystone-systemd-tempfiles.j2 b/templates/keystone-systemd-tempfiles.j2
index b723d85d..9df02a36 100644
--- a/templates/keystone-systemd-tempfiles.j2
+++ b/templates/keystone-systemd-tempfiles.j2
@@ -1,4 +1,6 @@
 # {{ ansible_managed }}
 
-D /var/lock/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
-D /var/run/{{ program_name }} 2755 {{ system_user }} {{ system_group }}
+{% for program_name in keystone_wsgi_program_names %}
+D /var/lock/{{ program_name }} 2755 {{ keystone_system_user_name }} {{ keystone_system_group_name }}
+D /var/run/{{ program_name }} 2755 {{ keystone_system_user_name }} {{ keystone_system_group_name }}
+{% endfor %}
diff --git a/templates/keystone-uwsgi_systemd-init.j2 b/templates/keystone-uwsgi_systemd-init.j2
index c96490d1..cb021d96 100644
--- a/templates/keystone-uwsgi_systemd-init.j2
+++ b/templates/keystone-uwsgi_systemd-init.j2
@@ -7,13 +7,13 @@ After=network.target
 
 [Service]
 Type=simple
-User={{ system_user }}
-Group={{ system_group }}
+User={{ keystone_system_user_name }}
+Group={{ keystone_system_group_name }}
 
 {% if program_override is defined %}
-ExecStart={{ program_override }} --ini /etc/uwsgi/{{ program_name }}.ini --logto /var/log/keystone/{{ program_name }}.log {{ program_config_options|default('') }}
+ExecStart={{ program_override }} --ini /etc/uwsgi/{{ item }}.ini --logto /var/log/keystone/{{ item }}.log {{ program_config_options|default('') }}
 {% else %}
-ExecStart={{ keystone_bin }}/uwsgi --ini /etc/uwsgi/{{ program_name }}.ini --logto /var/log/keystone/{{ program_name }}.log {{ program_config_options|default('') }}
+ExecStart={{ keystone_bin }}/uwsgi --ini /etc/uwsgi/{{ item }}.ini --logto /var/log/keystone/{{ item }}.log {{ program_config_options|default('') }}
 {% endif %}
 
 # Give a reasonable amount of time for the server to start up/shut down