diff --git a/data/services/insights/hccm/namespaces/prod-hccm-prod.yml b/data/services/insights/hccm/namespaces/prod-hccm-prod.yml
index 57d218399..31172f9e7 100644
--- a/data/services/insights/hccm/namespaces/prod-hccm-prod.yml
+++ b/data/services/insights/hccm/namespaces/prod-hccm-prod.yml
@@ -45,7 +45,7 @@ terraformResources:
     snapshot_identifier: cost-management-prod-migration
   enhanced_monitoring: true
   output_resource_name: cost-management-db-rds
-  parameter_group: /terraform/resources/insights/production/rds/postgres10-parameter-group-cost-management-prod.yml
+  parameter_group: /terraform/resources/insights/production/rds/postgres12-parameter-group-cost-management-prod.yml
 - provider: s3
   account: insights-prod
   identifier: hccm-prod
diff --git a/resources/terraform/resources/insights/production/rds/postgres12-parameter-group-cost-management-prod.yml b/resources/terraform/resources/insights/production/rds/postgres12-parameter-group-cost-management-prod.yml
new file mode 100644
index 000000000..8408158b7
--- /dev/null
+++ b/resources/terraform/resources/insights/production/rds/postgres12-parameter-group-cost-management-prod.yml
@@ -0,0 +1,39 @@
+family: postgres12
+description: Parameter Group for PostgreSQL 12
+parameters:
+- name: work_mem
+  value: 16384
+  apply_method: immediate
+- name: autovacuum_max_workers
+  value: 8
+  apply_method: pending-reboot
+- name: autovacuum_vacuum_cost_limit
+  value: 4800
+  apply_method: immediate
+- name: log_statement
+  value: none
+  apply_method: immediate
+- name: log_min_error_statement
+  value: error
+  apply_method: immediate
+- name: log_min_duration_statement
+  value: 2000
+  apply_method: immediate
+- name: rds.force_ssl
+  value: 0
+  apply_method: immediate
+- name: shared_preload_libraries
+  value: pg_stat_statements
+  apply_method: pending-reboot
+- name: pg_stat_statements.max
+  value: 1000
+  apply_method: pending-reboot
+- name: pg_stat_statements.track
+  value: TOP
+  apply_method: immediate
+- name: pg_stat_statements.track_utility
+  value: 0
+  apply_method: immediate
+- name: track_activity_query_size
+  value: 2048
+  apply_method: pending-reboot
diff --git a/resources/terraform/resources/insights/production/rds/rds-cost-management-prod.yml b/resources/terraform/resources/insights/production/rds/rds-cost-management-prod.yml
index 13ead3f3e..41a9cb57f 100644
--- a/resources/terraform/resources/insights/production/rds/rds-cost-management-prod.yml
+++ b/resources/terraform/resources/insights/production/rds/rds-cost-management-prod.yml
@@ -5,13 +5,13 @@ allocated_storage: 1000
 max_allocated_storage: 2000
 storage_encrypted: true
 auto_minor_version_upgrade: false
-skip_final_snapshot: true
+skip_final_snapshot: false
 backup_retention_period: 7
 storage_type: gp2
 multi_az: true
 db_subnet_group_name: 'app-sre rds subnet group'
 maintenance_window: Sun:05:00-Sun:07:00
 backup_window: 03:00-05:00
-engine_version: 10.6
+engine_version: 12.3
 performance_insights_enabled: true
 monitoring_interval: 60