diff --git a/ans-sdk-core/src/main/java/com/godaddy/ans/sdk/config/AnsConfiguration.java b/ans-sdk-core/src/main/java/com/godaddy/ans/sdk/config/AnsConfiguration.java
index 698ee82..6764baa 100644
--- a/ans-sdk-core/src/main/java/com/godaddy/ans/sdk/config/AnsConfiguration.java
+++ b/ans-sdk-core/src/main/java/com/godaddy/ans/sdk/config/AnsConfiguration.java
@@ -120,7 +120,7 @@ public boolean isRetryEnabled() {
      */
     public static final class Builder {
 
-        private Environment environment = Environment.OTE;
+        private Environment environment;
         private String baseUrl;
         private AnsCredentialsProvider credentialsProvider;
         private Duration connectTimeout;
@@ -206,6 +206,9 @@ public Builder enableRetry(int maxRetries) {
          * @throws NullPointerException if required fields are not set
          */
         public AnsConfiguration build() {
+            if (this.environment == null) {
+                throw new IllegalStateException("Environment is required");
+            }
             return new AnsConfiguration(this);
         }
     }
diff --git a/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/config/AnsConfigurationTest.java b/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/config/AnsConfigurationTest.java
index 48224f5..ff14821 100644
--- a/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/config/AnsConfigurationTest.java
+++ b/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/config/AnsConfigurationTest.java
@@ -115,20 +115,20 @@ void shouldThrowExceptionWhenCredentialsProviderIsNull() {
     }
 
     @Test
-    @DisplayName("Should use default OTE environment when not specified")
-    void shouldUseDefaultOteEnvironment() {
-        AnsConfiguration config = AnsConfiguration.builder()
+    @DisplayName("Should throw when environment is not set")
+    void shouldThrowWhenEnvironmentNotSet() {
+        assertThatThrownBy(() -> AnsConfiguration.builder()
             .credentialsProvider(testProvider)
-            .build();
-
-        assertThat(config.getEnvironment()).isEqualTo(Environment.OTE);
-        assertThat(config.getBaseUrl()).isEqualTo("https://api.ote-godaddy.com");
+            .build())
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Environment is required");
     }
 
     @Test
-    @DisplayName("Should allow custom base URL with default environment")
-    void shouldAllowCustomBaseUrlWithDefaultEnvironment() {
+    @DisplayName("Should allow custom base URL with explicit environment")
+    void shouldAllowCustomBaseUrlWithExplicitEnvironment() {
         AnsConfiguration config = AnsConfiguration.builder()
+            .environment(Environment.OTE)
             .baseUrl("http://custom-url.com")
             .credentialsProvider(testProvider)
             .build();
diff --git a/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/http/HttpClientFactoryTest.java b/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/http/HttpClientFactoryTest.java
index a4091d4..49f4cda 100644
--- a/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/http/HttpClientFactoryTest.java
+++ b/ans-sdk-core/src/test/java/com/godaddy/ans/sdk/http/HttpClientFactoryTest.java
@@ -2,6 +2,7 @@
 
 import com.godaddy.ans.sdk.auth.JwtCredentialsProvider;
 import com.godaddy.ans.sdk.config.AnsConfiguration;
+import com.godaddy.ans.sdk.config.Environment;
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpClient;
@@ -17,6 +18,7 @@ class HttpClientFactoryTest {
     @Test
     void createWithConfigurationShouldReturnConfiguredClient() {
         AnsConfiguration config = AnsConfiguration.builder()
+            .environment(Environment.OTE)
             .credentialsProvider(new JwtCredentialsProvider("test-token"))
             .connectTimeout(Duration.ofSeconds(30))
             .build();
@@ -40,6 +42,7 @@ void createDefaultShouldReturnClientWithDefaults() {
     @Test
     void createShouldConfigureRedirectPolicy() {
         AnsConfiguration config = AnsConfiguration.builder()
+            .environment(Environment.OTE)
             .credentialsProvider(new JwtCredentialsProvider("test-token"))
             .build();
 
diff --git a/ans-sdk-discovery/src/main/java/com/godaddy/ans/sdk/discovery/DiscoveryClient.java b/ans-sdk-discovery/src/main/java/com/godaddy/ans/sdk/discovery/DiscoveryClient.java
index 915bb65..12ebcfd 100644
--- a/ans-sdk-discovery/src/main/java/com/godaddy/ans/sdk/discovery/DiscoveryClient.java
+++ b/ans-sdk-discovery/src/main/java/com/godaddy/ans/sdk/discovery/DiscoveryClient.java
@@ -136,10 +136,25 @@ public AnsConfiguration getConfiguration() {
     public static final class Builder {
 
         private final AnsConfiguration.Builder configBuilder = AnsConfiguration.builder();
+        private AnsConfiguration prebuiltConfiguration;
 
         private Builder() {
         }
 
+        /**
+         * Uses a pre-built configuration directly.
+         *
+         * <p>When set, this configuration is used as-is and any values set via
+         * other builder methods are ignored.</p>
+         *
+         * @param configuration the pre-built configuration
+         * @return this builder
+         */
+        public Builder configuration(AnsConfiguration configuration) {
+            this.prebuiltConfiguration = configuration;
+            return this;
+        }
+
         /**
          * Sets the environment.
          *
@@ -212,7 +227,10 @@ public Builder enableRetry(int maxRetries) {
          * @return a new DiscoveryClient instance
          */
         public DiscoveryClient build() {
-            return new DiscoveryClient(configBuilder.build());
+            AnsConfiguration config = (prebuiltConfiguration != null)
+                ? prebuiltConfiguration
+                : configBuilder.build();
+            return new DiscoveryClient(config);
         }
     }
 }
\ No newline at end of file
diff --git a/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/DiscoveryClientTest.java b/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/DiscoveryClientTest.java
index 241ea8f..41d8733 100644
--- a/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/DiscoveryClientTest.java
+++ b/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/DiscoveryClientTest.java
@@ -3,6 +3,7 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.godaddy.ans.sdk.auth.JwtCredentialsProvider;
+import com.godaddy.ans.sdk.config.AnsConfiguration;
 import com.godaddy.ans.sdk.config.Environment;
 import com.godaddy.ans.sdk.model.generated.AgentDetails;
 import com.godaddy.ans.sdk.model.generated.AgentLifecycleStatus;
@@ -71,6 +72,7 @@ void shouldBuildClientWithCustomBaseUrl(WireMockRuntimeInfo wmRuntimeInfo) {
         String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -115,6 +117,24 @@ void shouldThrowExceptionWhenCredentialsProviderIsNull() {
             .isInstanceOf(NullPointerException.class);
     }
 
+    @Test
+    @DisplayName("Should build client with pre-built configuration")
+    void shouldBuildClientWithPreBuiltConfiguration() {
+        AnsConfiguration prebuilt = AnsConfiguration.builder()
+            .environment(Environment.PROD)
+            .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
+            .baseUrl("https://custom.example.com")
+            .build();
+
+        DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
+            .configuration(prebuilt)
+            .build();
+
+        assertThat(client.getConfiguration()).isSameAs(prebuilt);
+        assertThat(client.getConfiguration().getBaseUrl()).isEqualTo("https://custom.example.com");
+    }
+
     // ==================== Resolution Success Tests ====================
 
     @Test
@@ -137,6 +157,7 @@ void shouldResolveAgentSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -196,6 +217,7 @@ void shouldResolveAgentWithoutVersion(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -228,6 +250,7 @@ void shouldResolveAgentAsync(WireMockRuntimeInfo wmRuntimeInfo) throws Exception
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -253,6 +276,7 @@ void shouldThrowNotFoundExceptionWhen404(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -274,6 +298,7 @@ void shouldThrowAuthExceptionWhen401(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"UNAUTHORIZED\",\"message\":\"Invalid credentials\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -295,6 +320,7 @@ void shouldThrowAuthExceptionWhen403(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"FORBIDDEN\",\"message\":\"Access denied\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -317,6 +343,7 @@ void shouldThrowValidationExceptionWhen422(WireMockRuntimeInfo wmRuntimeInfo) {
                         + "\"message\":\"Invalid version format\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -338,6 +365,7 @@ void shouldThrowServerExceptionWhen500(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"INTERNAL_ERROR\",\"message\":\"Internal server error\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -360,6 +388,7 @@ void shouldThrowServerExceptionWhenLinkMissing(WireMockRuntimeInfo wmRuntimeInfo
                 .withBody("{\"ansName\":\"ans://v1.0.0.booking-agent.example.com\",\"links\":[]}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -381,6 +410,7 @@ void shouldWrapExceptionInAsync(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -406,6 +436,7 @@ void shouldGetAgentByIdSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -433,6 +464,7 @@ void shouldThrowNotFoundWhenGettingNonExistentAgent(WireMockRuntimeInfo wmRuntim
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -454,6 +486,7 @@ void shouldThrowAuthExceptionWhenUnauthorizedToGetAgent(WireMockRuntimeInfo wmRu
                 .withBody("{\"status\":\"error\",\"code\":\"UNAUTHORIZED\",\"message\":\"Invalid token\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -475,6 +508,7 @@ void shouldGetAgentAsync(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -498,6 +532,7 @@ void shouldWrapExceptionInAsyncGetAgent(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -540,6 +575,7 @@ void shouldHandleRelativeHrefInResolutionResponse(WireMockRuntimeInfo wmRuntimeI
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -562,6 +598,7 @@ void shouldThrowServerExceptionForMalformedResolutionJson(WireMockRuntimeInfo wm
                 .withBody("{ invalid json }")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -589,6 +626,7 @@ void shouldThrowServerExceptionForMalformedAgentDetailsJson(WireMockRuntimeInfo
                 .withBody("{ not valid json }")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -610,6 +648,7 @@ void shouldThrowServerExceptionForUnexpected4xxError(WireMockRuntimeInfo wmRunti
                 .withBody("{\"status\":\"error\",\"message\":\"Bad request\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -637,6 +676,7 @@ void shouldHandleNullVersionInResolve(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -668,6 +708,7 @@ void shouldHandleEmptyVersionStringInResolve(WireMockRuntimeInfo wmRuntimeInfo)
                 .withBody(agentDetailsResponse())));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -695,6 +736,7 @@ void shouldIncludeRequestIdInErrorResponse(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"message\":\"Internal error\"}")));
 
         DiscoveryClient client = DiscoveryClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
diff --git a/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/ResolutionServiceTest.java b/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/ResolutionServiceTest.java
index 22fd0b3..a0ed2db 100644
--- a/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/ResolutionServiceTest.java
+++ b/ans-sdk-discovery/src/test/java/com/godaddy/ans/sdk/discovery/ResolutionServiceTest.java
@@ -32,6 +32,7 @@ void setUp() {
         when(mockProvider.resolveCredentials()).thenReturn(mockCredentials);
 
         AnsConfiguration config = AnsConfiguration.builder()
+            .environment(com.godaddy.ans.sdk.config.Environment.OTE)
             .credentialsProvider(mockProvider)
             .baseUrl("https://api.example.com")
             .build();
@@ -139,6 +140,43 @@ void shouldRejectPathTraversalAttempts() throws Exception {
             .hasMessageContaining("Invalid agent-details link");
     }
 
+    // ==================== Edge Case Tests ====================
+
+    @Test
+    @DisplayName("Should throw when response has no links field")
+    void shouldThrowWhenResponseHasNoLinksField() {
+        String responseBody = """
+            {
+                "ansName": "ans://v1.0.0.example.com"
+            }
+            """;
+
+        Throwable thrown = catchThrowable(() -> invokeExtractAgentDetailsLink(responseBody));
+        assertThat(thrown).isInstanceOf(InvocationTargetException.class);
+        assertThat(thrown.getCause())
+            .isInstanceOf(AnsServerException.class)
+            .hasMessageContaining("missing agent-details link");
+    }
+
+    @Test
+    @DisplayName("Should throw when links contain no matching rel")
+    void shouldThrowWhenLinksContainNoMatchingRel() {
+        String responseBody = """
+            {
+                "links": [
+                    {"rel": "self", "href": "/v1/agents/abc123"},
+                    {"href": "/v1/agents/def456"}
+                ]
+            }
+            """;
+
+        Throwable thrown = catchThrowable(() -> invokeExtractAgentDetailsLink(responseBody));
+        assertThat(thrown).isInstanceOf(InvocationTargetException.class);
+        assertThat(thrown.getCause())
+            .isInstanceOf(AnsServerException.class)
+            .hasMessageContaining("missing agent-details link");
+    }
+
     // ==================== Helper Methods ====================
 
     /**
diff --git a/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationClient.java b/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationClient.java
index 5fa3b18..6dc6afa 100644
--- a/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationClient.java
+++ b/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationClient.java
@@ -56,7 +56,8 @@ public final class RegistrationClient {
 
     private RegistrationClient(AnsConfiguration configuration) {
         this.configuration = configuration;
-        this.registrationService = new RegistrationService(configuration);
+        var ansClient = new AnsApiClient(configuration);
+        this.registrationService = new RegistrationService(ansClient);
         this.certificateService = new CertificateService(configuration);
     }
 
@@ -251,10 +252,25 @@ public AnsConfiguration getConfiguration() {
     public static final class Builder {
 
         private final AnsConfiguration.Builder configBuilder = AnsConfiguration.builder();
+        private AnsConfiguration prebuiltConfiguration;
 
         private Builder() {
         }
 
+        /**
+         * Uses a pre-built configuration directly.
+         *
+         * <p>When set, this configuration is used as-is and any values set via
+         * other builder methods are ignored.</p>
+         *
+         * @param configuration the pre-built configuration
+         * @return this builder
+         */
+        public Builder configuration(AnsConfiguration configuration) {
+            this.prebuiltConfiguration = configuration;
+            return this;
+        }
+
         /**
          * Sets the environment.
          *
@@ -327,7 +343,10 @@ public Builder enableRetry(int maxRetries) {
          * @return a new RegistrationClient instance
          */
         public RegistrationClient build() {
-            return new RegistrationClient(configBuilder.build());
+            AnsConfiguration config = (prebuiltConfiguration != null)
+                ? prebuiltConfiguration
+                : configBuilder.build();
+            return new RegistrationClient(config);
         }
     }
 }
\ No newline at end of file
diff --git a/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationService.java b/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationService.java
index 3d9d6c2..a360491 100644
--- a/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationService.java
+++ b/ans-sdk-registration/src/main/java/com/godaddy/ans/sdk/registration/RegistrationService.java
@@ -1,6 +1,5 @@
 package com.godaddy.ans.sdk.registration;
 
-import com.godaddy.ans.sdk.config.AnsConfiguration;
 import com.godaddy.ans.sdk.exception.AnsServerException;
 import com.godaddy.ans.sdk.model.generated.AgentDetails;
 import com.godaddy.ans.sdk.model.generated.AgentRegistrationRequest;
@@ -20,10 +19,9 @@ class RegistrationService {
 
     private final AnsApiClient httpClient;
 
-    RegistrationService(AnsConfiguration configuration) {
-        this.httpClient = new AnsApiClient(configuration);
+    RegistrationService(final AnsApiClient ansApiClient) {
+        this.httpClient = ansApiClient;
     }
-
     /**
      * Registers a new agent and returns full agent details.
      *
diff --git a/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/CertificateServiceTest.java b/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/CertificateServiceTest.java
index 442ef87..f566b3d 100644
--- a/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/CertificateServiceTest.java
+++ b/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/CertificateServiceTest.java
@@ -4,6 +4,7 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.godaddy.ans.sdk.auth.ApiKeyCredentialsProvider;
 import com.godaddy.ans.sdk.config.AnsConfiguration;
+import com.godaddy.ans.sdk.config.Environment;
 import com.godaddy.ans.sdk.exception.AnsAuthenticationException;
 import com.godaddy.ans.sdk.exception.AnsNotFoundException;
 import com.godaddy.ans.sdk.exception.AnsServerException;
@@ -36,6 +37,7 @@ class CertificateServiceTest {
 
     private CertificateService createCertificateService(WireMockRuntimeInfo wmRuntimeInfo) {
         AnsConfiguration config = AnsConfiguration.builder()
+            .environment(Environment.OTE)
             .baseUrl(wmRuntimeInfo.getHttpBaseUrl())
             .credentialsProvider(new ApiKeyCredentialsProvider(API_KEY, API_SECRET))
             .build();
diff --git a/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/RegistrationClientTest.java b/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/RegistrationClientTest.java
index 9c90595..be20716 100644
--- a/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/RegistrationClientTest.java
+++ b/ans-sdk-registration/src/test/java/com/godaddy/ans/sdk/registration/RegistrationClientTest.java
@@ -5,7 +5,9 @@
 import com.godaddy.ans.sdk.auth.JwtCredentialsProvider;
 import com.godaddy.ans.sdk.config.Environment;
 import com.godaddy.ans.sdk.exception.AnsAuthenticationException;
+import com.godaddy.ans.sdk.exception.AnsConflictException;
 import com.godaddy.ans.sdk.exception.AnsNotFoundException;
+import com.godaddy.ans.sdk.exception.AnsServerException;
 import com.godaddy.ans.sdk.exception.AnsValidationException;
 import com.godaddy.ans.sdk.model.generated.AgentDetails;
 import com.godaddy.ans.sdk.model.generated.AgentEndpoint;
@@ -63,6 +65,7 @@ void shouldBuildClientWithCustomBaseUrl(WireMockRuntimeInfo wmRuntimeInfo) {
         String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -140,6 +143,7 @@ void shouldRegisterAgentSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -183,6 +187,7 @@ void shouldThrowValidationExceptionOn422(WireMockRuntimeInfo wmRuntimeInfo) {
                     + "\"message\":\"Invalid version format\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -216,6 +221,7 @@ void shouldVerifyAcmeSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentStatusResponse(AgentLifecycleStatus.PENDING_DNS))));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -238,6 +244,7 @@ void shouldThrowNotFoundExceptionForVerifyAcme(WireMockRuntimeInfo wmRuntimeInfo
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -261,6 +268,7 @@ void shouldVerifyDnsSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentStatusResponse(AgentLifecycleStatus.ACTIVE))));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -283,6 +291,7 @@ void shouldThrowAuthExceptionForVerifyDns(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"UNAUTHORIZED\",\"message\":\"Invalid token\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -306,6 +315,7 @@ void shouldRevokeAgentSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(revocationResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -340,6 +350,7 @@ void shouldRevokeAgentWithJustReason(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(revocationResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -366,6 +377,7 @@ void shouldThrowNotFoundExceptionForRevoke(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -389,6 +401,7 @@ void shouldThrowValidationExceptionWhenAlreadyRevoked(WireMockRuntimeInfo wmRunt
                     + "\"message\":\"Agent is already in REVOKED state\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -412,6 +425,7 @@ void shouldThrowValidationExceptionForPendingValidation(WireMockRuntimeInfo wmRu
                     + "\"message\":\"Cannot revoke agent in PENDING_VALIDATION state\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -436,6 +450,7 @@ void shouldGetAgentByIdSuccessfully(WireMockRuntimeInfo wmRuntimeInfo) {
                 .withBody(agentDetailsResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -459,6 +474,7 @@ void shouldThrowNotFoundExceptionWhenAgentNotFound(WireMockRuntimeInfo wmRuntime
                 .withBody("{\"status\":\"error\",\"code\":\"NOT_FOUND\",\"message\":\"Agent not found\"}")));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -488,6 +504,7 @@ void shouldRegisterAgentAsync(WireMockRuntimeInfo wmRuntimeInfo) throws Exceptio
                 .withBody(agentDetailsResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -520,6 +537,7 @@ void shouldVerifyAcmeAsync(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
                 .withBody(agentStatusResponse(AgentLifecycleStatus.PENDING_DNS))));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -542,6 +560,7 @@ void shouldVerifyDnsAsync(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
                 .withBody(agentStatusResponse(AgentLifecycleStatus.ACTIVE))));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -564,6 +583,7 @@ void shouldRevokeAgentAsyncWithRequest(WireMockRuntimeInfo wmRuntimeInfo) throws
                 .withBody(revocationResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -589,6 +609,7 @@ void shouldRevokeAgentAsyncWithReason(WireMockRuntimeInfo wmRuntimeInfo) throws
                 .withBody(revocationResponse())));
 
         RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
             .baseUrl(baseUrl)
             .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
             .build();
@@ -600,6 +621,126 @@ void shouldRevokeAgentAsyncWithReason(WireMockRuntimeInfo wmRuntimeInfo) throws
         assertThat(result.getStatus()).isEqualTo(AgentLifecycleStatus.REVOKED);
     }
 
+    // ==================== Error Handling Edge Cases ====================
+
+    @Test
+    @DisplayName("Should throw AnsConflictException on 409")
+    void shouldThrowConflictExceptionOn409(WireMockRuntimeInfo wmRuntimeInfo) {
+        String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
+
+        stubFor(post(urlEqualTo("/v1/agents/register"))
+            .willReturn(aResponse()
+                .withStatus(409)
+                .withHeader("Content-Type", "application/json")
+                .withBody("{\"status\":\"error\",\"code\":\"CONFLICT\",\"message\":\"Agent already registered\"}")));
+
+        RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
+            .baseUrl(baseUrl)
+            .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
+            .build();
+
+        AgentRegistrationRequest request = new AgentRegistrationRequest()
+            .agentDisplayName("Test Agent")
+            .version("1.0.0")
+            .agentHost("test-agent.example.com")
+            .addEndpointsItem(new AgentEndpoint()
+                .protocol(AgentEndpoint.ProtocolEnum.A2_A)
+                .agentUrl(URI.create("https://test-agent.example.com/a2a")))
+            .identityCsrPEM("test-csr")
+            .serverCsrPEM("test-csr");
+
+        assertThatThrownBy(() -> client.registerAgent(request))
+            .isInstanceOf(AnsConflictException.class)
+            .hasMessageContaining("Conflict");
+    }
+
+    @Test
+    @DisplayName("Should throw AnsServerException on unexpected status code")
+    void shouldThrowServerExceptionOnUnexpectedStatusCode(WireMockRuntimeInfo wmRuntimeInfo) {
+        String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
+
+        stubFor(get(urlEqualTo("/v1/agents/" + TEST_AGENT_ID))
+            .willReturn(aResponse()
+                .withStatus(418)
+                .withHeader("Content-Type", "application/json")
+                .withBody("{\"status\":\"error\",\"message\":\"I'm a teapot\"}")));
+
+        RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
+            .baseUrl(baseUrl)
+            .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
+            .build();
+
+        assertThatThrownBy(() -> client.getAgent(TEST_AGENT_ID))
+            .isInstanceOf(AnsServerException.class)
+            .hasMessageContaining("Unexpected error (418)");
+    }
+
+    @Test
+    @DisplayName("Should throw AnsServerException when registration response has no self link")
+    void shouldThrowWhenRegistrationMissingSelfLink(WireMockRuntimeInfo wmRuntimeInfo) {
+        String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
+
+        stubFor(post(urlEqualTo("/v1/agents/register"))
+            .willReturn(aResponse()
+                .withStatus(202)
+                .withHeader("Content-Type", "application/json")
+                .withBody("{\"status\":\"PENDING_VALIDATION\",\"links\":[]}")));
+
+        RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
+            .baseUrl(baseUrl)
+            .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
+            .build();
+
+        AgentRegistrationRequest request = new AgentRegistrationRequest()
+            .agentDisplayName("Test Agent")
+            .version("1.0.0")
+            .agentHost("test-agent.example.com")
+            .addEndpointsItem(new AgentEndpoint()
+                .protocol(AgentEndpoint.ProtocolEnum.A2_A)
+                .agentUrl(URI.create("https://test-agent.example.com/a2a")))
+            .identityCsrPEM("test-csr")
+            .serverCsrPEM("test-csr");
+
+        assertThatThrownBy(() -> client.registerAgent(request))
+            .isInstanceOf(AnsServerException.class)
+            .hasMessageContaining("missing 'self' link");
+    }
+
+    @Test
+    @DisplayName("Should throw AnsServerException when registration response has null links")
+    void shouldThrowWhenRegistrationHasNullLinks(WireMockRuntimeInfo wmRuntimeInfo) {
+        String baseUrl = wmRuntimeInfo.getHttpBaseUrl();
+
+        stubFor(post(urlEqualTo("/v1/agents/register"))
+            .willReturn(aResponse()
+                .withStatus(202)
+                .withHeader("Content-Type", "application/json")
+                .withBody("{\"status\":\"PENDING_VALIDATION\"}")));
+
+        RegistrationClient client = RegistrationClient.builder()
+            .environment(Environment.OTE)
+            .baseUrl(baseUrl)
+            .credentialsProvider(new JwtCredentialsProvider(TEST_JWT_TOKEN))
+            .build();
+
+        AgentRegistrationRequest request = new AgentRegistrationRequest()
+            .agentDisplayName("Test Agent")
+            .version("1.0.0")
+            .agentHost("test-agent.example.com")
+            .addEndpointsItem(new AgentEndpoint()
+                .protocol(AgentEndpoint.ProtocolEnum.A2_A)
+                .agentUrl(URI.create("https://test-agent.example.com/a2a")))
+            .identityCsrPEM("test-csr")
+            .serverCsrPEM("test-csr");
+
+        assertThatThrownBy(() -> client.registerAgent(request))
+            .isInstanceOf(AnsServerException.class)
+            .hasMessageContaining("missing 'self' link");
+    }
+
     // ==================== Helper Methods ====================
 
     private String registrationPendingResponse() {
diff --git a/ans-sdk-spring-boot-starter/build.gradle.kts b/ans-sdk-spring-boot-starter/build.gradle.kts
new file mode 100644
index 0000000..710365a
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/build.gradle.kts
@@ -0,0 +1,22 @@
+val junitVersion: String by project
+val assertjVersion: String by project
+
+val springBootVersion = "3.4.3"
+
+dependencies {
+    // ANS SDK modules
+    api(project(":ans-sdk-core"))
+    api(project(":ans-sdk-registration"))
+    api(project(":ans-sdk-discovery"))
+
+    // Spring Boot auto-configuration
+    implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
+
+    // Optional annotation processor for configuration metadata
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
+
+    // Testing
+    testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
+    testImplementation("org.assertj:assertj-core:$assertjVersion")
+    testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
+}
diff --git a/ans-sdk-spring-boot-starter/examples/build.gradle.kts b/ans-sdk-spring-boot-starter/examples/build.gradle.kts
new file mode 100644
index 0000000..a59ce97
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/examples/build.gradle.kts
@@ -0,0 +1,21 @@
+// Parent build file for ANS SDK Spring Boot examples
+// Each subdirectory is a standalone example demonstrating Spring Boot integration
+
+subprojects {
+    apply(plugin = "java")
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    tasks.withType<JavaCompile> {
+        options.encoding = "UTF-8"
+    }
+}
diff --git a/ans-sdk-spring-boot-starter/examples/spring-boot-app/build.gradle.kts b/ans-sdk-spring-boot-starter/examples/spring-boot-app/build.gradle.kts
new file mode 100644
index 0000000..d34a6f3
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/examples/spring-boot-app/build.gradle.kts
@@ -0,0 +1,11 @@
+// Spring Boot Example - demonstrates ANS SDK auto-configuration
+
+plugins {
+    id("org.springframework.boot") version "3.4.3"
+    id("io.spring.dependency-management") version "1.1.7"
+}
+
+dependencies {
+    implementation(project(":ans-sdk-spring-boot-starter"))
+    implementation("org.springframework.boot:spring-boot-starter-web")
+}
diff --git a/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AgentController.java b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AgentController.java
new file mode 100644
index 0000000..762d092
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AgentController.java
@@ -0,0 +1,76 @@
+package com.godaddy.ans.examples.springboot;
+
+import com.godaddy.ans.sdk.discovery.DiscoveryClient;
+import com.godaddy.ans.sdk.model.generated.AgentDetails;
+import com.godaddy.ans.sdk.model.generated.AgentRegistrationRequest;
+import com.godaddy.ans.sdk.registration.RegistrationClient;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * Example REST controller demonstrating injected ANS SDK beans.
+ *
+ * <p>Both {@link RegistrationClient} and {@link DiscoveryClient} are
+ * auto-configured by the starter and injected via constructor.</p>
+ */
+@RestController
+@RequestMapping("/api/agents")
+public class AgentController {
+
+    private final RegistrationClient registrationClient;
+    private final DiscoveryClient discoveryClient;
+
+    public AgentController(RegistrationClient registrationClient,
+                           DiscoveryClient discoveryClient) {
+        this.registrationClient = registrationClient;
+        this.discoveryClient = discoveryClient;
+    }
+
+    /**
+     * Registers a new agent.
+     *
+     * <pre>
+     * POST /api/agents/register
+     * {"agentHost": "my-agent.example.com", "agentVersion": "1.0.0"}
+     * </pre>
+     */
+    @PostMapping("/register")
+    public ResponseEntity<AgentDetails> register(@RequestBody AgentRegistrationRequest request) {
+        AgentDetails agent = registrationClient.registerAgent(request);
+        return ResponseEntity.ok(agent);
+    }
+
+    /**
+     * Resolves an agent by host.
+     *
+     * <pre>
+     * GET /api/agents/resolve?agentHost=my-agent.example.com
+     * GET /api/agents/resolve?agentHost=my-agent.example.com&amp;version=^1.0.0
+     * </pre>
+     */
+    @GetMapping("/resolve")
+    public ResponseEntity<AgentDetails> resolve(
+            @RequestParam String agentHost,
+            @RequestParam(required = false) String version) {
+        AgentDetails agent = discoveryClient.resolve(agentHost, version);
+        return ResponseEntity.ok(agent);
+    }
+
+    /**
+     * Health check showing the auto-configured environment.
+     */
+    @GetMapping("/health")
+    public ResponseEntity<Map<String, String>> health() {
+        return ResponseEntity.ok(Map.of(
+            "status", "UP",
+            "environment", registrationClient.getConfiguration().getEnvironment().name()
+        ));
+    }
+}
diff --git a/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AnsExampleApplication.java b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AnsExampleApplication.java
new file mode 100644
index 0000000..bc453eb
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/java/com/godaddy/ans/examples/springboot/AnsExampleApplication.java
@@ -0,0 +1,36 @@
+package com.godaddy.ans.examples.springboot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Example Spring Boot application demonstrating ANS SDK auto-configuration.
+ *
+ * <p>This application uses {@code ans-sdk-spring-boot-starter} to automatically
+ * configure ANS SDK beans from {@code application.yml} properties.</p>
+ *
+ * <h2>Running</h2>
+ * <pre>
+ * # Set credentials
+ * export ANS_API_KEY=your-api-key
+ * export ANS_API_SECRET=your-api-secret
+ *
+ * # Run the application
+ * ./gradlew :ans-sdk-spring-boot-starter:examples:spring-boot-app:bootRun
+ *
+ * # Register an agent
+ * curl -X POST http://localhost:8080/api/agents/register \
+ *   -H "Content-Type: application/json" \
+ *   -d '{"agentHost": "my-agent.example.com", "agentVersion": "1.0.0"}'
+ *
+ * # Resolve an agent
+ * curl http://localhost:8080/api/agents/resolve?agentHost=my-agent.example.com
+ * </pre>
+ */
+@SpringBootApplication
+public class AnsExampleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AnsExampleApplication.class, args);
+    }
+}
diff --git a/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/resources/application.yml b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/resources/application.yml
new file mode 100644
index 0000000..dcd8268
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/examples/spring-boot-app/src/main/resources/application.yml
@@ -0,0 +1,14 @@
+# ANS SDK Configuration
+# Environment variables ANS_API_KEY and ANS_API_SECRET must be set before running.
+ans:
+  environment: OTE
+  credentials:
+    type: api-key
+    api-key: ${ANS_API_KEY}
+    api-secret: ${ANS_API_SECRET}
+  connect-timeout: 15s
+  read-timeout: 45s
+  max-retries: 3
+
+server:
+  port: 8080
diff --git a/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsAutoConfiguration.java b/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsAutoConfiguration.java
new file mode 100644
index 0000000..e6e5f00
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsAutoConfiguration.java
@@ -0,0 +1,138 @@
+package com.godaddy.ans.sdk.spring;
+
+import com.godaddy.ans.sdk.auth.ApiKeyCredentialsProvider;
+import com.godaddy.ans.sdk.auth.AnsCredentialsProvider;
+import com.godaddy.ans.sdk.auth.EnvironmentCredentialsProvider;
+import com.godaddy.ans.sdk.auth.JwtCredentialsProvider;
+import com.godaddy.ans.sdk.config.AnsConfiguration;
+import com.godaddy.ans.sdk.discovery.DiscoveryClient;
+import com.godaddy.ans.sdk.registration.RegistrationClient;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Spring Boot auto-configuration for ANS SDK.
+ *
+ * <p>Automatically creates {@link AnsConfiguration}, {@link RegistrationClient},
+ * and {@link DiscoveryClient} beans from {@code ans.*} application properties.</p>
+ *
+ * <p>This auto-configuration is enabled when {@code ans.enabled} is {@code true} (default).</p>
+ *
+ * <p>All beans are conditional on missing beans, so users can override
+ * any bean by defining their own.</p>
+ */
+@AutoConfiguration
+@ConditionalOnProperty(prefix = "ans", name = "enabled", havingValue = "true", matchIfMissing = true)
+@EnableConfigurationProperties(AnsProperties.class)
+public class AnsAutoConfiguration {
+
+    /**
+     * Creates the credentials provider based on configured credential type.
+     *
+     * @param properties the ANS properties
+     * @return the credentials provider
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public AnsCredentialsProvider ansCredentialsProvider(AnsProperties properties) {
+        AnsProperties.Credentials creds = properties.getCredentials();
+
+        if (creds.getType() == null) {
+            throw new IllegalStateException(
+                "ans.credentials.type is required. Supported values: jwt, api-key, environment");
+        }
+
+        switch (creds.getType()) {
+            case JWT:
+                if (creds.getJwtToken() == null || creds.getJwtToken().isBlank()) {
+                    throw new IllegalStateException(
+                        "ans.credentials.jwt-token is required when credentials type is jwt");
+                }
+                return new JwtCredentialsProvider(creds.getJwtToken());
+
+            case API_KEY:
+                if (creds.getApiKey() == null || creds.getApiKey().isBlank()) {
+                    throw new IllegalStateException(
+                        "ans.credentials.api-key is required when credentials type is api-key");
+                }
+                if (creds.getApiSecret() == null || creds.getApiSecret().isBlank()) {
+                    throw new IllegalStateException(
+                        "ans.credentials.api-secret is required when credentials type is api-key");
+                }
+                return new ApiKeyCredentialsProvider(creds.getApiKey(), creds.getApiSecret());
+
+            case ENVIRONMENT:
+                return new EnvironmentCredentialsProvider();
+
+            default:
+                throw new IllegalStateException("Unsupported credential type: " + creds.getType());
+        }
+    }
+
+    /**
+     * Creates the ANS configuration from properties.
+     *
+     * @param properties the ANS properties
+     * @param credentialsProvider the credentials provider
+     * @return the ANS configuration
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public AnsConfiguration ansConfiguration(AnsProperties properties,
+                                             AnsCredentialsProvider credentialsProvider) {
+        if (properties.getEnvironment() == null) {
+            throw new IllegalStateException(
+                "ans.environment is required. Supported values: OTE, PROD");
+        }
+
+        AnsConfiguration.Builder builder = AnsConfiguration.builder()
+            .environment(properties.getEnvironment())
+            .credentialsProvider(credentialsProvider);
+
+        if (properties.getBaseUrl() != null) {
+            builder.baseUrl(properties.getBaseUrl());
+        }
+        if (properties.getConnectTimeout() != null) {
+            builder.connectTimeout(properties.getConnectTimeout());
+        }
+        if (properties.getReadTimeout() != null) {
+            builder.readTimeout(properties.getReadTimeout());
+        }
+        if (properties.getMaxRetries() != null) {
+            builder.enableRetry(properties.getMaxRetries());
+        }
+
+        return builder.build();
+    }
+
+    /**
+     * Creates a RegistrationClient bean.
+     *
+     * @param configuration the ANS configuration
+     * @return the registration client
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public RegistrationClient registrationClient(AnsConfiguration configuration) {
+        return RegistrationClient.builder()
+            .configuration(configuration)
+            .build();
+    }
+
+    /**
+     * Creates a DiscoveryClient bean.
+     *
+     * @param configuration the ANS configuration
+     * @return the discovery client
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public DiscoveryClient discoveryClient(AnsConfiguration configuration) {
+        return DiscoveryClient.builder()
+            .configuration(configuration)
+            .build();
+    }
+}
diff --git a/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsProperties.java b/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsProperties.java
new file mode 100644
index 0000000..e6a2d1e
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/src/main/java/com/godaddy/ans/sdk/spring/AnsProperties.java
@@ -0,0 +1,189 @@
+package com.godaddy.ans.sdk.spring;
+
+import com.godaddy.ans.sdk.config.Environment;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.time.Duration;
+
+/**
+ * Configuration properties for ANS SDK.
+ *
+ * <p>Properties are bound from the {@code ans} prefix in application properties.</p>
+ *
+ * <p>Example {@code application.yml}:</p>
+ * <pre>
+ * ans:
+ *   environment: OTE
+ *   credentials:
+ *     type: api-key
+ *     api-key: my-key
+ *     api-secret: my-secret
+ *   connect-timeout: 15s
+ *   read-timeout: 45s
+ *   max-retries: 5
+ * </pre>
+ */
+@ConfigurationProperties(prefix = "ans")
+public class AnsProperties {
+
+    /**
+     * ANS environment (OTE or PROD). Required.
+     */
+    private Environment environment;
+
+    /**
+     * Custom base URL. Overrides the environment's default URL when set.
+     */
+    private String baseUrl;
+
+    /**
+     * Connection timeout. Defaults to SDK default (10s) if not set.
+     */
+    private Duration connectTimeout;
+
+    /**
+     * Read timeout. Defaults to SDK default (30s) if not set.
+     */
+    private Duration readTimeout;
+
+    /**
+     * Maximum number of retry attempts. Defaults to SDK default (3) if not set.
+     */
+    private Integer maxRetries;
+
+    /**
+     * Whether auto-configuration is enabled. Defaults to true.
+     */
+    private boolean enabled = true;
+
+    /**
+     * Credential configuration.
+     */
+    private Credentials credentials = new Credentials();
+
+    public Environment getEnvironment() {
+        return environment;
+    }
+
+    public void setEnvironment(Environment environment) {
+        this.environment = environment;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public void setBaseUrl(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    public Duration getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(Duration connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public Duration getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(Duration readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public Integer getMaxRetries() {
+        return maxRetries;
+    }
+
+    public void setMaxRetries(Integer maxRetries) {
+        this.maxRetries = maxRetries;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public Credentials getCredentials() {
+        return credentials;
+    }
+
+    public void setCredentials(Credentials credentials) {
+        this.credentials = credentials;
+    }
+
+    /**
+     * Credential configuration properties.
+     */
+    public static class Credentials {
+
+        /**
+         * Credential type: jwt, api-key, or environment.
+         */
+        private CredentialType type;
+
+        /**
+         * JWT token. Used when type is jwt.
+         */
+        private String jwtToken;
+
+        /**
+         * API key. Used when type is api-key.
+         */
+        private String apiKey;
+
+        /**
+         * API secret. Used when type is api-key.
+         */
+        private String apiSecret;
+
+        public CredentialType getType() {
+            return type;
+        }
+
+        public void setType(CredentialType type) {
+            this.type = type;
+        }
+
+        public String getJwtToken() {
+            return jwtToken;
+        }
+
+        public void setJwtToken(String jwtToken) {
+            this.jwtToken = jwtToken;
+        }
+
+        public String getApiKey() {
+            return apiKey;
+        }
+
+        public void setApiKey(String apiKey) {
+            this.apiKey = apiKey;
+        }
+
+        public String getApiSecret() {
+            return apiSecret;
+        }
+
+        public void setApiSecret(String apiSecret) {
+            this.apiSecret = apiSecret;
+        }
+    }
+
+    /**
+     * Supported credential types.
+     */
+    public enum CredentialType {
+        /** JWT bearer token. */
+        JWT,
+        /** API key + secret pair. */
+        API_KEY,
+        /** Read credentials from environment variables (ANS_JWT_TOKEN or ANS_API_KEY + ANS_API_SECRET). */
+        ENVIRONMENT
+    }
+}
diff --git a/ans-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ans-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..be8e6d0
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.godaddy.ans.sdk.spring.AnsAutoConfiguration
diff --git a/ans-sdk-spring-boot-starter/src/test/java/com/godaddy/ans/sdk/spring/AnsAutoConfigurationTest.java b/ans-sdk-spring-boot-starter/src/test/java/com/godaddy/ans/sdk/spring/AnsAutoConfigurationTest.java
new file mode 100644
index 0000000..cf10b8c
--- /dev/null
+++ b/ans-sdk-spring-boot-starter/src/test/java/com/godaddy/ans/sdk/spring/AnsAutoConfigurationTest.java
@@ -0,0 +1,319 @@
+package com.godaddy.ans.sdk.spring;
+
+import com.godaddy.ans.sdk.auth.AnsCredentialsProvider;
+import com.godaddy.ans.sdk.auth.ApiKeyCredentialsProvider;
+import com.godaddy.ans.sdk.auth.JwtCredentialsProvider;
+import com.godaddy.ans.sdk.config.AnsConfiguration;
+import com.godaddy.ans.sdk.config.Environment;
+import com.godaddy.ans.sdk.discovery.DiscoveryClient;
+import com.godaddy.ans.sdk.registration.RegistrationClient;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link AnsAutoConfiguration}.
+ */
+class AnsAutoConfigurationTest {
+
+    private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+        .withConfiguration(AutoConfigurations.of(AnsAutoConfiguration.class));
+
+    // ==================== API Key Credentials Tests ====================
+
+    @Nested
+    @DisplayName("API Key credentials")
+    class ApiKeyCredentialsTests {
+
+        @Test
+        @DisplayName("Should create all beans with api-key credentials")
+        void shouldCreateAllBeansWithApiKeyCredentials() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .run(context -> {
+                    assertThat(context).hasSingleBean(AnsCredentialsProvider.class);
+                    assertThat(context).hasSingleBean(AnsConfiguration.class);
+                    assertThat(context).hasSingleBean(RegistrationClient.class);
+                    assertThat(context).hasSingleBean(DiscoveryClient.class);
+
+                    AnsCredentialsProvider provider = context.getBean(AnsCredentialsProvider.class);
+                    assertThat(provider).isInstanceOf(ApiKeyCredentialsProvider.class);
+
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getEnvironment()).isEqualTo(Environment.OTE);
+                });
+        }
+
+        @Test
+        @DisplayName("Should fail when api-key is missing")
+        void shouldFailWhenApiKeyMissing() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .run(context -> {
+                    assertThat(context).hasFailed();
+                    assertThat(context.getStartupFailure())
+                        .rootCause()
+                        .hasMessageContaining("ans.credentials.api-key is required");
+                });
+        }
+
+        @Test
+        @DisplayName("Should fail when api-secret is missing")
+        void shouldFailWhenApiSecretMissing() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key"
+                )
+                .run(context -> {
+                    assertThat(context).hasFailed();
+                    assertThat(context.getStartupFailure())
+                        .rootCause()
+                        .hasMessageContaining("ans.credentials.api-secret is required");
+                });
+        }
+    }
+
+    // ==================== JWT Credentials Tests ====================
+
+    @Nested
+    @DisplayName("JWT credentials")
+    class JwtCredentialsTests {
+
+        @Test
+        @DisplayName("Should create beans with jwt credentials")
+        void shouldCreateBeansWithJwtCredentials() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=PROD",
+                    "ans.credentials.type=jwt",
+                    "ans.credentials.jwt-token=my-jwt-token"
+                )
+                .run(context -> {
+                    assertThat(context).hasSingleBean(AnsCredentialsProvider.class);
+                    assertThat(context).hasSingleBean(AnsConfiguration.class);
+
+                    AnsCredentialsProvider provider = context.getBean(AnsCredentialsProvider.class);
+                    assertThat(provider).isInstanceOf(JwtCredentialsProvider.class);
+
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getEnvironment()).isEqualTo(Environment.PROD);
+                });
+        }
+
+        @Test
+        @DisplayName("Should fail when jwt-token is missing")
+        void shouldFailWhenJwtTokenMissing() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=jwt"
+                )
+                .run(context -> {
+                    assertThat(context).hasFailed();
+                    assertThat(context.getStartupFailure())
+                        .rootCause()
+                        .hasMessageContaining("ans.credentials.jwt-token is required");
+                });
+        }
+    }
+
+    // ==================== Configuration Properties Tests ====================
+
+    @Nested
+    @DisplayName("Configuration properties")
+    class ConfigurationPropertiesTests {
+
+        @Test
+        @DisplayName("Should apply custom timeouts and retries")
+        void shouldApplyCustomTimeoutsAndRetries() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret",
+                    "ans.connect-timeout=15s",
+                    "ans.read-timeout=45s",
+                    "ans.max-retries=5"
+                )
+                .run(context -> {
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getConnectTimeout()).isEqualTo(Duration.ofSeconds(15));
+                    assertThat(config.getReadTimeout()).isEqualTo(Duration.ofSeconds(45));
+                    assertThat(config.getMaxRetries()).isEqualTo(5);
+                });
+        }
+
+        @Test
+        @DisplayName("Should use SDK defaults when timeouts not set")
+        void shouldUseSdkDefaultsWhenTimeoutsNotSet() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .run(context -> {
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getConnectTimeout()).isEqualTo(Duration.ofSeconds(10));
+                    assertThat(config.getReadTimeout()).isEqualTo(Duration.ofSeconds(30));
+                    assertThat(config.getMaxRetries()).isEqualTo(3);
+                });
+        }
+
+        @Test
+        @DisplayName("Should apply custom base URL")
+        void shouldApplyCustomBaseUrl() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.base-url=https://custom-api.example.com",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .run(context -> {
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getBaseUrl()).isEqualTo("https://custom-api.example.com");
+                });
+        }
+    }
+
+    // ==================== Validation Tests ====================
+
+    @Nested
+    @DisplayName("Validation")
+    class ValidationTests {
+
+        @Test
+        @DisplayName("Should fail when credentials type is missing")
+        void shouldFailWhenCredentialsTypeMissing() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE"
+                )
+                .run(context -> {
+                    assertThat(context).hasFailed();
+                    assertThat(context.getStartupFailure())
+                        .rootCause()
+                        .hasMessageContaining("ans.credentials.type is required");
+                });
+        }
+
+        @Test
+        @DisplayName("Should fail when environment is missing")
+        void shouldFailWhenEnvironmentMissing() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .run(context -> {
+                    assertThat(context).hasFailed();
+                    assertThat(context.getStartupFailure())
+                        .rootCause()
+                        .hasMessageContaining("ans.environment is required");
+                });
+        }
+    }
+
+    // ==================== Conditional Tests ====================
+
+    @Nested
+    @DisplayName("Conditional behavior")
+    class ConditionalTests {
+
+        @Test
+        @DisplayName("Should not create beans when disabled")
+        void shouldNotCreateBeansWhenDisabled() {
+            contextRunner
+                .withPropertyValues("ans.enabled=false")
+                .run(context -> {
+                    assertThat(context).doesNotHaveBean(AnsConfiguration.class);
+                    assertThat(context).doesNotHaveBean(RegistrationClient.class);
+                    assertThat(context).doesNotHaveBean(DiscoveryClient.class);
+                });
+        }
+
+        @Test
+        @DisplayName("Should back off when user provides custom AnsConfiguration bean")
+        void shouldBackOffWhenUserProvidesCustomConfiguration() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .withUserConfiguration(CustomConfigurationConfig.class)
+                .run(context -> {
+                    assertThat(context).hasSingleBean(AnsConfiguration.class);
+                    AnsConfiguration config = context.getBean(AnsConfiguration.class);
+                    assertThat(config.getBaseUrl()).isEqualTo("https://custom-override.example.com");
+                });
+        }
+
+        @Test
+        @DisplayName("Should back off when user provides custom credentials provider")
+        void shouldBackOffWhenUserProvidesCustomCredentialsProvider() {
+            contextRunner
+                .withPropertyValues(
+                    "ans.environment=OTE",
+                    "ans.credentials.type=api-key",
+                    "ans.credentials.api-key=my-key",
+                    "ans.credentials.api-secret=my-secret"
+                )
+                .withUserConfiguration(CustomCredentialsConfig.class)
+                .run(context -> {
+                    assertThat(context).hasSingleBean(AnsCredentialsProvider.class);
+                    AnsCredentialsProvider provider = context.getBean(AnsCredentialsProvider.class);
+                    assertThat(provider).isInstanceOf(JwtCredentialsProvider.class);
+                });
+        }
+    }
+
+    // ==================== User Override Configurations ====================
+
+    @Configuration(proxyBeanMethods = false)
+    static class CustomConfigurationConfig {
+
+        @Bean
+        AnsConfiguration ansConfiguration() {
+            return AnsConfiguration.builder()
+                .environment(Environment.PROD)
+                .baseUrl("https://custom-override.example.com")
+                .credentialsProvider(new JwtCredentialsProvider("custom-token"))
+                .build();
+        }
+    }
+
+    @Configuration(proxyBeanMethods = false)
+    static class CustomCredentialsConfig {
+
+        @Bean
+        AnsCredentialsProvider ansCredentialsProvider() {
+            return new JwtCredentialsProvider("overridden-token");
+        }
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index f26f00c..bc5c199 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,8 @@ val publishableModules = setOf(
     "ans-sdk-registration",
     "ans-sdk-discovery",
     "ans-sdk-agent-client",
-    "ans-sdk-transparency"
+    "ans-sdk-transparency",
+    "ans-sdk-spring-boot-starter"
 )
 
 subprojects {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7751f61..2e9e215 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,8 +7,10 @@ include("ans-sdk-registration")
 include("ans-sdk-discovery")
 include("ans-sdk-agent-client")
 include("ans-sdk-transparency")
+include("ans-sdk-spring-boot-starter")
 
-// Examples (under ans-sdk-agent-client) - not published to Maven, but useful for users of the SDK to reference and run locally
+// Examples - not published to Maven, but useful for users of the SDK to reference and run locally
 include("ans-sdk-agent-client:examples:http-api")
 include("ans-sdk-agent-client:examples:mcp-client")
-include("ans-sdk-agent-client:examples:a2a-client")
\ No newline at end of file
+include("ans-sdk-agent-client:examples:a2a-client")
+include("ans-sdk-spring-boot-starter:examples:spring-boot-app")
\ No newline at end of file