diff --git a/.env.example b/.env.example
index 07bec7a..74da999 100644
--- a/.env.example
+++ b/.env.example
@@ -15,11 +15,10 @@ ASPNETCORE_ENVIRONMENT=Development
 FileDiscoveryTimerExpression=0 */5 * * * *
 MeshHandshakeTimerExpression=0 0 0 * * * # Midnight
 FileRetryTimerExpression=0 0 * * * *
-QueueUrl=http://127.0.0.1:10001
 FileExtractQueueName=file-extract
 FileTransformQueueName=file-transform
 StaleHours=12
-BlobContainerName=incoming-mesh-files
+MeshBlobContainerName=incoming-mesh-files
 
 
 # API Configuration
diff --git a/compose.yaml b/compose.yaml
index bc4032d..9c7d5c8 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -53,10 +53,11 @@ services:
       MeshPassword: "${MeshPassword}"
       MeshSharedKey: "${MeshSharedKey}"
       AZURITE_CONNECTION_STRING: "${AZURITE_CONNECTION_STRING}"
-      MeshStorageAccountUrl: "${AZURITE_CONNECTION_STRING}"
+      MeshBlobStorageUrl: "${AZURITE_CONNECTION_STRING}"
+      MeshQueueStorageUrl: "${AZURITE_CONNECTION_STRING}"
       ASPNETCORE_ENVIRONMENT: "${ASPNETCORE_ENVIRONMENT}"
       ASPNETCORE_URLS: "http://0.0.0.0:8080"
-      BlobContainerName: "${BlobContainerName}"
+      MeshBlobContainerName: "${MeshBlobContainerName}"
     ports:
       - "${MESH_INGEST_PORT}:8080"
     healthcheck:
diff --git a/src/ServiceLayer.Mesh/Messaging/ServiceCollectionExtensions.cs b/src/ServiceLayer.Mesh/Messaging/ServiceCollectionExtensions.cs
index 4b17a25..a7865d2 100644
--- a/src/ServiceLayer.Mesh/Messaging/ServiceCollectionExtensions.cs
+++ b/src/ServiceLayer.Mesh/Messaging/ServiceCollectionExtensions.cs
@@ -23,8 +23,8 @@ internal static IServiceCollection AddMessagingServices(this IServiceCollection
                 return new QueueServiceClient(connectionString, queueClientOptions);
             }
 
-            var meshStorageAccountUrl = EnvironmentVariables.GetRequired("MeshStorageAccountUrl");
-            return new QueueServiceClient(new Uri(meshStorageAccountUrl), new ManagedIdentityCredential(), queueClientOptions);
+            var meshQueueStorageUrl = EnvironmentVariables.GetRequired("MeshQueueStorageUrl");
+            return new QueueServiceClient(new Uri(meshQueueStorageUrl), new ManagedIdentityCredential(), queueClientOptions);
         });
 
         services.AddSingleton<IFileExtractQueueClient, FileExtractQueueClient>();
diff --git a/src/ServiceLayer.Mesh/Storage/ServiceCollectionExtensions.cs b/src/ServiceLayer.Mesh/Storage/ServiceCollectionExtensions.cs
index bdc541c..807b817 100644
--- a/src/ServiceLayer.Mesh/Storage/ServiceCollectionExtensions.cs
+++ b/src/ServiceLayer.Mesh/Storage/ServiceCollectionExtensions.cs
@@ -11,16 +11,16 @@ internal static IServiceCollection AddStorageServices(this IServiceCollection se
     {
         services.AddSingleton(_ =>
         {
-            var containerName = EnvironmentVariables.GetRequired("BlobContainerName");
+            var containerName = EnvironmentVariables.GetRequired("MeshBlobContainerName");
 
             if (isLocalEnvironment)
             {
                 return new BlobContainerClient(EnvironmentVariables.GetRequired("AzureWebJobsStorage"),containerName);
             }
 
-            var meshStorageAccountUrl = EnvironmentVariables.GetRequired("MeshStorageAccountUrl");
+            var meshBlobStorageUrl = EnvironmentVariables.GetRequired("MeshBlobStorageUrl");
 
-            var serviceClient = new BlobServiceClient(new Uri(meshStorageAccountUrl), new ManagedIdentityCredential());
+            var serviceClient = new BlobServiceClient(new Uri(meshBlobStorageUrl), new ManagedIdentityCredential());
             return serviceClient.GetBlobContainerClient(containerName);
         });