diff --git a/roles/matrix-client-hydrogen/defaults/main.yml b/roles/matrix-client-hydrogen/defaults/main.yml
index 1baccdd3..6d7fb5cf 100644
--- a/roles/matrix-client-hydrogen/defaults/main.yml
+++ b/roles/matrix-client-hydrogen/defaults/main.yml
@@ -31,7 +31,13 @@ matrix_client_hydrogen_systemd_required_services_list: ['docker.service']
 matrix_client_hydrogen_self_check_validate_certificates: true
 
 # config.json
+matrix_client_hydrogen_push:
+  appId: io.element.hydrogen.web
+  gatewayUrl: https://matrix.org
+  applicationServerKey: "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM"
 matrix_client_hydrogen_default_hs_url: ""
+matrix_client_hydrogen_bugReportEndpointUrl: "https://element.io/bugreports/submit"  # noqa var-naming
+
 
 # Default Hydrogen configuration template which covers the generic use case.
 # You can customize it by controlling the various variables inside it.
diff --git a/roles/matrix-client-hydrogen/templates/config.json.j2 b/roles/matrix-client-hydrogen/templates/config.json.j2
index 0c4331b6..161ee47b 100644
--- a/roles/matrix-client-hydrogen/templates/config.json.j2
+++ b/roles/matrix-client-hydrogen/templates/config.json.j2
@@ -1,11 +1,7 @@
 {
-	"push": {
-		"appId": "io.element.hydrogen.web",
-		"gatewayUrl": "https://matrix.org",
-		"applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM"
-	},
-	"defaultHomeServer": {{ matrix_client_hydrogen_default_hs_url | string|to_json }},
-	"bugReportEndpointUrl": "https://element.io/bugreports/submit",
+	"push": {{ matrix_client_hydrogen_push | to_json }},
+	"defaultHomeServer": {{ matrix_client_hydrogen_default_hs_url | string | to_json }},
+	"bugReportEndpointUrl": {{ matrix_client_hydrogen_bugReportEndpointUrl | to_json }},
 	"themeManifests": [
 		"assets/theme-Element.json"
 	],