diff --git a/helm/index.yaml b/helm/index.yaml
index 2f0f6e5e1..5e576b146 100644
--- a/helm/index.yaml
+++ b/helm/index.yaml
@@ -2,15 +2,15 @@ apiVersion: v1
 entries:
   squidex:
   - apiVersion: v2
-    appVersion: 5.7.0
-    created: "2021-07-06T05:21:22.195826-03:00"
+    appVersion: 5.8.0
+    created: "2021-08-10T01:05:55.262103-03:00"
     dependencies:
     - condition: mongodb-replicaset.enabled
       name: mongodb-replicaset
       repository: https://kubernetes-charts.storage.googleapis.com/
       version: 3.9.6
     description: Squidex CMS
-    digest: 073d50f9c3dba6b34e3172149b39abcda942cfa0d11969ae0f2560af9993637e
+    digest: 4089126bc4c7bd5c96d03820458a1352d74ae19b9843146b92e2d9d4507de8b6
     home: https://squidex.io/
     keywords:
     - cms
@@ -26,4 +26,4 @@ entries:
     urls:
     - https://squidex.github.io/squidex/helm/squidex-1.0.0.tgz
     version: 1.0.0
-generated: "2021-07-06T05:21:22.194062-03:00"
+generated: "2021-08-10T01:05:55.259799-03:00"
diff --git a/helm/squidex-1.0.0.tgz b/helm/squidex-1.0.0.tgz
index 04d4e17e8..c96b5e62a 100644
Binary files a/helm/squidex-1.0.0.tgz and b/helm/squidex-1.0.0.tgz differ
diff --git a/helm/squidex/Chart.yaml b/helm/squidex/Chart.yaml
index af3524136..c9831da46 100644
--- a/helm/squidex/Chart.yaml
+++ b/helm/squidex/Chart.yaml
@@ -5,7 +5,7 @@ name: squidex
 description: Squidex CMS
 
 version: 1.0.0
-appVersion: "5.7.0"
+appVersion: "5.8.0"
 
 home: https://squidex.io/
 
@@ -24,4 +24,4 @@ dependencies:
   - name: mongodb-replicaset
     version: 3.9.6
     repository: https://kubernetes-charts.storage.googleapis.com/
-    condition: mongodb-replicaset.enabled
\ No newline at end of file
+    condition: mongodb-replicaset.enabled
diff --git a/helm/squidex/templates/deployment.yaml b/helm/squidex/templates/deployment.yaml
index 0d133a084..22be10847 100644
--- a/helm/squidex/templates/deployment.yaml
+++ b/helm/squidex/templates/deployment.yaml
@@ -4,15 +4,19 @@ metadata:
   name: {{ include "squidex.fullname" . }}
   labels:
     {{- include "squidex.labels" . | indent 4 }}
+    orleans/serviceId: "squidex-{{ default .Chart.AppVersion .Values.image.tag }}"
 spec:
   replicas: {{ .Values.deployment.replicaCount }}
   selector:
     matchLabels:
       {{- include "squidex.selectors" . | indent 6 }}
+      orleans/serviceId: "squidex="
   template:
     metadata:
       labels:
         {{- include "squidex.selectors" . | indent 8 }}
+      orleans/serviceId: "squidex-{{ default .Chart.AppVersion .Values.image.tag }}"
+      orleans/clusterId: "squidex"
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -55,10 +59,32 @@ spec:
             - name: "EVENTSTORE__MONGODB__CONFIGURATION"
               value: {{ $mongoDefaultConnectionString | quote }}
           {{- end }}
+
           {{- if (not .Values.env.STORE__MONGODB__CONFIGURATION) }}
             - name: "STORE__MONGODB__CONFIGURATION"
               value: {{ $mongoDefaultConnectionString | quote }}
           {{- end }}
+
+            - name: ORLEANS_SERVICE_ID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['orleans/serviceId']
+            - name: ORLEANS_CLUSTER_ID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['orleans/clusterId']
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity:
diff --git a/packer/aws.pkr.hcl b/packer/aws.pkr.hcl
index 67a2e88ee..710f971b5 100644
--- a/packer/aws.pkr.hcl
+++ b/packer/aws.pkr.hcl
@@ -1,6 +1,6 @@
 variable "squidex_version" {
   type = string
-  default = "5.7.0"
+  default = "5.8.0"
 }
 
 source "amazon-ebs" "squidex" {
@@ -22,23 +22,7 @@ source "amazon-ebs" "squidex" {
   }
   ssh_username = "ubuntu"
   ami_regions = [
-    "eu-north-1",
-    "ap-south-1",
-    "eu-west-3",
-    "eu-west-2",
-    "eu-west-1",
-    "ap-northeast-3",
-    "ap-northeast-2",
-    "ap-northeast-1",
-    "sa-east-1",
-    "ca-central-1",
-    "ap-southeast-1",
-    "ap-southeast-2",
-    "eu-central-1",
     "us-east-1",
-    "us-east-2",
-    "us-west-1",
-    "us-west-2",
   ]
 }
 
@@ -59,4 +43,11 @@ build {
     playbook_file = "./ansible/playbook.yml"
     use_proxy = false
   }
+
+  provisioner "shell" {
+    inline = [
+      "rm /home/ubuntu/.ssh/authorized_keys",
+      "sudo rm /root/.ssh/authorized_keys",
+      ]
+  }
 }
\ No newline at end of file
diff --git a/packer/azure.pkr.hcl b/packer/azure.pkr.hcl
index eb7e3503e..9ac78cf24 100644
--- a/packer/azure.pkr.hcl
+++ b/packer/azure.pkr.hcl
@@ -1,6 +1,6 @@
 variable "squidex_version" {
   type = string
-  default = "5.7.0"
+  default = "5.8.0"
 }
 
 variable "subscription_id" {
diff --git a/packer/digitalocean.pkr.hcl b/packer/digitalocean.pkr.hcl
index 2301f514e..f356dc8ea 100644
--- a/packer/digitalocean.pkr.hcl
+++ b/packer/digitalocean.pkr.hcl
@@ -1,6 +1,6 @@
 variable "squidex_version" {
   type = string
-  default = "5.7.0"
+  default = "5.8.0"
 }
 
 source "digitalocean" "squidex" {
diff --git a/packer/gcp.pkr.hcl b/packer/gcp.pkr.hcl
index 104c0dae5..14db928de 100644
--- a/packer/gcp.pkr.hcl
+++ b/packer/gcp.pkr.hcl
@@ -1,6 +1,6 @@
 variable "squidex_version" {
   type = string
-  default = "5.7.0"
+  default = "5.8.0"
 }
 
 source "googlecompute" "squidex" {
diff --git a/packer/vultr.pkr.hcl b/packer/vultr.pkr.hcl
index a0a37bca5..c8db5a957 100644
--- a/packer/vultr.pkr.hcl
+++ b/packer/vultr.pkr.hcl
@@ -9,7 +9,7 @@ packer {
 
 variable "squidex_version" {
   type = string
-  default = "5.7.0"
+  default = "5.8.0"
 }
 
 variable "vultr_api_key" {