diff --git a/README.md b/README.md
index 3a91ed8..f9a3343 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 
 ```terraform
 module "as_demo" {
-  source = "git@github.com:AxonIQ/terraform-axonserver-gke.git?ref=v1.1"
+  source = "git@github.com:AxonIQ/terraform-axonserver-gke.git?ref=v1.4"
 
   nodes_number  = 3
   cluster_name  = "axonserver"
diff --git a/conf/axonserver.properties.tmpl b/conf/axonserver.properties.tmpl
index c37a98c..195b4a5 100644
--- a/conf/axonserver.properties.tmpl
+++ b/conf/axonserver.properties.tmpl
@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-axoniq.axonserver.autocluster.first=${first_name}.${namespace}.svc.cluster.local
-axoniq.axonserver.autocluster.contexts=_admin,default
+#axoniq.axonserver.autocluster.first=${first_name}.${namespace}.svc.cluster.local
+#axoniq.axonserver.autocluster.contexts=_admin,default
 
 axoniq.axonserver.enterprise.licenseDirectory=./license
 
diff --git a/secrets.tf b/secrets.tf
index 69583de..73b185c 100755
--- a/secrets.tf
+++ b/secrets.tf
@@ -18,6 +18,7 @@ resource "kubernetes_secret" "axonserver_token" {
 }
 
 resource "kubernetes_secret" "axoniq_license" {
+  count = length(var.console_authentication) > 0 ? 0 : 1
   metadata {
     name      = "axoniq.license"
     namespace = kubernetes_namespace.as_demo.id
diff --git a/statefulset.tf b/statefulset.tf
index 99c1e44..320e691 100755
--- a/statefulset.tf
+++ b/statefulset.tf
@@ -1,5 +1,5 @@
 resource "kubernetes_stateful_set" "axonserver" {
-  count = var.nodes_number
+  count = var.nodes_number 
 
   metadata {
     name      = "${var.cluster_name}-${count.index + 1}"
@@ -82,9 +82,12 @@ resource "kubernetes_stateful_set" "axonserver" {
             value = "${var.cluster_name}-${count.index + 1}"
           }
 
-          env {
-            name  = "AXONIQ_CONSOLE_AUTHENTICATION"
-            value = var.console_authentication
+          dynamic "env" {
+            for_each = length(var.console_authentication) > 0 ? [1] : []
+            content {
+              name  = "AXONIQ_CONSOLE_AUTHENTICATION"
+              value = var.console_authentication
+            }
           }
 
           volume_mount {
@@ -119,10 +122,13 @@ resource "kubernetes_stateful_set" "axonserver" {
             read_only  = true
           }
 
-          volume_mount {
-            name       = "license"
-            mount_path = "/axonserver/license"
-            read_only  = true
+          dynamic "volume_mount" {
+            for_each = length(var.console_authentication) > 0 ? [] : [1]
+            content {
+              name       = "license"
+              mount_path = "/axonserver/license"
+              read_only  = true
+            }
           }
 
           startup_probe {
@@ -181,11 +187,14 @@ resource "kubernetes_stateful_set" "axonserver" {
           }
         }
 
-        volume {
-          name = "license"
+        dynamic "volume" {
+          for_each = length(var.console_authentication) > 0 ? [] : [1]
+          content {
+            name = "license"
 
-          secret {
-            secret_name = kubernetes_secret.axoniq_license.metadata[0].name
+            secret {
+              secret_name = kubernetes_secret.axoniq_license[0].metadata[0].name
+            }
           }
         }