diff --git a/docker-compose.yml b/docker-compose.yml
index bf44bb4..5f5ee66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,11 +10,12 @@ services:
     # If you really want to use MS SQL Server, uncomment the following line
     #image: mcr.microsoft.com/mssql/server
     ports:
-      - 1433:1433
-    restart: always
+      - 1500:1433
+    # restart the container unless it's been manually stopped
+    restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P yourStrong(!)Password -Q 'SELECT 1' || exit 1"]
       interval: 10s
       retries: 10
       start_period: 10s
-      timeout: 3s    
\ No newline at end of file
+      timeout: 3s    
diff --git a/src/WebApi/appsettings.Development.json b/src/WebApi/appsettings.Development.json
index 2dfff79..71ed706 100644
--- a/src/WebApi/appsettings.Development.json
+++ b/src/WebApi/appsettings.Development.json
@@ -5,11 +5,7 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  // NOTE: If any of your connection strings real passwords, you should delete them and put them in the user secrets file instead.
   "ConnectionStrings": {
-    // Local DB
-    //"DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=CleanArchitecture;Trusted_Connection=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
-    // Docker DB
-    "DefaultConnection": "Server=localhost,1433;Initial Catalog=CleanArchitecture;Persist Security Info=False;User ID=sa;Password=yourStrong(!)Password;MultipleActiveResultSets=True;TrustServerCertificate=True;Connection Timeout=30;"
+    "DefaultConnection": "Server=localhost,1500;Initial Catalog=CleanArchitecture;Persist Security Info=False;User ID=sa;Password=yourStrong(!)Password;MultipleActiveResultSets=True;TrustServerCertificate=True;Connection Timeout=30;"
   }
 }
diff --git a/tools/Database/appsettings.json b/tools/Database/appsettings.json
index c56b331..71ed706 100644
--- a/tools/Database/appsettings.json
+++ b/tools/Database/appsettings.json
@@ -6,6 +6,6 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost,1433;Initial Catalog=CleanArchitecture;Persist Security Info=False;User ID=sa;Password=yourStrong(!)Password;MultipleActiveResultSets=True;TrustServerCertificate=True;Connection Timeout=30;"
+    "DefaultConnection": "Server=localhost,1500;Initial Catalog=CleanArchitecture;Persist Security Info=False;User ID=sa;Password=yourStrong(!)Password;MultipleActiveResultSets=True;TrustServerCertificate=True;Connection Timeout=30;"
   }
 }