diff --git a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/create-account/page-definition.json b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/create-account/page-definition.json
index e1b72d548621a7..c290b139a5f945 100644
--- a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/create-account/page-definition.json
+++ b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/create-account/page-definition.json
@@ -29,13 +29,7 @@
 	},
 	"settings": {
 		"colorSchemeName": "01",
-		"themeName": "Classic",
-		"themeSettings": {
-			"lfr-theme:regular:show-footer": "false",
-			"lfr-theme:regular:show-header": "false",
-			"lfr-theme:regular:show-header-search": "false",
-			"lfr-theme:regular:wrap-widget-page-content": "false"
-		}
+		"themeName": "Classic"
 	},
 	"version": 1.1
 }
\ No newline at end of file
diff --git a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/forgot-password/page-definition.json b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/forgot-password/page-definition.json
index 779f325ced8721..caab37ac7d7968 100644
--- a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/forgot-password/page-definition.json
+++ b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/forgot-password/page-definition.json
@@ -29,13 +29,7 @@
 	},
 	"settings": {
 		"colorSchemeName": "01",
-		"themeName": "Classic",
-		"themeSettings": {
-			"lfr-theme:regular:show-footer": "false",
-			"lfr-theme:regular:show-header": "false",
-			"lfr-theme:regular:show-header-search": "false",
-			"lfr-theme:regular:wrap-widget-page-content": "false"
-		}
+		"themeName": "Classic"
 	},
 	"version": 1.1
 }
\ No newline at end of file
diff --git a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/login/page-definition.json b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/login/page-definition.json
index 307caf861668c7..5145317f5c4c4f 100644
--- a/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/login/page-definition.json
+++ b/modules/apps/site-initializer/site-initializer-welcome/src/main/resources/site-initializer/layout-utility-page-entries/login/page-definition.json
@@ -29,13 +29,7 @@
 	},
 	"settings": {
 		"colorSchemeName": "01",
-		"themeName": "Classic",
-		"themeSettings": {
-			"lfr-theme:regular:show-footer": "false",
-			"lfr-theme:regular:show-header": "false",
-			"lfr-theme:regular:show-header-search": "false",
-			"lfr-theme:regular:wrap-widget-page-content": "false"
-		}
+		"themeName": "Classic"
 	},
 	"version": 1.1
 }
\ No newline at end of file
diff --git a/test.properties b/test.properties
index 5f41b305a96038..715c4ec051f141 100644
--- a/test.properties
+++ b/test.properties
@@ -6677,30 +6677,12 @@
         apps/site-navigation/site-navigation-language-test/**/*Test.java
 
     test.batch.class.names.includes[site-management]=\
-        **/click-to-chat/**/*Test.java,\
-        **/friendly-url-**/**/*Test.java,\
-        **/headless/headless-admin-site/**/*NavigationMenu*Test.java,\
-        **/headless/headless-admin-site/**/*Site*Test.java,\
-        **/headless/headless-delivery/**/*Language*Test.java,\
-        **/headless/headless-delivery/**/*NavigationMenu*Test.java,\
-        **/headless/headless-site/**/*Test.java,\
-        **/redirect-**/**/*Test.java,\
-        **/site/site-admin-**/**/*Test.java,\
-        **/site/site-memberships-test/**/*Test.java,\
-        **/site/site-test/**/*Test.java,\
-        **/site-initializer/site-initializer-extender/**/**/*Test.java,\
-        **/site-navigation/**/*Test.java
+        **/site-initializer/site-initializer-welcome-test/**/**/*Test.java
 
     test.batch.dist.app.servers[site-management]=tomcat
 
     test.batch.names[site-management]=\
-        functional-tomcat101-postgresql163,\
-        js-unit,\
-        modules-integration-postgresql163,\
-        modules-semantic-versioning,\
-        modules-unit,\
-        playwright-js-tomcat101-postgresql163,\
-        semantic-versioning
+        modules-integration-postgresql163
 
     test.batch.run.property.query[functional-tomcat101-postgresql163][site-management]=\
         (testray.main.component.name == "Click to Chat") OR \