diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
index b14d79395a..7dce773d12 100644
--- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
+++ b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
@@ -41,6 +41,12 @@ public ExternalPayloadStorage s3ExternalPayloadStorage(
             matchIfMissing = true)
     @Bean
     public AmazonS3 amazonS3(S3Properties properties) {
-        return AmazonS3ClientBuilder.standard().withRegion(properties.getRegion()).build();
+                return AmazonS3ClientBuilder.standard().withRegion(properties.getRegion()).build();
+//        TODO: Add localstack support to test locally
+//        return AmazonS3ClientBuilder.standard()
+//                .withEndpointConfiguration(
+//                        new AwsClientBuilder.EndpointConfiguration(
+//                                properties.getEndpoint(), properties.getRegion()))
+//                .build();
     }
 }
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
index 9c41b4a107..b853446fdd 100644
--- a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
+++ b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Properties.java
@@ -54,4 +54,15 @@ public String getRegion() {
     public void setRegion(String region) {
         this.region = region;
     }
+
+//    TODO: Add localstack support to test locally
+//    private String endpoint = "http://s3.localhost.localstack.cloud:4566";
+//
+//    public String getEndpoint() {
+//        return endpoint;
+//    }
+//
+//    public void setEndpoint(String endpoint) {
+//        this.endpoint = endpoint;
+//    }
 }
diff --git a/server/build.gradle b/server/build.gradle
index 55d1ec2111..a387b10d9b 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -73,6 +73,7 @@ dependencies {
     runtimeOnly group: 'com.netflix.conductor', name: 'conductor-postgres-persistence', version: '3.9.1'
 
     implementation "com.netflix.spectator:spectator-reg-metrics3:${version_spectator}"
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
 
     runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${revJAXB}"