diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 828532f50..981978d2c 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -43,13 +43,13 @@ matrix_riot_web_welcome_text: "_t('Decentralised, encrypted chat & collabora
 
 # Links, shown in footer of welcome page:
 # [{"text": "Link text", "url": "https://link.target"}, {"text": "Other link"}]
-matrix_riot_web_welcome_footerlinks: false
+matrix_riot_web_branding_authFooterLinks: ~
 
 # URL to image, shown during Login
-matrix_riot_web_welcome_authlogo: "{{ matrix_riot_web_welcome_logo }}"
+matrix_riot_web_branding_authHeaderLogoUrl: "{{ matrix_riot_web_welcome_logo }}"
 
 # URL to Wallpaper, shown in background of welcome page
-matrix_riot_web_welcome_background: false
+matrix_riot_web_branding_welcomeBackgroundUrl: ~
 
 # By default, there's no Riot homepage (when logged in). If you wish to have one,
 # point this to a `home.html` template file on your local filesystem.
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index a950f70ec..b82d53e07 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -31,8 +31,8 @@
 		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|string|to_json }}
 	},
 	"branding": {
-		"authFooterLinks": {{ matrix_riot_web_welcome_footerlinks|to_json }},
-		"authHeaderLogoUrl": {{ matrix_riot_web_welcome_authlogo|to_json }},
-		"welcomeBackgroundUrl": {{ matrix_riot_web_welcome_background|to_json }}
+		"authFooterLinks": {{ matrix_riot_web_branding_authFooterLinks|to_json }},
+		"authHeaderLogoUrl": {{ matrix_riot_web_branding_authHeaderLogoUrl|to_json }},
+		"welcomeBackgroundUrl": {{ matrix_riot_web_branding_welcomeBackgroundUrl|to_json }}
 	}
 }