diff --git a/docker-compose.yml b/docker-compose.yml
index 2bb4d72b0..5088fda13 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
   ordering.api:
     image: eshop/ordering.api
     environment:
-      - ConnectionString=TBD
+      - ConnectionString=Server=10.0.75.1;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
     ports:
       - "81:80"
     extra_hosts:
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index ab493b335..7289683a7 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -46,9 +46,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
             //var connString = @"Server=CESARDLBOOKVHD;Database=Microsoft.eShopOnContainers.Services.OrderingDb;Trusted_Connection=True;";
 
             //(SQL Server Authentication)
-            var connString = @"Server=10.0.75.1;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;";
-            
-            //(TBD) connString = config.GetConnectionString("SqlStandardAuthentication.OrderingDb");
+            //var connString = @"Server=10.0.75.1;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;";
+
+            var connString = Configuration["ConnectionString"];
 
             services.AddDbContext<OrderingDbContext>(options => options.UseSqlServer(connString)
                                                                        .UseSqlServer(connString, b => b.MigrationsAssembly("Ordering.API"))
diff --git a/src/Services/Ordering/Ordering.API/docker-compose.debug.yml b/src/Services/Ordering/Ordering.API/docker-compose.debug.yml
index 737145169..ac688b6a1 100644
--- a/src/Services/Ordering/Ordering.API/docker-compose.debug.yml
+++ b/src/Services/Ordering/Ordering.API/docker-compose.debug.yml
@@ -2,14 +2,15 @@ version: '2'
 
 services:
   microsoft.eshoponcontainers.services.ordering.api:
-    image: username/microsoft.eshoponcontainers.services.ordering.api:Debug
+    image: eshop/ordering.api:Debug
     build:
       context: .
       dockerfile: Dockerfile.debug
     environment:
       - REMOTE_DEBUGGING=${REMOTE_DEBUGGING}
+      - ConnectionString=Server=10.0.75.1;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
     ports:
-      - "80:80"
+      - "81:80"
     volumes:
       - .:/app
     extra_hosts:
diff --git a/src/Services/Ordering/Ordering.API/docker-compose.yml b/src/Services/Ordering/Ordering.API/docker-compose.yml
index 0eb73b061..4f28e03fc 100644
--- a/src/Services/Ordering/Ordering.API/docker-compose.yml
+++ b/src/Services/Ordering/Ordering.API/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   ordering.api:
     image: eshop/ordering.api
     environment:
-      - ConnectionString=TBD
+      - ConnectionString=Server=10.0.75.1;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
     ports:
       - "81:80"
     extra_hosts:
diff --git a/src/Services/Ordering/Ordering.SqlData/UnitOfWork/OrderingDbContext.cs b/src/Services/Ordering/Ordering.SqlData/UnitOfWork/OrderingDbContext.cs
index 45fd50a59..0b8fdd260 100644
--- a/src/Services/Ordering/Ordering.SqlData/UnitOfWork/OrderingDbContext.cs
+++ b/src/Services/Ordering/Ordering.SqlData/UnitOfWork/OrderingDbContext.cs
@@ -16,6 +16,8 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.SqlData.UnitOfWork
 
         public DbSet<Order> Orders { get; set; }
 
+        //(CDLTLL) Probably delete, not using it for now
+        /*
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             //If running from ASP.NET Core, config is done at StartUp.cs --> ConfigureServices() outside 
@@ -39,6 +41,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.SqlData.UnitOfWork
             }
 
         }
+        */
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {