diff --git a/src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs b/src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs
index cfc82ab27a..40bf7e3f53 100644
--- a/src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs
+++ b/src/Examples/DatabasePerTenantExample/Data/AppDbContext.cs
@@ -44,8 +44,7 @@ private string GetConnectionString()
             throw GetErrorForInvalidTenant(tenantName);
         }
 
-        string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-        return connectionString.Replace("###", postgresPassword);
+        return connectionString;
     }
 
     private string? GetTenantName()
diff --git a/src/Examples/DatabasePerTenantExample/appsettings.json b/src/Examples/DatabasePerTenantExample/appsettings.json
index 01687be022..1b5a40da62 100644
--- a/src/Examples/DatabasePerTenantExample/appsettings.json
+++ b/src/Examples/DatabasePerTenantExample/appsettings.json
@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=DefaultTenantDb;User ID=postgres;Password=###;Include Error Detail=true",
-    "AdventureWorks": "Host=localhost;Database=AdventureWorks;User ID=postgres;Password=###;Include Error Detail=true",
-    "Contoso": "Host=localhost;Database=Contoso;User ID=postgres;Password=###;Include Error Detail=true"
+    "Default": "Host=localhost;Database=DefaultTenantDb;User ID=postgres;Password=postgres;Include Error Detail=true",
+    "AdventureWorks": "Host=localhost;Database=AdventureWorks;User ID=postgres;Password=postgres;Include Error Detail=true",
+    "Contoso": "Host=localhost;Database=Contoso;User ID=postgres;Password=postgres;Include Error Detail=true"
   },
   "Logging": {
     "LogLevel": {
diff --git a/src/Examples/JsonApiDotNetCoreExample/Program.cs b/src/Examples/JsonApiDotNetCoreExample/Program.cs
index 2884e7750c..764cc6a6c3 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Program.cs
@@ -49,7 +49,7 @@ static void ConfigureServices(WebApplicationBuilder builder)
 
     builder.Services.AddDbContext<AppDbContext>(options =>
     {
-        string? connectionString = GetConnectionString(builder.Configuration);
+        string? connectionString = builder.Configuration.GetConnectionString("Default");
         options.UseNpgsql(connectionString);
 
         SetDbContextDebugOptions(options);
@@ -73,12 +73,6 @@ static void ConfigureServices(WebApplicationBuilder builder)
     }
 }
 
-static string? GetConnectionString(IConfiguration configuration)
-{
-    string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-    return configuration.GetConnectionString("Default")?.Replace("###", postgresPassword);
-}
-
 [Conditional("DEBUG")]
 static void SetDbContextDebugOptions(DbContextOptionsBuilder options)
 {
diff --git a/src/Examples/JsonApiDotNetCoreExample/appsettings.json b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
index 058685ecb1..418fcb7812 100644
--- a/src/Examples/JsonApiDotNetCoreExample/appsettings.json
+++ b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=###;Include Error Detail=true"
+    "Default": "Host=localhost;Database=JsonApiDotNetCoreExample;User ID=postgres;Password=postgres;Include Error Detail=true"
   },
   "Logging": {
     "LogLevel": {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
index 896813986d..9c054c349b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
@@ -27,10 +27,8 @@ public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup<
             services.AddResourceRepository<MusicTrackRepository>();
             services.AddResourceRepository<LyricRepository>();
 
-            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-
             string dbConnectionString =
-                $"Host=localhost;Database=JsonApiTest-Extra-{Guid.NewGuid():N};User ID=postgres;Password={postgresPassword};Include Error Detail=true";
+                $"Host=localhost;Database=JsonApiTest-Extra-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true";
 
             services.AddDbContext<ExtraDbContext>(options => options.UseNpgsql(dbConnectionString));
         });
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
index 80dd4abfb6..a7158f9933 100644
--- a/test/TestBuildingBlocks/IntegrationTestContext.cs
+++ b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -64,10 +64,7 @@ protected override HttpClient CreateClient()
 
     private WebApplicationFactory<TStartup> CreateFactory()
     {
-        string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-
-        string dbConnectionString =
-            $"Host=localhost;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;Password={postgresPassword};Include Error Detail=true";
+        string dbConnectionString = $"Host=localhost;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true";
 
         var factory = new IntegrationTestWebApplicationFactory();