diff --git a/README.md b/README.md
index e704ff5..f5d1752 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 
 ```terraform
 module "as_demo" {
-  source = "git@github.com:AxonIQ/terraform-axonserver-k8s.git?ref=v1.7"
+  source = "git@github.com:AxonIQ/terraform-axonserver-k8s.git?ref=v1.8"
   
   axonserver_release = "2024.0.4"
   java_version       = "11"
@@ -53,7 +53,8 @@ module "as_demo" {
 | <a name="input_events_storage"></a> [events\_storage](#input\_events\_storage)                                    | Events PVC storage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`                                                                                                                   | `"5Gi"`                             |    no    |
 | <a name="input_log_storage"></a> [log\_storage](#input\_log\_storage)                                    | Log PVC storage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`                                                                                                                   | `"2Gi"`                             |    no    |
 | <a name="input_data_storage"></a> [data\_storage](#input\_data\_storage)                                    | Data PVC storage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`                                                                                                                   | `"10Gi"`                             |    no    |
-| <a name="input_plugins_storage"></a> [plugins\_storage](#input\_plugins\_storage)                                    | Plugins PVC storage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`                                                                                                                   | `"1Gi"`                             |    no    |
+| <a name="input_plugins_storage"></a> [plugins\_storage](#input\_plugins\_storage)                           | Plugins PVC storage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`                                                                                                                   | `"1Gi"`                              |    no    |
+| <a name="input_devmode_enabled"></a> [devmode\_enabled](#input\_devmode\_enabled                            | Axon Server devmode                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `bool`                                                                                                                     | `false`                              |    no    |
 
 ## Outputs
 
diff --git a/conf/axonserver.properties.tmpl b/conf/axonserver.properties.tmpl
index 195b4a5..df5c72c 100644
--- a/conf/axonserver.properties.tmpl
+++ b/conf/axonserver.properties.tmpl
@@ -27,3 +27,5 @@ axoniq.axonserver.accesscontrol.systemtokenfile=/axonserver/security/axonserver.
 security.require-ssl=false
 
 axoniq.axonserver.ssl.enabled=false
+
+axoniq.axonserver.devmode.enabled=${devmode_enabled}
diff --git a/configmap.tf b/configmap.tf
index 12cf5aa..a0d38a8 100755
--- a/configmap.tf
+++ b/configmap.tf
@@ -2,10 +2,11 @@ data "template_file" "axonserver_properties" {
   template = file("${path.module}/conf/axonserver.properties.tmpl")
 
   vars = {
-    first_name     = "${var.cluster_name}-1"
-    public_domain  = var.public_domain
-    namespace      = kubernetes_namespace.as_demo.id
-    internal_token = random_uuid.internal_token.result
+    first_name      = "${var.cluster_name}-1"
+    public_domain   = var.public_domain
+    namespace       = kubernetes_namespace.as_demo.id
+    internal_token  = random_uuid.internal_token.result
+    devmode_enabled = var.devmode_enabled
   }
 }
 
diff --git a/variables.tf b/variables.tf
index 78d1411..a4b3a2c 100755
--- a/variables.tf
+++ b/variables.tf
@@ -42,54 +42,60 @@ variable "console_authentication" {
 
 variable "java_version" {
   description = "Java runtime"
-  type = number
-  default = 11
+  type        = number
+  default     = 11
 }
 
 variable "resources_limits_cpu" {
   description = "spec.container.resources.limits.cpu"
-  type = number
-  default = 1
+  type        = number
+  default     = 1
 }
 
 variable "resources_limits_memory" {
   description = "spec.container.resources.limits.memory"
-  type = string
-  default = "1Gi"
+  type        = string
+  default     = "1Gi"
 }
 
 variable "resources_requests_cpu" {
   description = "spec.container.resources.requests.cpu"
-  type = number
-  default = 1
+  type        = number
+  default     = 1
 }
 
 variable "resources_requests_memory" {
   description = "spec.container.resources.requests.memory"
-  type = string
-  default = "1Gi"
+  type        = string
+  default     = "1Gi"
 }
 
 variable "events_storage" {
   description = "Events PVC storage"
-  type = string
-  default = "5Gi"
+  type        = string
+  default     = "5Gi"
 }
 
 variable "log_storage" {
   description = "Log PVC storage"
-  type = string
-  default = "2Gi"
+  type        = string
+  default     = "2Gi"
 }
 
 variable "data_storage" {
   description = "Data PVC storage"
-  type = string
-  default = "10Gi"
+  type        = string
+  default     = "10Gi"
 }
 
 variable "plugins_storage" {
   description = "Plugins PVC storage"
-  type = string
-  default = "1Gi"
-}
\ No newline at end of file
+  type        = string
+  default     = "1Gi"
+}
+
+variable "devmode_enabled" {
+  description = "Axon Server devmode"
+  type        = bool
+  default     = false
+}