diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4adfb3..671fd38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,33 @@
-## 3.2.4 (January 26, 2021)
+## 3.2.5 (February 19, 2021)
+- What’s fixed?
+  - DHCP: Allow reservations with same identifier but in different subnets
+  - DHCP: Fixed an issue where creating a custom DHCP option definition would trigger the API and UI to respond with an Internal Server Error
+  - DHCP: Fixed an issue where it was not possible to select array when creating a custom DHCP option
+  - DHCP: Fixed an issue where saving a Scope Group with a large number of Scopes and Reservations could fail with a 504 gateway timeout
+  - DHCP: IPAM get next endpoint returns an address already in use
+  - DHCP: Scope group “Match Client ID” checkbox is out of sync with default value
+  - DNS: Fixed an issue where you cannot modify the nameserver associated with a DNS service if there is a view associated with it
+  - DNS: Fixed an issue where an ACL/View erroneously could prevent DNS resolution
+  - IPAM: Fixed an issue where subnets were not enclosed correctly
+  - Portal: Validate totp minlength to prevent causing backend 401 error
+  - Portal: Fixed an issue where a record could not be cloned to the root of any zone
+  - Portal: Fixed an issue where the portal becomes unresponsive when viewing a DHCP scopes range
+  - Portal: Fixed an issue where multiple calls to an endpoint were made where only one is needed
+  - Portal: Persist show reserve zones checkbox
+  - Portal: Optimized Template view for large IPAM dataset
+  - System: Fixed slow response from portal - API returning code 500 
+  - System: Fixed an issue which results in possible data loss during certain types of primary failover
+  - System: Fixed an issue where the oplog will fill up entire disk over time
+  - System: Fixed an issue where the services endpoint would not show a service definition with a Scope Group attached
+  - System: Fixed issue with Dist going unhealthy during stress testing
+  - System: Fixed an issue with the upgrade database migrations
+
+- Known Issues:
+  - DHCP: An invalid configuration is possible where DHCP reservations are made outside a Scope definition
+  - DHCP: After API import of a large number of Scopes, subsequent initial DHCP configuration deployment takes 3+ hrs
 
 
+## 3.2.4 (January 26, 2021)
 - What’s fixed?
   - DHCP: Batch updates for leases to improve overall performance
   - DHCP: Enable multiple DDNS zones per scope groups for NS1 DDNS
@@ -22,7 +49,6 @@
 
 
 ## 3.2.3 (December 22, 2020)
-
 - New Features:
   - Cloud-sync: AWS RTE53 support for VPC’s, Zones and Records
   - DHCP: Custom Options
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 91b2a41..b9ad63a 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -40,7 +40,7 @@ Use to start all container images on a single host: `data`, `dns`, `core`, `xfr`
 #### For example:
 
 ```shell
-$sudo TAG=3.2.4 POP_ID=mypop SERVER_ID=myserver docker-compose -p myproject -f docker-compose.yml up -d
+$sudo TAG=3.2.5 POP_ID=mypop SERVER_ID=myserver docker-compose -p myproject -f docker-compose.yml up -d
 ```
 
 ---
@@ -78,14 +78,14 @@ Used to start control services on a single host: `data`, `core`, `xfr`.
 #### For example, starting a control host with primary data:
 
 ```shell
-$sudo TAG=3.2.4 POP_ID=dc1 SERVER_ID=host1 PRIMARY=true DATA_CONTAINER_NAME=data1 DATA_PEERS=data2 DATA_HOSTS=data1,data2 \
+$sudo TAG=3.2.5 POP_ID=dc1 SERVER_ID=host1 PRIMARY=true DATA_CONTAINER_NAME=data1 DATA_PEERS=data2 DATA_HOSTS=data1,data2 \
 docker-compose -p myproject -f control-compose.yml up -d
 ```
 
 #### For example, starting a control host with replica data:
 
 ```shell
-$sudo TAG=3.2.4 POP_ID=dc1 SERVER_ID=host2 DATA_CONTAINER_NAME=data2 DATA_PEERS=data1 DATA_HOSTS=data1,data2 \
+$sudo TAG=3.2.5 POP_ID=dc1 SERVER_ID=host2 DATA_CONTAINER_NAME=data2 DATA_PEERS=data1 DATA_HOSTS=data1,data2 \
 docker-compose -p myproject -f control-compose.yml up -d
 ```
 
@@ -109,5 +109,5 @@ Used to start edge services on a single host: `dns`, `dhcp` and `dist` (distribu
 #### For example:
 
 ```shell
-$sudo TAG=3.2.4 POP_ID=dc2 SERVER_ID=host3 docker-compose -p myproject -f edge-compose.yml up -d
+$sudo TAG=3.2.5 POP_ID=dc2 SERVER_ID=host3 docker-compose -p myproject -f edge-compose.yml up -d
 ```
diff --git a/docker-compose/control-compose.yml b/docker-compose/control-compose.yml
index d4664ec..e69929f 100644
--- a/docker-compose/control-compose.yml
+++ b/docker-compose/control-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   data:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DATA_CONTAINER_NAME:-data}
-    image: ns1inc/privatedns_data:${TAG:-3.2.4}
+    image: ns1inc/privatedns_data:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -61,7 +61,7 @@ services:
       --server_id            ${SERVER_ID:-myserver}
   core:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${CORE_CONTAINER_NAME:-core}
-    image: ns1inc/privatedns_core:${TAG:-3.2.4}
+    image: ns1inc/privatedns_core:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -100,7 +100,7 @@ services:
       --nameservers          ${NAMESERVERS:-ns1.mycompany.net}
   xfr:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${XFR_CONTAINER_NAME:-xfr}
-    image: ns1inc/privatedns_xfr:${TAG:-3.2.4}
+    image: ns1inc/privatedns_xfr:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index fac2d79..6c4294f 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   data:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DATA_CONTAINER_NAME:-data}
-    image: ns1inc/privatedns_data:${TAG:-3.2.4}
+    image: ns1inc/privatedns_data:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -49,7 +49,7 @@ services:
       --server_id            ${SERVER_ID:-myserver}
   core:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${CORE_CONTAINER_NAME:-core}
-    image: ns1inc/privatedns_core:${TAG:-3.2.4}
+    image: ns1inc/privatedns_core:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -88,7 +88,7 @@ services:
       --nameservers          ${NAMESERVERS:-ns1.mycompany.net}
   xfr:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${XFR_CONTAINER_NAME:-xfr}
-    image: ns1inc/privatedns_xfr:${TAG:-3.2.4}
+    image: ns1inc/privatedns_xfr:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -120,7 +120,7 @@ services:
       --core_host           ${CORE_HOSTS:-core}
   dns:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DNS_CONTAINER_NAME:-dns}
-    image: ns1inc/privatedns_dns:${TAG:-3.2.4}
+    image: ns1inc/privatedns_dns:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -154,7 +154,7 @@ services:
       --num_trex_procs      2
   dhcp:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DHCP_CONTAINER_NAME:-dhcp}
-    image: ns1inc/privatedns_dhcp:${TAG:-3.2.4}
+    image: ns1inc/privatedns_dhcp:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -194,7 +194,7 @@ services:
       --service_def_id      2
   monitor:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${MONITOR_CONTAINER_NAME:-monitor}
-    image: ns1inc/privatedns_monitor:${TAG:-3.2.4}
+    image: ns1inc/privatedns_monitor:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/edge-compose.yml b/docker-compose/edge-compose.yml
index 0da8832..a0dee68 100644
--- a/docker-compose/edge-compose.yml
+++ b/docker-compose/edge-compose.yml
@@ -3,7 +3,7 @@ version: '3.4'
 services:
   dns:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DNS_CONTAINER_NAME:-dns}
-    image: ns1inc/privatedns_dns:${TAG:-3.2.4}
+    image: ns1inc/privatedns_dns:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -37,7 +37,7 @@ services:
       --num_trex_procs      4
   dhcp:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DHCP_CONTAINER_NAME:-dhcp}
-    image: ns1inc/privatedns_dhcp:${TAG:-3.2.4}
+    image: ns1inc/privatedns_dhcp:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -77,7 +77,7 @@ services:
       --service_def_id      2
   dist:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${DIST_CONTAINER_NAME:-dist}
-    image: ns1inc/privatedns_dist:${TAG:-3.2.4}
+    image: ns1inc/privatedns_dist:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
@@ -112,7 +112,7 @@ services:
       --core_host            ${CORE_HOSTS}
   monitor:
     hostname: ${POP_ID:-mypop}-${SERVER_ID:-myserver}-${MONITOR_CONTAINER_NAME:-monitor}
-    image: ns1inc/privatedns_monitor:${TAG:-3.2.4}
+    image: ns1inc/privatedns_monitor:${TAG:-3.2.5}
     logging:
       driver: "json-file"
       options:
diff --git a/terraform/modules/core/variables.tf b/terraform/modules/core/variables.tf
index 224182b..974d1c3 100644
--- a/terraform/modules/core/variables.tf
+++ b/terraform/modules/core/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   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 042fc32..cdd62c7 100644
--- a/terraform/modules/data/variables.tf
+++ b/terraform/modules/data/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   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 45c0ae7..6a1cf66 100644
--- a/terraform/modules/dhcp/variables.tf
+++ b/terraform/modules/dhcp/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   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 cb669c3..e126e0e 100644
--- a/terraform/modules/dist/variables.tf
+++ b/terraform/modules/dist/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   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 2436002..72f0ea0 100644
--- a/terraform/modules/dns/variables.tf
+++ b/terraform/modules/dns/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }
 
diff --git a/terraform/modules/monitor/variables.tf b/terraform/modules/monitor/variables.tf
index 107418a..0512be5 100644
--- a/terraform/modules/monitor/variables.tf
+++ b/terraform/modules/monitor/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   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 5f3da9b..f64e200 100644
--- a/terraform/modules/xfr/variables.tf
+++ b/terraform/modules/xfr/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "3.2.4"
+  default     = "3.2.5"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }