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 7dce773d12..106f61664d 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,12 +41,12 @@ public ExternalPayloadStorage s3ExternalPayloadStorage(
             matchIfMissing = true)
     @Bean
     public AmazonS3 amazonS3(S3Properties properties) {
-                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();
+        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 b853446fdd..f399cd0d7d 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
@@ -55,14 +55,14 @@ 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;
-//    }
+    //    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;
+    //    }
 }