diff --git a/deploy/docker/docker-compose-tiny-with-s3.yaml b/deploy/docker/docker-compose-tiny-with-s3.yaml
index a9183e5a56..e4711679ad 100644
--- a/deploy/docker/docker-compose-tiny-with-s3.yaml
+++ b/deploy/docker/docker-compose-tiny-with-s3.yaml
@@ -69,7 +69,7 @@ services:
       - coordinator
     env_file:
       - environment_tiny/coordinator
-      - environment_tiny/common
+      - environment_tiny/s3_common
 
   broker:
     image: apache/druid:0.20.0
@@ -86,7 +86,7 @@ services:
       - broker
     env_file:
       - environment_tiny/broker
-      - environment_tiny/common
+      - environment_tiny/s3_common
 
   historical:
     image: apache/druid:0.20.0
@@ -104,7 +104,7 @@ services:
       - historical
     env_file:
       - environment_tiny/historical
-      - environment_tiny/common
+      - environment_tiny/s3_common
 
   middlemanager:
     image: apache/druid:0.20.0
@@ -122,7 +122,7 @@ services:
       - middleManager
     env_file:
       - environment_tiny/middlemanager
-      - environment_tiny/common
+      - environment_tiny/s3_common
 
   router:
     image: apache/druid:0.20.0
@@ -139,7 +139,7 @@ services:
       - router
     env_file:
       - environment_tiny/router
-      - environment_tiny/common
+      - environment_tiny/s3_common
 
   flatten-processor:
     image: signoz/flattener-processor:0.1.1
diff --git a/deploy/docker/environment_tiny_s3/broker b/deploy/docker/environment_tiny_s3/broker
index 03afe60aff..674da55f5f 100644
--- a/deploy/docker/environment_tiny_s3/broker
+++ b/deploy/docker/environment_tiny_s3/broker
@@ -28,29 +28,6 @@ druid_emitter_logging_logLevel=debug
 
 # druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"]
 
-druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"]
-
-
-druid_storage_type=s3
-druid_storage_bucket=solvzy-test2
-druid_storage_baseKey=druid/segments
-
-AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC
-AWS_SECRET_ACCESS_KEY=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
-AWS_REGION=us-east-2
-
-druid_indexer_logs_type=s3
-druid_indexer_logs_s3Bucket=solvzy-test2
-druid_indexer_logs_s3Prefix=druid/indexing-logs
-
-
-# druid_storage_type=local
-# druid_storage_storageDirectory=/opt/druid/deepStorage
-# druid_indexer_logs_type=file
-# druid_indexer_logs_directory=/opt/druid/data/indexing-logs
-
-
-
 
 
 druid_zk_service_host=zookeeper
diff --git a/deploy/docker/environment_tiny_s3/coordinator b/deploy/docker/environment_tiny_s3/coordinator
index f38e7186de..d5b9a4367f 100644
--- a/deploy/docker/environment_tiny_s3/coordinator
+++ b/deploy/docker/environment_tiny_s3/coordinator
@@ -28,25 +28,6 @@ druid_emitter_logging_logLevel=debug
 
 # druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"]
 
-druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"]
-
-druid_storage_type=s3
-druid_storage_bucket=signoz-saas
-druid_storage_baseKey=solvzy-test1
-
-AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC
-AWS_SECRET_ACCESS_KEY=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
-AWS_REGION=us-east-2
-
-druid_indexer_logs_type=s3
-druid_indexer_logs_s3Bucket=solvzy-test2
-druid_indexer_logs_s3Prefix=druid/indexing-logs
-
-
-# druid_storage_type=local
-# druid_storage_storageDirectory=/opt/druid/deepStorage
-# druid_indexer_logs_type=file
-# druid_indexer_logs_directory=/opt/druid/data/indexing-logs
 
 druid_zk_service_host=zookeeper
 
diff --git a/deploy/docker/environment_tiny_s3/historical b/deploy/docker/environment_tiny_s3/historical
index bdd2667a3c..a9b317b91c 100644
--- a/deploy/docker/environment_tiny_s3/historical
+++ b/deploy/docker/environment_tiny_s3/historical
@@ -28,27 +28,6 @@ druid_emitter_logging_logLevel=debug
 
 # druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"]
 
-druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"]
-
-druid_storage_type=s3
-druid_storage_bucket=solvzy-test2
-druid_storage_baseKey=druid/segments
-
-AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC
-AWS_SECRET_ACCESS_KEY=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
-AWS_REGION=us-east-2
-
-druid_indexer_logs_type=s3
-druid_indexer_logs_s3Bucket=solvzy-test2
-druid_indexer_logs_s3Prefix=druid/indexing-logs
-
-
-# druid_storage_type=local
-# druid_storage_storageDirectory=/opt/druid/deepStorage
-# druid_indexer_logs_type=file
-# druid_indexer_logs_directory=/opt/druid/data/indexing-logs
-
-
 druid_zk_service_host=zookeeper
 
 druid_metadata_storage_host=
diff --git a/deploy/docker/environment_tiny_s3/middlemanager b/deploy/docker/environment_tiny_s3/middlemanager
index b20e85e4ec..7665c28842 100644
--- a/deploy/docker/environment_tiny_s3/middlemanager
+++ b/deploy/docker/environment_tiny_s3/middlemanager
@@ -28,26 +28,6 @@ druid_emitter_logging_logLevel=debug
 
 # druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"]
 
-druid_extensions_loadList =["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"]
-
-druid_storage_type=s3
-druid_storage_bucket=solvzy-test2
-druid_storage_baseKey=druid/segments
-
-AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC
-AWS_SECRET_ACCESS_KEY=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
-AWS_REGION=us-east-2
-
-druid_indexer_logs_type=s3
-druid_indexer_logs_s3Bucket=solvzy-test2
-druid_indexer_logs_s3Prefix=druid/indexing-logs
-
-
-# druid_storage_type=local
-# druid_storage_storageDirectory=/opt/druid/deepStorage
-# druid_indexer_logs_type=file
-# druid_indexer_logs_directory=/opt/druid/data/indexing-logs
-
 
 druid_zk_service_host=zookeeper
 
diff --git a/deploy/docker/environment_tiny_s3/router b/deploy/docker/environment_tiny_s3/router
index c0ee64bc8b..5bfab90f4b 100644
--- a/deploy/docker/environment_tiny_s3/router
+++ b/deploy/docker/environment_tiny_s3/router
@@ -28,26 +28,6 @@ druid_emitter_logging_logLevel=debug
 
 # druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service"]
 
-druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-kafka-indexing-service", "druid-s3-extensions"]
-
-druid_storage_type=s3
-druid_storage_bucket=solvzy-test2
-druid_storage_baseKey=druid/segments
-
-AWS_ACCESS_KEY_ID=AKIARKCF5OX3CMI3XRXC
-AWS_SECRET_ACCESS_KEY=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
-AWS_REGION=us-east-2
-
-druid_indexer_logs_type=s3
-druid_indexer_logs_s3Bucket=solvzy-test2
-druid_indexer_logs_s3Prefix=druid/indexing-logs
-
-
-# druid_storage_type=local
-# druid_storage_storageDirectory=/opt/druid/deepStorage
-# druid_indexer_logs_type=file
-# druid_indexer_logs_directory=/opt/druid/data/indexing-logs
-
 
 druid_zk_service_host=zookeeper
 
diff --git a/deploy/docker/environment_tiny/common b/deploy/docker/environment_tiny_s3/s3_common
similarity index 100%
rename from deploy/docker/environment_tiny/common
rename to deploy/docker/environment_tiny_s3/s3_common