diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index da24a10a3e..0d2676fe76 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Set up jdk
       uses: actions/setup-java@v5
       with:
-       java-version: '17'
+       java-version: '17.0.8'
        distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
diff --git a/demo/demo-consul/consumer/pom.xml b/demo/demo-consul/consumer/pom.xml
index 9c27c516e7..eccc75e41b 100644
--- a/demo/demo-consul/consumer/pom.xml
+++ b/demo/demo-consul/consumer/pom.xml
@@ -64,7 +64,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-consul/gateway/pom.xml b/demo/demo-consul/gateway/pom.xml
index 1934a4adfc..1dad3860e7 100644
--- a/demo/demo-consul/gateway/pom.xml
+++ b/demo/demo-consul/gateway/pom.xml
@@ -67,7 +67,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-consul/provider/pom.xml b/demo/demo-consul/provider/pom.xml
index 7de7b7c268..0986f9f434 100644
--- a/demo/demo-consul/provider/pom.xml
+++ b/demo/demo-consul/provider/pom.xml
@@ -74,7 +74,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-crossapp/crossapp-server/pom.xml b/demo/demo-crossapp/crossapp-server/pom.xml
index 28fc2672e9..0207bdb7b2 100644
--- a/demo/demo-crossapp/crossapp-server/pom.xml
+++ b/demo/demo-crossapp/crossapp-server/pom.xml
@@ -58,7 +58,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-edge/authentication/pom.xml b/demo/demo-edge/authentication/pom.xml
index 5f6d47f2a2..4849faf28f 100644
--- a/demo/demo-edge/authentication/pom.xml
+++ b/demo/demo-edge/authentication/pom.xml
@@ -54,7 +54,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-edge/business-1-1-0/pom.xml b/demo/demo-edge/business-1-1-0/pom.xml
index 19f1a19301..1cef9b01ca 100644
--- a/demo/demo-edge/business-1-1-0/pom.xml
+++ b/demo/demo-edge/business-1-1-0/pom.xml
@@ -60,7 +60,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-edge/business-1.0.0/pom.xml b/demo/demo-edge/business-1.0.0/pom.xml
index cc469f8a4a..d7e35748fe 100644
--- a/demo/demo-edge/business-1.0.0/pom.xml
+++ b/demo/demo-edge/business-1.0.0/pom.xml
@@ -62,7 +62,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-edge/business-2.0.0/pom.xml b/demo/demo-edge/business-2.0.0/pom.xml
index 0e1e926a16..3500be47d7 100644
--- a/demo/demo-edge/business-2.0.0/pom.xml
+++ b/demo/demo-edge/business-2.0.0/pom.xml
@@ -62,7 +62,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-edge/edge-service/pom.xml b/demo/demo-edge/edge-service/pom.xml
index 3302820f26..31fdcff387 100644
--- a/demo/demo-edge/edge-service/pom.xml
+++ b/demo/demo-edge/edge-service/pom.xml
@@ -60,7 +60,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-etcd/consumer/pom.xml b/demo/demo-etcd/consumer/pom.xml
index 2b6f645a6f..20a03319d4 100644
--- a/demo/demo-etcd/consumer/pom.xml
+++ b/demo/demo-etcd/consumer/pom.xml
@@ -74,7 +74,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-etcd/gateway/pom.xml b/demo/demo-etcd/gateway/pom.xml
index 13e8d0f049..0b52381a49 100644
--- a/demo/demo-etcd/gateway/pom.xml
+++ b/demo/demo-etcd/gateway/pom.xml
@@ -73,7 +73,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-etcd/provider/pom.xml b/demo/demo-etcd/provider/pom.xml
index ba16384e36..8d8c005a1e 100644
--- a/demo/demo-etcd/provider/pom.xml
+++ b/demo/demo-etcd/provider/pom.xml
@@ -83,7 +83,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-filter/filter-client/pom.xml b/demo/demo-filter/filter-client/pom.xml
index 6180016656..6c39fb4f5a 100644
--- a/demo/demo-filter/filter-client/pom.xml
+++ b/demo/demo-filter/filter-client/pom.xml
@@ -67,7 +67,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-filter/filter-edge/pom.xml b/demo/demo-filter/filter-edge/pom.xml
index 06905af988..798f7b7697 100644
--- a/demo/demo-filter/filter-edge/pom.xml
+++ b/demo/demo-filter/filter-edge/pom.xml
@@ -71,7 +71,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-filter/filter-server/pom.xml b/demo/demo-filter/filter-server/pom.xml
index 6729f2c16a..b3f257fd87 100644
--- a/demo/demo-filter/filter-server/pom.xml
+++ b/demo/demo-filter/filter-server/pom.xml
@@ -62,7 +62,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-jaxrs/jaxrs-server/pom.xml b/demo/demo-jaxrs/jaxrs-server/pom.xml
index acb758a977..cc80ad1521 100644
--- a/demo/demo-jaxrs/jaxrs-server/pom.xml
+++ b/demo/demo-jaxrs/jaxrs-server/pom.xml
@@ -72,7 +72,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml b/demo/demo-local-registry/demo-local-registry-server/pom.xml
index ebf2a657bb..8832ac2dc8 100644
--- a/demo/demo-local-registry/demo-local-registry-server/pom.xml
+++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml
@@ -66,7 +66,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
index 37045fcb87..4a0b37f443 100644
--- a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
+++ b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml
@@ -66,7 +66,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
index af0caa4387..ddfd3570a4 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml
@@ -66,7 +66,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
index 443a6a18fd..66dfd58d9b 100644
--- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
+++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml
@@ -66,7 +66,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-multiple/multiple-server/pom.xml b/demo/demo-multiple/multiple-server/pom.xml
index daec9769db..18c7ae1906 100644
--- a/demo/demo-multiple/multiple-server/pom.xml
+++ b/demo/demo-multiple/multiple-server/pom.xml
@@ -65,7 +65,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-nacos/consumer/pom.xml b/demo/demo-nacos/consumer/pom.xml
index 3c98b25de2..6dfe326f6a 100644
--- a/demo/demo-nacos/consumer/pom.xml
+++ b/demo/demo-nacos/consumer/pom.xml
@@ -64,7 +64,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-nacos/gateway/pom.xml b/demo/demo-nacos/gateway/pom.xml
index e0f6a6b710..f76d407973 100644
--- a/demo/demo-nacos/gateway/pom.xml
+++ b/demo/demo-nacos/gateway/pom.xml
@@ -67,7 +67,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-nacos/provider/pom.xml b/demo/demo-nacos/provider/pom.xml
index 03c8e24449..a23bc1bb06 100644
--- a/demo/demo-nacos/provider/pom.xml
+++ b/demo/demo-nacos/provider/pom.xml
@@ -68,7 +68,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-pojo/pojo-server/pom.xml b/demo/demo-pojo/pojo-server/pom.xml
index 7909f04ed7..b0b673ef47 100644
--- a/demo/demo-pojo/pojo-server/pom.xml
+++ b/demo/demo-pojo/pojo-server/pom.xml
@@ -62,7 +62,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
index b6bfa795ad..2d34ae6205 100644
--- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
+++ b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml
@@ -61,7 +61,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
index e99b680a5a..60761704af 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml
@@ -63,7 +63,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
index 02bf3f89de..efa0723b59 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml
@@ -58,7 +58,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-springmvc/springmvc-server/pom.xml b/demo/demo-springmvc/springmvc-server/pom.xml
index 483e7a7b2d..f88876261d 100644
--- a/demo/demo-springmvc/springmvc-server/pom.xml
+++ b/demo/demo-springmvc/springmvc-server/pom.xml
@@ -62,7 +62,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
index af8f280b61..385bb4950a 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/pom.xml
@@ -73,7 +73,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
index bb739a1533..c8dcb06893 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-edge/pom.xml
@@ -78,7 +78,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
index c1bb884c85..f69f1118a0 100644
--- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
+++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-server/pom.xml
@@ -74,7 +74,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zookeeper/consumer/pom.xml b/demo/demo-zookeeper/consumer/pom.xml
index 22fc889434..73fb82a25a 100644
--- a/demo/demo-zookeeper/consumer/pom.xml
+++ b/demo/demo-zookeeper/consumer/pom.xml
@@ -64,7 +64,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zookeeper/gateway/pom.xml b/demo/demo-zookeeper/gateway/pom.xml
index adaef43eee..f2676b1ed6 100644
--- a/demo/demo-zookeeper/gateway/pom.xml
+++ b/demo/demo-zookeeper/gateway/pom.xml
@@ -67,7 +67,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/demo/demo-zookeeper/provider/pom.xml b/demo/demo-zookeeper/provider/pom.xml
index 8bfd598e98..3b008bfb00 100644
--- a/demo/demo-zookeeper/provider/pom.xml
+++ b/demo/demo-zookeeper/provider/pom.xml
@@ -76,7 +76,7 @@
                     <name>${project.artifactId}:${project.version}</name>
                     <alias>${project.artifactId}</alias>
                     <build>
-                      <from>openjdk:17.0.2</from>
+                      <from>eclipse-temurin:17-jre-jammy</from>
                       <ports>
                         <port>7070</port>
                         <port>8080</port>
diff --git a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
index 98d71e6b29..e80e867cab 100644
--- a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
+++ b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/AKSKAuthHeaderProvider.java
@@ -19,6 +19,7 @@
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -65,25 +66,21 @@ public class AKSKAuthHeaderProvider implements AuthHeaderProvider, BootStrapServ
 
   private final Map<String, String> headers = new HashMap<>();
 
-  private boolean enabled = true;
-
   private boolean loaded = false;
 
   public AKSKAuthHeaderProvider() {
   }
 
   public Map<String, String> authHeaders() {
-    if (enabled && !environment.getProperty(CONFIG_AKSK_ENABLED, boolean.class, true)) {
-      enabled = false;
-      return headers;
+    if (!environment.getProperty(CONFIG_AKSK_ENABLED, boolean.class, true)) {
+      return Collections.emptyMap();
     }
 
     if (StringUtils.isEmpty(getAccessKey())) {
       LOGGER.warn("ak sk auth enabled but access key is not configured, disable it at runtime. "
               + "Config [{}] to false to disable it implicitly.",
           CONFIG_AKSK_ENABLED);
-      enabled = false;
-      return headers;
+      return Collections.emptyMap();
     }
 
     if (!loaded) {