diff --git a/build.gradle b/build.gradle
index 6bcee5ce..4ba4dfc5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ signing {
 
 group = 'com.devcycle'
 archivesBaseName = "java-server-sdk"
-version = '1.0.6'
+version = '1.0.7.1'
 
 uploadArchives {
     repositories {
diff --git a/src/main/java/com/devcycle/sdk/server/api/DVCApiClient.java b/src/main/java/com/devcycle/sdk/server/api/DVCApiClient.java
index 1108ddb7..ec6c65a8 100755
--- a/src/main/java/com/devcycle/sdk/server/api/DVCApiClient.java
+++ b/src/main/java/com/devcycle/sdk/server/api/DVCApiClient.java
@@ -5,6 +5,8 @@
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
+import java.util.Objects;
+
 final class DVCApiClient {
 
   private final OkHttpClient.Builder okBuilder;
@@ -15,9 +17,12 @@ final class DVCApiClient {
   private DVCApiClient() {
     okBuilder = new OkHttpClient.Builder();
 
+    String bucketingApiUrl = System.getenv("BUCKETING_API_URL");
+    String url = Objects.isNull(bucketingApiUrl) || Objects.equals(bucketingApiUrl, "") ? BASE_URL : bucketingApiUrl;
+
     adapterBuilder = new Retrofit
             .Builder()
-            .baseUrl(BASE_URL)
+            .baseUrl(url)
             .addConverterFactory(JacksonConverterFactory.create());
   }
 
diff --git a/src/main/java/com/devcycle/sdk/server/model/ErrorResponse.java b/src/main/java/com/devcycle/sdk/server/model/ErrorResponse.java
index 3101072e..fab9bf3a 100755
--- a/src/main/java/com/devcycle/sdk/server/model/ErrorResponse.java
+++ b/src/main/java/com/devcycle/sdk/server/model/ErrorResponse.java
@@ -24,6 +24,9 @@
 @NoArgsConstructor
 public class ErrorResponse {
 
+  @Schema(required = true, description = "HTTP Status Code")
+  private int statusCode;
+
   @Schema(required = true, description = "Error message")
   private String message;