diff --git a/SingleViewApi/SingleViewApi.csproj b/SingleViewApi/SingleViewApi.csproj
index 14bc514..e52bcaa 100644
--- a/SingleViewApi/SingleViewApi.csproj
+++ b/SingleViewApi/SingleViewApi.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="AWSXRayRecorder.Handlers.EntityFramework" Version="1.1.0" />
     <PackageReference Include="Hackney.Core.DynamoDb" Version="1.51.0" />
     <PackageReference Include="Hackney.Core.HealthCheck" Version="1.49.0" />
-    <PackageReference Include="Hackney.Core.JWT" Version="1.71.0-feat-best-field-0001" />
+    <PackageReference Include="Hackney.Core.JWT" Version="1.87.0" />
     <PackageReference Include="Hackney.Core.Logging" Version="1.49.0" />
     <PackageReference Include="Hackney.Core.Middleware" Version="1.49.0" />
     <PackageReference Include="Hackney.Core.Validation" Version="1.56.0" />
diff --git a/SingleViewApi/Startup.cs b/SingleViewApi/Startup.cs
index 2c3df26..8379657 100644
--- a/SingleViewApi/Startup.cs
+++ b/SingleViewApi/Startup.cs
@@ -394,6 +394,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddHealthChecks();
 
+            // Used by Logging Middleware core
             services.AddTokenFactory();
 
             services.AddSwaggerGen(c =>
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 3c0fb33..2de2316 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -113,7 +113,7 @@ module "postgres_db" {
     db_port  = 5302
     subnet_ids = data.aws_subnet_ids.all.ids
     db_engine = "postgres"
-    db_engine_version = "16.3" //DMS does not work well with v12
+    db_engine_version = "16.8" //DMS does not work well with v12
     db_instance_class = "db.t3.micro"
     db_allocated_storage = 20
     maintenance_window = "sun:10:00-sun:10:30"
@@ -125,4 +125,5 @@ module "postgres_db" {
     project_name = "single view"
     db_allow_major_version_upgrade = "true"
     db_parameter_group_name = "postgres16"
+    copy_tags_to_snapshot = true
 }
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 54ae5a5..e8ff8f9 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -118,7 +118,7 @@ module "postgres_db" {
     db_port  = 5302
     subnet_ids = data.aws_subnet_ids.all.ids
     db_engine = "postgres"
-    db_engine_version = "16.3" //DMS does not work well with v12
+    db_engine_version = "16.8" //DMS does not work well with v12
     db_instance_class = "db.t3.micro"
     db_allocated_storage = 20
     maintenance_window = "sun:10:00-sun:10:30"
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 8a8d6d7..fe30c1f 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -111,7 +111,7 @@ module "postgres_db" {
     db_port                    = 5302
     subnet_ids                 = data.aws_subnet_ids.all.ids
     db_engine                  = "postgres"
-    db_engine_version          = "16.3" //DMS does not work well with v12
+    db_engine_version          = "16.8" //DMS does not work well with v12
     db_instance_class          = "db.t3.micro"
     db_allocated_storage       = 20
     maintenance_window         = "sun:10:00-sun:10:30"
@@ -123,4 +123,5 @@ module "postgres_db" {
     project_name               = "single view"
     db_allow_major_version_upgrade = "true"
     db_parameter_group_name = "postgres16"
+    copy_tags_to_snapshot = true
 }