diff --git a/roles/harbor/tasks/main.yml b/roles/harbor/tasks/main.yml
index f3fc8e3..88a58a2 100644
--- a/roles/harbor/tasks/main.yml
+++ b/roles/harbor/tasks/main.yml
@@ -16,7 +16,7 @@
 
     - name: Template config
       ansible.builtin.template:
-        src: service.yml.j2
+        src: yml.j2
         dest: "{{ (service_path, 'harbor.yml') | path_join }}"
         mode: "0644"
 
diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml
index 7db0c9b..9e8621e 100644
--- a/roles/influxdb/tasks/main.yml
+++ b/roles/influxdb/tasks/main.yml
@@ -14,7 +14,7 @@
 
     - name: Template config
       ansible.builtin.template:
-        src: service.yml.j2
+        src: yml.j2
         dest: "{{ (service_path, 'influxdb.yml') | path_join }}"
         mode: "0600"
 
diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml
index c87b23a..ff17bed 100644
--- a/roles/synapse/tasks/main.yml
+++ b/roles/synapse/tasks/main.yml
@@ -24,7 +24,7 @@
 
     - name: Template config
       ansible.builtin.template:
-        src: service.yml.j2
+        src: yml.j2
         dest: "{{ (config_path, 'homeserver.yaml') | path_join }}"
         mode: "0644"
 
diff --git a/roles/webhook/tasks/main.yml b/roles/webhook/tasks/main.yml
index 4930776..5fa9415 100644
--- a/roles/webhook/tasks/main.yml
+++ b/roles/webhook/tasks/main.yml
@@ -24,7 +24,7 @@
 
     - name: Template main config
       ansible.builtin.template:
-        src: service.yml.j2
+        src: yml.j2
         dest: "{{ (config_path, 'hooks.yml') | path_join }}"
         mode: "0644"
       register: cmd_result
diff --git a/tasks/steps/template-service-env.yml b/tasks/steps/template-service-env.yml
index eb3f562..61c37bb 100644
--- a/tasks/steps/template-service-env.yml
+++ b/tasks/steps/template-service-env.yml
@@ -1,6 +1,6 @@
 ---
 - name: Template service.env file
   ansible.builtin.template:
-    src: service.env.j2
+    src: env.j2
     dest: "{{ (service_path, 'service.env') | path_join }}"
     mode: "0700"
diff --git a/templates/service.env.j2 b/templates/env.j2
similarity index 100%
rename from templates/service.env.j2
rename to templates/env.j2
diff --git a/templates/json.j2 b/templates/json.j2
new file mode 100644
index 0000000..fdf149e
--- /dev/null
+++ b/templates/json.j2
@@ -0,0 +1 @@
+{{ json | to_json }}
diff --git a/templates/service.yml.j2 b/templates/yml.j2
similarity index 100%
rename from templates/service.yml.j2
rename to templates/yml.j2