diff --git a/README.md b/README.md
index 3eb028d..9644e0d 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,10 @@ You can also build from source with either go native tooling or with Bazel, see
     	Enable Kinesis service (default true)
   -enableSQS
     	Enable SQS service (default true)
+  -enableS3
+      Enable S3 service (default true)
   -experimental_enableDynamoDB
     	Enable DynamoDB service (default true)
-  -experimental_enableS3
-    	Enable S3 service (default true)
   -kinesisDefaultDuration duration
     	How long to retain messages. Can be used to control memory usage. After creation, retention can be adjusted with [Increase/Decrease]StreamRetentionPeriod (default 24h0m0s)
   -kinesisInitialShardsPerStream int
diff --git a/main.go b/main.go
index c3ba89a..3287979 100755
--- a/main.go
+++ b/main.go
@@ -65,7 +65,7 @@ func main() {
 
 	enableDynamoDB := flag.Bool("experimental_enableDynamoDB", true, "Enable DynamoDB service")
 
-	enableS3 := flag.Bool("experimental_enableS3", true, "Enable S3 service")
+	enableS3 := flag.Bool("enableS3", true, "Enable S3 service")
 	s3InitialBuckets := flag.String("s3InitialBuckets", "", "Buckets to create at startup. Example: bucket1,bucket2,bucket3")
 
 	enableSQS := flag.Bool("enableSQS", true, "Enable SQS service")