diff --git a/CHANGELOG.md b/CHANGELOG.md
index d070993..319b3a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.5.9 (December 21, 2020)
+- What’s fixed?
+ - DNS: Fixed an issue where the DNSKEY record could fail to update when key is generated or deleted
+ - DNS: Fixed an issue where an in incorrect ZSK could be deleted from the DNSKEY cache when disabling a ZSK
+ - Portal: Fixed several DNS permissions issues when using RBAC
+ - System: Fixed an issue where hyphens were not supported in AD users or groups
+
+
 ## 2.5.8 (September 29, 2020)
 - What’s fixed?
   - System: Fixed an issue with the HA Data container health check where the system could exhaust resources upon stuck health checks
diff --git a/docker-compose/control-compose.yml b/docker-compose/control-compose.yml
index 79d96c4..7368ac1 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.8}
+    image: ns1inc/privatedns_data:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_core:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.9}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index e0d7272..70bf1ca 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.8}
+    image: ns1inc/privatedns_data:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_core:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.9}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/edge-compose.yml b/docker-compose/edge-compose.yml
index 0eaf72a..2658e98 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.8}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dist:${TAG:-2.5.9}
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/monitoring-compose.yml b/docker-compose/monitoring-compose.yml
index 06e9a92..1e982f4 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.8}
+    image: ns1inc/privatedns_data:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_core:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_xfr:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dns:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_dhcp:${TAG:-2.5.9}
     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.8}
+    image: ns1inc/privatedns_monitoring_edge:${TAG:-2.5.9}
     logging:
       driver: "json-file"
       options:
diff --git a/terraform/modules/core/variables.tf b/terraform/modules/core/variables.tf
index ffab13d..cf7ba95 100644
--- a/terraform/modules/core/variables.tf
+++ b/terraform/modules/core/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   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 c268e7f..46eaee6 100644
--- a/terraform/modules/data/variables.tf
+++ b/terraform/modules/data/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   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 9f3e266..0b55656 100644
--- a/terraform/modules/dhcp/variables.tf
+++ b/terraform/modules/dhcp/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   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 98dbdf5..3485ab6 100644
--- a/terraform/modules/dist/variables.tf
+++ b/terraform/modules/dist/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   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 b76936c..eadc5eb 100644
--- a/terraform/modules/dns/variables.tf
+++ b/terraform/modules/dns/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   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 09009e7..c4a12b6 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.8"
+  default     = "2.5.9"
   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 044242a..0f1a9da 100644
--- a/terraform/modules/xfr/variables.tf
+++ b/terraform/modules/xfr/variables.tf
@@ -1,5 +1,5 @@
 variable "docker_image_tag" {
-  default     = "2.5.8"
+  default     = "2.5.9"
   description = "The image tag of the Docker image. Defaults to the latest GA version number."
 }