diff --git a/provider/indexer-aws/CloudFormation/Automated/ecs.yml b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
index b37a94b58be4b08562ba7824f1f010486a714247..11387a75884da2bef3e03c997c41f19ad7c9ca82 100644
--- a/provider/indexer-aws/CloudFormation/Automated/ecs.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
@@ -52,7 +52,7 @@ Parameters:
     MaxLength: '64'
     AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
     ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
-    Default: os-storage
+    Default: osdu-storage
 
   QueueApplicationName:
     Description: >
@@ -413,11 +413,11 @@ Resources:
             - Name: AWS_REGION
               Value: !Ref Region
             - Name: AWS_QUEUE_INDEXER_NAME
-              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-queue
+              Value: !Sub ${Environment}-${StorageApplicationName}-queue
             - Name: AWS_INDEXER_INDEX_API
               Value: !Sub http://${ECSALB.DNSName}/${IndexerEndpoint}
             - Name: AWS_DEADLETTER_QUEUE_NAME
-              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-dead-letter-queue
+              Value: !Sub ${Environment}-${StorageApplicationName}-dead-letter-queue
             - Name: MAX_INDEX_THREADS
               Value: !Ref MaxThreads
             - Name: MAX_REQUEST_COUNT
diff --git a/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml b/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
index 41cfbcefde42f0749386c31934c65c203cc0ac61..a2c16f7f83fd383747abc8ff02bf72ea4960ebaf 100644
--- a/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
+++ b/provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml
@@ -56,7 +56,7 @@ Parameters:
     MaxLength: '64'
     AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
     ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
-    Default: os-storage
+    Default: osdu-storage
 
   QueueApplicationName:
     Description: >
diff --git a/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
index c92215a7ece9dad3ac81fe2cbb5bf27bfaea1f44..e970b952a1198c14a62f8e2aa2c9c3a526ca9ee1 100644
--- a/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json
@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"
diff --git a/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
index e2471fe7cedbd60a87fe2aef9d35610e81fe8976..5ce49d41a5e48414fdb8ced2d246c76728ce9212 100644
--- a/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json
@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"
diff --git a/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json b/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
index 13c2103cb06e36d0ad10025fbe13ef1e6d15c467..76b575b47780504db41e9b78e9ca65aa20b63d51 100644
--- a/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
+++ b/provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json
@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"