diff --git a/modules/sdk/gradle-plugins-workspace/src/gradleTest/excludePatterns/gradle.properties b/modules/sdk/gradle-plugins-workspace/src/gradleTest/excludePatterns/gradle.properties
index 373b7bd458cbe2..f8aadbfac1b03b 100644
--- a/modules/sdk/gradle-plugins-workspace/src/gradleTest/excludePatterns/gradle.properties
+++ b/modules/sdk/gradle-plugins-workspace/src/gradleTest/excludePatterns/gradle.properties
@@ -1,6 +1,7 @@
 liferay.workspace.dir.excludes.globs=\
     **/*-service,\
     themes/**
+
 liferay.workspace.modules.dir=*
 liferay.workspace.themes.dir=*
 liferay.workspace.wars.dir=*
\ No newline at end of file
diff --git a/portal-impl/src/portal.properties b/portal-impl/src/portal.properties
index ec917b64263b63..29ab54b349ca83 100644
--- a/portal-impl/src/portal.properties
+++ b/portal-impl/src/portal.properties
@@ -8053,6 +8053,12 @@
 
     #
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_FELIX_PERIOD_CM_PERIOD_CONFIG_PERIOD_PLUGINS
+    #
+    module.framework.properties.felix.cm.config.plugins=\
+        com.liferay.portal.configuration.plugin.internal.WebIdToCompanyConfigurationPluginImpl,\
+        org.apache.felix.configadmin.plugin.interpolation
+
+    #
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_FELIX_PERIOD_CM_PERIOD_PM
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_GOSH_PERIOD_ARGS
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_ORG_PERIOD_APACHE_PERIOD_CXF_PERIOD_OSGI_PERIOD_HTTP_PERIOD_TRANSPORT_PERIOD_DISABLE
@@ -8060,9 +8066,6 @@
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_ORG_PERIOD_APACHE_PERIOD_FELIX_PERIOD_CONFIGADMIN_PERIOD_PLUGIN_PERIOD_INTERPOLATION_PERIOD_SECRETSDIR
     # Env: LIFERAY_MODULE_PERIOD_FRAMEWORK_PERIOD_PROPERTIES_PERIOD_ORG_PERIOD_APACHE_PERIOD_FELIX_PERIOD_EVENTADMIN_PERIOD__UPPERCASET_HREAD_UPPERCASEP_OOL_UPPERCASES_IZE
     #
-    module.framework.properties.felix.cm.config.plugins=\
-        com.liferay.portal.configuration.plugin.internal.WebIdToCompanyConfigurationPluginImpl,\
-        org.apache.felix.configadmin.plugin.interpolation
     module.framework.properties.felix.cm.pm=com.liferay.portal.configuration.persistence.internal.ConfigurationPersistenceManager
     module.framework.properties.gosh.args=--noshutdown
     module.framework.properties.org.apache.cxf.osgi.http.transport.disable=true
diff --git a/workspaces/liferay-adyen-workspace/client-extensions/liferay-adyen-commerce-payment-integration/src/main/resources/application-default.properties b/workspaces/liferay-adyen-workspace/client-extensions/liferay-adyen-commerce-payment-integration/src/main/resources/application-default.properties
index de1a092720c4b8..3bcfe803cf2f17 100644
--- a/workspaces/liferay-adyen-workspace/client-extensions/liferay-adyen-commerce-payment-integration/src/main/resources/application-default.properties
+++ b/workspaces/liferay-adyen-workspace/client-extensions/liferay-adyen-commerce-payment-integration/src/main/resources/application-default.properties
@@ -13,6 +13,7 @@ com.liferay.lxc.dxp.server.protocol=http
 liferay.oauth.application.external.reference.codes=\
     liferay-adyen-commerce-payment-integration-oauth-application-headless-server,\
     liferay-adyen-commerce-payment-integration-oauth-application-user-agent
+
 liferay.oauth.urls.excludes=/ready
 
 #
diff --git a/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/resources/application-default.properties b/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/resources/application-default.properties
index 3a9d9905e73b84..7e3b7486412a13 100644
--- a/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/resources/application-default.properties
+++ b/workspaces/liferay-customer-workspace/client-extensions/liferay-customer-etc-spring-boot/src/main/resources/application-default.properties
@@ -23,6 +23,7 @@ com.liferay.lxc.dxp.server.protocol=http
 liferay.oauth.application.external.reference.codes=\
     liferay-customer-etc-spring-boot-oauth-application-headless-server,\
     liferay-customer-etc-spring-boot-oauth-application-user-agent
+
 liferay.oauth.urls.excludes=/ready
 
 #
diff --git a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-etc-spring-boot/src/main/resources/application-default.properties b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-etc-spring-boot/src/main/resources/application-default.properties
index edf931caa3d8c7..45e9d36c3b1897 100644
--- a/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-etc-spring-boot/src/main/resources/application-default.properties
+++ b/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-etc-spring-boot/src/main/resources/application-default.properties
@@ -37,6 +37,7 @@ liferay.oauth.application.external.reference.codes=\
     liferay-marketplace-etc-cron-oauth-application-headless-server,\
     liferay-marketplace-etc-spring-boot-oauth-application-headless-server,\
     liferay-marketplace-etc-spring-boot-oauth-application-user-agent
+
 liferay.oauth.urls.excludes=/ready
 
 #
diff --git a/workspaces/liferay-sample-workspace/client-extensions/liferay-sample-etc-spring-boot/src/main/resources/application-default.properties b/workspaces/liferay-sample-workspace/client-extensions/liferay-sample-etc-spring-boot/src/main/resources/application-default.properties
index 07dc0b16e96ae3..0742e160ad28b7 100644
--- a/workspaces/liferay-sample-workspace/client-extensions/liferay-sample-etc-spring-boot/src/main/resources/application-default.properties
+++ b/workspaces/liferay-sample-workspace/client-extensions/liferay-sample-etc-spring-boot/src/main/resources/application-default.properties
@@ -5,6 +5,7 @@
 liferay.oauth.application.external.reference.codes=\
     liferay-sample-etc-cron-oauth-application-headless-server,\
     liferay-sample-etc-spring-boot-oauth-application-user-agent
+
 liferay.oauth.urls.excludes=/ready
 
 #