diff --git a/roles/attribute-aggregation/templates/serverapplication.yml.j2 b/roles/attribute-aggregation/templates/serverapplication.yml.j2
index 5b3138cad..7929fab4b 100644
--- a/roles/attribute-aggregation/templates/serverapplication.yml.j2
+++ b/roles/attribute-aggregation/templates/serverapplication.yml.j2
@@ -34,7 +34,7 @@ security:
 api:
   lifecycle:
     username: {{ attribute_aggregator_api_lifecycle_username }}
-    password: {{ attribute_aggregator_api_lifecycle_password }}
+    password: "{{ attribute_aggregator_api_lifecycle_password }}"
 
 pseudo:
   mail_postfix: {{ attribute_aggregation_pseudo_mail_postfix }}
diff --git a/roles/invite/templates/mockapplication.yml.j2 b/roles/invite/templates/mockapplication.yml.j2
index fe1e6c390..621fffe8b 100644
--- a/roles/invite/templates/mockapplication.yml.j2
+++ b/roles/invite/templates/mockapplication.yml.j2
@@ -18,7 +18,7 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://{{ invite.db_host }}/invite
     username: {{ invite.db_user }}
-    password: {{ invite.db_secret }}
+    password: "{{ invite.db_secret }}"
 
 server:
   port: 8081
diff --git a/roles/manage-server/templates/application.yml.j2 b/roles/manage-server/templates/application.yml.j2
index 7150ce8a1..ac754edcd 100644
--- a/roles/manage-server/templates/application.yml.j2
+++ b/roles/manage-server/templates/application.yml.j2
@@ -39,7 +39,7 @@ push:
     url: https://connect.{{ base_domain }}/manage/connections
     user: manage
     name: {{ manage.oidcng_name }}
-    password: {{ oidcng_api_metadata_push_password }}
+    password: "{{ oidcng_api_metadata_push_password }}"
     enabled: {{ manage.oidc_push_enabled }}
   pdp:
     url: https://pdp.{{ base_domain }}/pdp/api/manage/push
@@ -47,7 +47,7 @@ push:
     decide_url: https://pdp.{{ base_domain }}/pdp/api/manage/decide
     name: {{ manage.pdp_name }}
     user: {{ pdp.username }}
-    password: {{ pdp.password }}
+    password: "{{ pdp.password }}"
 
 product:
   name: Manage
@@ -61,7 +61,7 @@ metadata_templates_path: file://{{ manage_dir }}/metadata_templates
 
 security:
   backdoor_user_name: {{ manage.backdoor_api_user }}
-  backdoor_password: {{ manage_backdoor_api_password }}
+  backdoor_password: "{{ manage_backdoor_api_password }}"
   api_users_config_path: file://{{ manage_dir }}/manage-api-users.yml
   super_user_team_names: {{ manage.super_user_team_names }}
 
@@ -79,7 +79,7 @@ spring:
   datasource:
     url: jdbc:mysql://{{ pdp.db_host }}/{{ pdp.db_name }}?permitMysqlScheme
     username: {{ pdp.db_user }}
-    password: {{ pdp.db_password }}
+    password: "{{ pdp.db_password }}"
     driverClassName: org.mariadb.jdbc.Driver
   main:
     banner-mode: "off"
diff --git a/roles/myconext/templates/application.yml.j2 b/roles/myconext/templates/application.yml.j2
index a6bae43a5..b7dbc4f22 100644
--- a/roles/myconext/templates/application.yml.j2
+++ b/roles/myconext/templates/application.yml.j2
@@ -145,7 +145,7 @@ external-api-configuration:
 oidc-token-api:
   token-url: https://connect.{{ base_domain }}/tokens
   user: eduid
-  password: {{ oidcng_api_tokens_eduid_password }}
+  password: "{{ oidcng_api_tokens_eduid_password }}"
   enabled: {{ oidcng.token_api_enabled }}
 
 oidc:
diff --git a/roles/teams/templates/serverapplication.yml.j2 b/roles/teams/templates/serverapplication.yml.j2
index 097ad4024..555b5343b 100644
--- a/roles/teams/templates/serverapplication.yml.j2
+++ b/roles/teams/templates/serverapplication.yml.j2
@@ -7,7 +7,7 @@ logging:
 api:
   lifecycle:
     username: {{ teams_api_lifecycle_username }}
-    password: {{ teams_api_lifecycle_password }}
+    password: "{{ teams_api_lifecycle_password }}"
 
 secure_cookie: true
 
@@ -41,7 +41,7 @@ features:
 security:
   user:
     name: {{ teams.voot_api_user }}
-    password: {{ external_group_provider_secrets.teams }}
+    password: "{{ external_group_provider_secrets.teams }}"
 
 sp_dashboard:
   user-name: {{ teams.spdashboard_api_user }}