diff --git a/provider/indexer-aws/CloudFormation/Automated/ecs.yml b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
index 0e8f6932d1fb73c05593e8e4c385188b20b92f56..b37a94b58be4b08562ba7824f1f010486a714247 100644
--- a/provider/indexer-aws/CloudFormation/Automated/ecs.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
@@ -413,11 +413,11 @@ Resources:
             - Name: AWS_REGION
               Value: !Ref Region
             - Name: AWS_QUEUE_INDEXER_NAME
-              Value: !Sub ${Environment}-${StorageApplicationName}-queue
+              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-queue
             - Name: AWS_INDEXER_INDEX_API
               Value: !Sub http://${ECSALB.DNSName}/${IndexerEndpoint}
             - Name: AWS_DEADLETTER_QUEUE_NAME
-              Value: !Sub ${Environment}-${StorageApplicationName}-dead-letter-queue
+              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-dead-letter-queue
             - Name: MAX_INDEX_THREADS
               Value: !Ref MaxThreads
             - Name: MAX_REQUEST_COUNT