diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc010da..eeaf94e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2.5.12 (April 12, 2021) 
+- What’s fixed?
+  - Security: OpenSSL and LibSSL have been patched to address CVE-2021-3449
+  - System: Change XFR and DIST containers to use least connections
+  - System: Fixed an issue whereby sequential failovers could break database replication
+  - System: Fixed a post-upgrade issue where data replication from DIST to the DNS service was not complete
+  - System: Fixed an issue where the oplog was not pruned and vacuumed properly
+  - System: Fixed an issue where data loss could occur on repeated Primary failover before the initial failover completed
+  - System: Shuffle core host variable for DIST container to avoid failure
+  - System: Updated prune timer from 1 minute to 1 hour
+  - System: Update the max connection count for PostgreSQL
+
+
 ## 2.5.11 (February 26th, 2021) 
 - What’s fixed?
   - API: API returns HTTP 500 when issuing GET on a DNSSEC signed zone or DNSKEY/RRSIG record within that zone
diff --git a/docker-compose/control-compose.yml b/docker-compose/control-compose.yml
index e0aaec4..2ce67c1 100644
--- a/docker-compose/control-compose.yml
+++ b/docker-compose/control-compose.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   data:
-    image: ns1inc/privatedns_data:${TAG:-2.5.11}
+    image: ns1inc/privatedns_data:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -56,7 +56,7 @@ services:
       --server_id            ${SERVER_ID:-myserver}
       --expose_ops_metrics   true
   core:
-    image: ns1inc/privatedns_core:${TAG:-2.5.11}
+    image: ns1inc/privatedns_core:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -94,7 +94,7 @@ services:
       --hostmaster_email   ${HOSTMASTER_EMAIL:-hostmaster@mycompany.net}
       --enable_ops_metrics true
   xfr:
-    image: ns1inc/privatedns_xfr:${TAG:-2.5.11}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 19e31b1..6ae7179 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   data:
-    image: ns1inc/privatedns_data:${TAG:-2.5.11}
+    image: ns1inc/privatedns_data:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -44,7 +44,7 @@ services:
       --server_id            ${SERVER_ID:-myserver}
       --expose_ops_metrics   true
   core:
-    image: ns1inc/privatedns_core:${TAG:-2.5.11}
+    image: ns1inc/privatedns_core:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -82,7 +82,7 @@ services:
       --hostmaster_email   ${HOSTMASTER_EMAIL:-hostmaster@mycompany.net}
       --enable_ops_metrics true
   xfr:
-    image: ns1inc/privatedns_xfr:${TAG:-2.5.11}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -114,7 +114,7 @@ services:
       --core_host           ${CORE_HOSTS:-core}
       --enable_ops_metrics  true
   dns:
-    image: ns1inc/privatedns_dns:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -148,7 +148,7 @@ services:
       --num_trex_procs      2
       --enable_ops_metrics  true
   dhcp:
-    image: ns1inc/privatedns_dhcp:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/edge-compose.yml b/docker-compose/edge-compose.yml
index 0110659..bf93642 100644
--- a/docker-compose/edge-compose.yml
+++ b/docker-compose/edge-compose.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   dns:
-    image: ns1inc/privatedns_dns:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -36,7 +36,7 @@ services:
       --num_trex_procs      4
       --enable_ops_metrics  true
   dhcp:
-    image: ns1inc/privatedns_dhcp:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -76,7 +76,7 @@ services:
       --dhcp_service_def_id 2
       --enable_ops_metrics  true
   dist:
-    image: ns1inc/privatedns_dist:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dist:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/monitoring-compose.yml b/docker-compose/monitoring-compose.yml
index edd6e6e..79e0b1b 100644
--- a/docker-compose/monitoring-compose.yml
+++ b/docker-compose/monitoring-compose.yml
@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   data:
-    image: ns1inc/privatedns_data:${TAG:-2.5.11}
+    image: ns1inc/privatedns_data:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -44,7 +44,7 @@ services:
       --server_id            ${SERVER_ID:-myserver}
       --expose_ops_metrics   true
   core:
-    image: ns1inc/privatedns_core:${TAG:-2.5.11}
+    image: ns1inc/privatedns_core:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -82,7 +82,7 @@ services:
       --hostmaster_email   ${HOSTMASTER_EMAIL:-hostmaster@mycompany.net}
       --enable_ops_metrics true
   xfr:
-    image: ns1inc/privatedns_xfr:${TAG:-2.5.11}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -114,7 +114,7 @@ services:
       --core_host           ${CORE_HOSTS:-core}
       --enable_ops_metrics  true
   dns:
-    image: ns1inc/privatedns_dns:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -148,7 +148,7 @@ services:
       --num_trex_procs      2
       --enable_ops_metrics  true
   dhcp:
-    image: ns1inc/privatedns_dhcp:${TAG:-2.5.11}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
@@ -188,7 +188,7 @@ services:
       --dhcp_service_def_id 2
       --enable_ops_metrics  true
   monitoring_edge:
-    image: ns1inc/privatedns_monitoring_edge:${TAG:-2.5.11}
+    image: ns1inc/privatedns_monitoring_edge:${TAG:-2.5.12}
     logging:
       driver: "json-file"
       options:
diff --git a/terraform/modules/core/variables.tf b/terraform/modules/core/variables.tf
index a7890dc..872fa7b 100644
--- a/terraform/modules/core/variables.tf
+++ b/terraform/modules/core/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/data/variables.tf b/terraform/modules/data/variables.tf
index 9cf371d..5bf9690 100644
--- a/terraform/modules/data/variables.tf
+++ b/terraform/modules/data/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/dhcp/variables.tf b/terraform/modules/dhcp/variables.tf
index 176fe1d..7f71510 100644
--- a/terraform/modules/dhcp/variables.tf
+++ b/terraform/modules/dhcp/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/dist/variables.tf b/terraform/modules/dist/variables.tf
index c77bfa8..a61a0da 100644
--- a/terraform/modules/dist/variables.tf
+++ b/terraform/modules/dist/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/dns/variables.tf b/terraform/modules/dns/variables.tf
index adc36ab..df9aae5 100644
--- a/terraform/modules/dns/variables.tf
+++ b/terraform/modules/dns/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/monitoring_edge/variables.tf b/terraform/modules/monitoring_edge/variables.tf
index 0d8002a..c9f29c7 100644
--- a/terraform/modules/monitoring_edge/variables.tf
+++ b/terraform/modules/monitoring_edge/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/xfr/variables.tf b/terraform/modules/xfr/variables.tf
index 4020f05..ebbc7f9 100644
--- a/terraform/modules/xfr/variables.tf
+++ b/terraform/modules/xfr/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.11"
+  default     = "2.5.12"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }