diff --git a/tasks/service.yaml b/tasks/service.yaml
index f394f46..2db2960 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -162,9 +162,9 @@
     zuul_file_zuul_web_service_config_src: "{{ __zuul_file_zuul_web_service_config_src }}"
   when: zuul_file_zuul_web_service_config_src is not defined
 
-- name: Copy zuul-executor service into place.
+- name: Install zuul-executor service into place.
   become: yes
-  copy:
+  template:
     dest: "{{ zuul_file_zuul_executor_service_dest }}"
     group: "{{ zuul_file_zuul_executor_service_group }}"
     mode: "{{ zuul_file_zuul_executor_service_mode }}"
@@ -182,7 +182,7 @@
     state: directory
   when: zuul_file_zuul_executor_service_config_manage
 
-- name: Copy zuul-executor service config into place.
+- name: Install zuul-executor service config into place.
   become: yes
   template:
     dest: "{{ zuul_file_zuul_executor_service_config_dest }}"
@@ -193,9 +193,9 @@
   register: zuul_file_zuul_executor_service_config
   when: zuul_file_zuul_executor_service_config_manage
 
-- name: Copy zuul-fingergw service into place.
+- name: Install zuul-fingergw service into place.
   become: yes
-  copy:
+  template:
     dest: "{{ zuul_file_zuul_fingergw_service_dest }}"
     group: "{{ zuul_file_zuul_fingergw_service_group }}"
     mode: "{{ zuul_file_zuul_fingergw_service_mode }}"
@@ -213,7 +213,7 @@
     state: directory
   when: zuul_file_zuul_fingergw_service_config_manage
 
-- name: Copy zuul-fingergw service config into place.
+- name: Install zuul-fingergw service config into place.
   become: yes
   template:
     dest: "{{ zuul_file_zuul_fingergw_service_config_dest }}"
@@ -224,9 +224,9 @@
   register: zuul_file_zuul_fingergw_service_config
   when: zuul_file_zuul_fingergw_service_config_manage
 
-- name: Copy zuul-merger service into place.
+- name: Install zuul-merger service into place.
   become: yes
-  copy:
+  template:
     dest: "{{ zuul_file_zuul_merger_service_dest }}"
     group: "{{ zuul_file_zuul_merger_service_group }}"
     mode: "{{ zuul_file_zuul_merger_service_mode }}"
@@ -244,7 +244,7 @@
     state: directory
   when: zuul_file_zuul_merger_service_config_manage
 
-- name: Copy zuul-merger service config into place.
+- name: Install zuul-merger service config into place.
   become: yes
   template:
     dest: "{{ zuul_file_zuul_merger_service_config_dest }}"
@@ -255,9 +255,9 @@
   register: zuul_file_zuul_merger_service_config
   when: zuul_file_zuul_merger_service_config_manage
 
-- name: Copy zuul-scheduler service into place.
+- name: Install zuul-scheduler service into place.
   become: yes
-  copy:
+  template:
     dest: "{{ zuul_file_zuul_scheduler_service_dest }}"
     group: "{{ zuul_file_zuul_scheduler_service_group }}"
     mode: "{{ zuul_file_zuul_scheduler_service_mode }}"
@@ -275,7 +275,7 @@
     state: directory
   when: zuul_file_zuul_scheduler_service_config_manage
 
-- name: Copy zuul-scheduler service config into place.
+- name: Install zuul-scheduler service config into place.
   become: yes
   template:
     dest: "{{ zuul_file_zuul_scheduler_service_config_dest }}"
@@ -286,9 +286,9 @@
   register: zuul_file_zuul_scheduler_service_config
   when: zuul_file_zuul_scheduler_service_config_manage
 
-- name: Copy zuul-web service into place.
+- name: Install zuul-web service into place.
   become: yes
-  copy:
+  template:
     dest: "{{ zuul_file_zuul_web_service_dest }}"
     group: "{{ zuul_file_zuul_web_service_group }}"
     mode: "{{ zuul_file_zuul_web_service_mode }}"
@@ -306,7 +306,7 @@
     state: directory
   when: zuul_file_zuul_web_service_config_manage
 
-- name: Copy zuul-web service config into place.
+- name: Install zuul-web service config into place.
   become: yes
   template:
     dest: "{{ zuul_file_zuul_web_service_config_dest }}"
diff --git a/files/etc/systemd/system/zuul-executor.service b/templates/etc/systemd/system/zuul-executor.service
similarity index 100%
rename from files/etc/systemd/system/zuul-executor.service
rename to templates/etc/systemd/system/zuul-executor.service
diff --git a/files/etc/systemd/system/zuul-fingergw.service b/templates/etc/systemd/system/zuul-fingergw.service
similarity index 100%
rename from files/etc/systemd/system/zuul-fingergw.service
rename to templates/etc/systemd/system/zuul-fingergw.service
diff --git a/files/etc/systemd/system/zuul-merger.service b/templates/etc/systemd/system/zuul-merger.service
similarity index 100%
rename from files/etc/systemd/system/zuul-merger.service
rename to templates/etc/systemd/system/zuul-merger.service
diff --git a/files/etc/systemd/system/zuul-scheduler.service b/templates/etc/systemd/system/zuul-scheduler.service
similarity index 100%
rename from files/etc/systemd/system/zuul-scheduler.service
rename to templates/etc/systemd/system/zuul-scheduler.service
diff --git a/files/etc/systemd/system/zuul-web.service b/templates/etc/systemd/system/zuul-web.service
similarity index 100%
rename from files/etc/systemd/system/zuul-web.service
rename to templates/etc/systemd/system/zuul-web.service