diff --git a/alertmanager-matrix/Chart.yaml b/alertmanager-matrix/Chart.yaml
index d7d2b36..f2a3e46 100644
--- a/alertmanager-matrix/Chart.yaml
+++ b/alertmanager-matrix/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: alertmanager-matrix
 description: Service for managing and receiving Alertmanager alerts on Matrix
 type: application
-version: 0.1.7
+version: 0.1.8
 # renovate: image=docker.io/silkeh/alertmanager_matrix
 appVersion: "0.4.3"
 maintainers:
diff --git a/alertmanager-matrix/README.adoc b/alertmanager-matrix/README.adoc
index 1f64a9f..91636ca 100644
--- a/alertmanager-matrix/README.adoc
+++ b/alertmanager-matrix/README.adoc
@@ -2,7 +2,7 @@
 
 = alertmanager-matrix
 
-image::https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square[Version: 0.1.7]
+image::https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square[Version: 0.1.8]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-0.4.3-informational?style=flat-square[AppVersion: 0.4.3]
 == Maintainers
@@ -280,7 +280,7 @@ helm uninstall alertmanager-matrix-release
 | logging.enabled
 | bool
 | `false`
-| Deploy Flow for [Logging-Operator](https://kube-logging.github.io/docs/)
+| Deploy Flow for logging-operator
 
 | logging.globalOutputRefs
 | list
diff --git a/alertmanager-matrix/ci/ct-empty-values.yaml b/alertmanager-matrix/ci/ct-empty-values.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/alertmanager-matrix/ci/ct-security-values.yaml b/alertmanager-matrix/ci/ct-security-values.yaml
new file mode 100644
index 0000000..b8b4c92
--- /dev/null
+++ b/alertmanager-matrix/ci/ct-security-values.yaml
@@ -0,0 +1,44 @@
+replicaCount: 1
+
+logging:
+  enabled: true
+  dedot: "-"
+  additionalFilters:
+    - grep:
+        exclude:
+          - key: "message"
+            pattern: '/^Sending message to /'
+
+bot:
+  matrix:
+    homeserver: "http://localhost:8008"
+    userID: "bot"
+    token: "SECRET_TOKEN"
+    rooms:
+      - "!not_existing:matrix.org"
+      - "!also_not_existing:matrix.org"
+  alertmanager: "http://localhost:9093"
+  showLabels: true
+
+serviceAccount:
+  create: true
+
+podSecurityContext:
+  fsGroup: 1000
+
+securityContext:
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+      - ALL
+  readOnlyRootFilesystem: true
+  runAsUser: 1000
+  runAsGroup: 1000
+
+resources:
+  requests:
+    memory: 128Mi
+    cpu: 100m
+  limits:
+    memory: 256Mi
+    cpu: 4
diff --git a/alertmanager-matrix/templates/_helpers.tpl b/alertmanager-matrix/templates/_helpers.tpl
index 9522fad..dbc7de8 100644
--- a/alertmanager-matrix/templates/_helpers.tpl
+++ b/alertmanager-matrix/templates/_helpers.tpl
@@ -62,7 +62,6 @@ app{{.Values.logging.dedot }}kubernetes{{.Values.logging.dedot }}io/instance: {{
 {{- end }}
 {{- end }}
 
-
 {{/*
 Create the name of the service account to use
 */}}
diff --git a/alertmanager-matrix/templates/deployment.yaml b/alertmanager-matrix/templates/deployment.yaml
index 7410292..e8e389e 100644
--- a/alertmanager-matrix/templates/deployment.yaml
+++ b/alertmanager-matrix/templates/deployment.yaml
@@ -68,6 +68,12 @@ spec:
             {{- end }}
             - name: ROOMS
               value: {{ .Values.bot.matrix.rooms | join "," | quote }}
+          readinessProbe:
+            tcpSocket:
+              port: http
+          livenessProbe:
+            tcpSocket:
+              port: http
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
diff --git a/alertmanager-matrix/values.yaml b/alertmanager-matrix/values.yaml
index e8bfe23..e3cb5b1 100644
--- a/alertmanager-matrix/values.yaml
+++ b/alertmanager-matrix/values.yaml
@@ -83,22 +83,6 @@ bot:
          <br/>
       {{- end -}}
 
-# Logging
-# This Helm chart could also deploy Flow for the logging-operator
-logging:
-  # -- Deploy Flow for [Logging-Operator](https://kube-logging.github.io/docs/)
-  enabled: false
-  # -- if an filter (here or global) for dedot is active - for disable set `null`
-  dedot:
-  # -- Add other filters to Flow
-  additionalFilters: []
-  # -- Flows localOutputRefs for use of Outputs
-  localOutputRefs: []
-  # -- Flows globalOutputRefs for use of ClusterOutputs
-  globalOutputRefs:
-    - "default"
-
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -166,3 +150,19 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# Logging
+# This HelmChart could also deploy Flow for the [Logging-Operator](https://kube-logging.github.io/docs/)
+# Configuration is optimzed for deliever to elasticsearch
+logging:
+  # -- Deploy Flow for logging-operator
+  enabled: false
+  # -- if an filter (here or global) for dedot is active - for disable set `null`
+  dedot:
+  # -- Add other filters to Flow
+  additionalFilters: []
+  # -- Flows localOutputRefs for use of Outputs
+  localOutputRefs: []
+  # -- Flows globalOutputRefs for use of ClusterOutputs
+  globalOutputRefs:
+    - "default"
diff --git a/ct.yaml b/ct.yaml
index f3f3954..abe9bc8 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -1,4 +1,4 @@
 target-branch: main
-since: HEAD~2
+since: HEAD~1
 chart-dirs:
   - .