diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
index 2c79b63c8..4983828f9 100644
--- a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapErrorOnReadingSourceTests.java
@@ -112,7 +112,7 @@ void namedSingleConfigMapFails() {
 
 		stubFor(get(path).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		CoreV1Api api = new CoreV1Api();
@@ -157,7 +157,7 @@ void namedTwoConfigMapsOneFails(CapturedOutput output) {
 		ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
 				Map.of(), null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
 				RetryProperties.DEFAULT);
 
@@ -203,7 +203,7 @@ void namedTwoConfigMapsBothFail(CapturedOutput output) {
 		ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(configMapNameTwo, namespace,
 				Map.of(), null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
 				RetryProperties.DEFAULT);
 
@@ -248,7 +248,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 		ConfigMapConfigProperties.Source configMapSource = new ConfigMapConfigProperties.Source(null, namespace, labels,
 				null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		CoreV1Api api = new CoreV1Api();
@@ -300,7 +300,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 		ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
 				configMapTwoLabels, null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
 				false, RetryProperties.DEFAULT);
 
@@ -355,7 +355,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 		ConfigMapConfigProperties.Source sourceTwo = new ConfigMapConfigProperties.Source(null, namespace,
 				configMapTwoLabels, null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
 				false, RetryProperties.DEFAULT);
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
index 549cb4dd5..23e41045b 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapErrorOnReadingSourceTests.java
@@ -73,7 +73,7 @@ void namedSingleConfigMapFails() {
 
 		mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(), List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
 				Map.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
@@ -113,7 +113,7 @@ void namedTwoConfigMapsOneFails() {
 		Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
 		Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
 				RetryProperties.DEFAULT);
 
@@ -148,7 +148,7 @@ void namedTwoConfigMapsBothFail() {
 		Source sourceOne = new Source(configMapNameOne, namespace, Map.of(), null, null, null);
 		Source sourceTwo = new Source(configMapNameTwo, namespace, Map.of(), null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of(), true, null, namespace, false, true, false,
 				RetryProperties.DEFAULT);
 
@@ -181,7 +181,7 @@ void labeledSingleConfigMapFails(CapturedOutput output) {
 
 		Source configMapSource = new Source(null, namespace, labels, null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(configMapSource), labels, true, null, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8ConfigMapPropertySourceLocator locator = new Fabric8ConfigMapPropertySourceLocator(mockClient,
@@ -226,7 +226,7 @@ void labeledTwoConfigMapsOneFails(CapturedOutput output) {
 		Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
 		Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
 				false, RetryProperties.DEFAULT);
 
@@ -266,7 +266,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 		Source sourceOne = new Source(null, namespace, configMapOneLabels, null, null, null);
 		Source sourceTwo = new Source(null, namespace, configMapTwoLabels, null, null, null);
 
-		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true, List.of(),
+		ConfigMapConfigProperties configMapConfigProperties = new ConfigMapConfigProperties(true,
 				List.of(sourceOne, sourceTwo), Map.of("one", "1", "two", "2"), true, null, namespace, false, true,
 				false, RetryProperties.DEFAULT);
 
diff --git a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
index 4c203861f..7bf227157 100644
--- a/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
+++ b/spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretErrorOnReadingSourceTests.java
@@ -73,7 +73,7 @@ void namedSingleSecretFails(CapturedOutput output) {
 
 		mockServer.expect().withPath(path).andReturn(500, "Internal Server Error").once();
 
-		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
+		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
 				List.of(), true, name, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -112,7 +112,7 @@ void namedTwoSecretsOneFails() {
 		Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
 		Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
 
-		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
+		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
 				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -146,7 +146,7 @@ void namedTwoSecretsBothFail() {
 		Source sourceOne = new Source(secretNameOne, namespace, Map.of(), null, null, null);
 		Source sourceTwo = new Source(secretNameTwo, namespace, Map.of(), null, null, null);
 
-		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(), List.of(),
+		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, Map.of(),
 				List.of(sourceOne, sourceTwo), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -178,7 +178,7 @@ void labeledSingleSecretFails(CapturedOutput output) {
 
 		Source secretSource = new Source(null, namespace, labels, null, null, null);
 
-		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels, List.of(),
+		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true, labels,
 				List.of(secretSource), true, null, namespace, false, true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -224,7 +224,7 @@ void labeledTwoSecretsOneFails(CapturedOutput output) {
 		Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
-				Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
+				Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
 				true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,
@@ -264,7 +264,7 @@ void labeledTwoConfigMapsBothFail(CapturedOutput output) {
 		Source sourceTwo = new Source(null, namespace, secretTwoLabels, null, null, null);
 
 		SecretsConfigProperties secretsConfigProperties = new SecretsConfigProperties(true,
-				Map.of("one", "1", "two", "2"), List.of(), List.of(sourceOne, sourceTwo), true, null, namespace, false,
+				Map.of("one", "1", "two", "2"), List.of(sourceOne, sourceTwo), true, null, namespace, false,
 				true, false, RetryProperties.DEFAULT);
 
 		Fabric8SecretsPropertySourceLocator locator = new Fabric8SecretsPropertySourceLocator(mockClient,