diff --git a/wicked/README.md b/wicked/README.md
index 622752c0..49ede09f 100644
--- a/wicked/README.md
+++ b/wicked/README.md
@@ -110,7 +110,7 @@ Setting | Must Override | Default | Description
 `config.useCustomApiImage` | - | `false` | Set to `true` if you want to deploy your own derived `portal-api` image, e.g. if you have embedded the static configuration into this image to avoid using the (recommended) `git clone` method.
 `config.customApiImage` | - | `nil` | The (fully qualified) image name of your derived `portal-api` image. Take care that you have added `imagePullSecrets` (see `values.yaml`) if appropriate.
 `ingress.enabled` | - | `true` | Specify `false` to **not** deploy an ingress resource for routing the API Portal and Gateway to the corresponding services.
-`ingress.class` | - | `nginx` | The ingress class (`kubernetes.io/ingress.class`) to apply to the ingress resources.
+`ingress.class` | - | `nginx` | The ingress class (`ingressClassName`) to apply to the ingress resources.
 `ingress.apiHost` | **X** | `api.portal.com` | The (desired) FQDN of the API Gateway; this must point to the (load balancer of the) ingress controller selected via the ingress class, preferably before the deployment.
 `ingress.portalHost` | **X** | `portal.com` | The (desired) FQDN of the API Portal; this must point to the (load balancer of the) ingress controller selected via the ingress class, preferably before the deployment.
 `ingress.useKubeLego` | - | `false` | Set to `true` to add the necessary annotations for `kube-lego`; Note that this will **not** deploy `kube-lego` on your cluster, but merely use it if present (and usable in the desired namespace)
diff --git a/wicked/templates/ingress.yaml b/wicked/templates/ingress.yaml
index a34db8bc..76fdb3d6 100644
--- a/wicked/templates/ingress.yaml
+++ b/wicked/templates/ingress.yaml
@@ -1,12 +1,12 @@
 {{- if .Values.ingress.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "fullname" . }}-portal-ingress
   namespace: {{ default "default" .Values.namespace }}
   annotations:
-    kubernetes.io/ingress.class: {{ default "nginx" .Values.ingress.class }}
 {{- if .Values.ingress.useKubeLego }}
+    cert-manager.io/duration: 2160h
     kubernetes.io/tls-acme: "true"
 {{- end }}
   labels:
@@ -14,7 +14,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    external-dns-exclude: "false"
 spec:
+  ingressClassName: {{ default "nginx" .Values.ingress.class }}
   tls:
   - hosts:
     - {{ default "portal.com" .Values.ingress.portalHost }}
@@ -24,18 +26,21 @@ spec:
     http:
       paths:
       - path: /
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ template "fullname" . }}-portal
-          servicePort: 3000
+          service:
+            name: {{ template "fullname" . }}-portal
+            port:
+              number: 3000
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "fullname" . }}-gateway-ingress
   namespace: {{ default "default" .Values.namespace }}
   annotations:
-    kubernetes.io/ingress.class: {{ default "nginx" .Values.ingress.class }}
 {{- if .Values.ingress.useKubeLego }}
+    cert-manager.io/duration: 2160h
     kubernetes.io/tls-acme: "true"
 {{- end }}
   labels:
@@ -43,7 +48,9 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+    external-dns-exclude: "false"
 spec:
+  ingressClassName: {{ default "nginx" .Values.ingress.class }}
   tls:
   - hosts:
     - {{ default "api.portal.com" .Values.ingress.apiHost }}
@@ -53,7 +60,10 @@ spec:
     http:
       paths:
       - path: /
+        pathType: ImplementationSpecific
         backend:
-          serviceName: {{ template "fullname" . }}-kong
-          servicePort: 8000
+          service:
+            name: {{ template "fullname" . }}-kong
+            port:
+              number: 8000
 {{- end -}}
diff --git a/wicked/templates/kong-deployment.yaml b/wicked/templates/kong-deployment.yaml
index 5778a89b..4153796e 100644
--- a/wicked/templates/kong-deployment.yaml
+++ b/wicked/templates/kong-deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   # Kong is scaled up in the post-install hook.
   replicas: 1
@@ -22,6 +25,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-kong
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -78,6 +84,14 @@ spec:
             command:
               - kong
               - health
+        livenessProbe:
+          tcpSocket:
+            port: 8000
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+          periodSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
         ports:
         - name: "gateway"
           containerPort: 8000
@@ -93,8 +107,30 @@ spec:
           protocol: UDP
         resources:
 {{ toYaml .Values.kong.resources | indent 10 }}
+{{- if .Values.kong }}
+{{- if .Values.kong.securityContext }}
+        securityContext:
+{{ toYaml .Values.kong.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
\ No newline at end of file
diff --git a/wicked/templates/portal-api-deployment.yaml b/wicked/templates/portal-api-deployment.yaml
index 4eb3d338..15456f28 100644
--- a/wicked/templates/portal-api-deployment.yaml
+++ b/wicked/templates/portal-api-deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-api
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -184,6 +190,12 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.api | indent 10 }}
+{{- if .Values.api }}
+{{- if .Values.api.securityContext }}
+        securityContext:
+{{ toYaml .Values.api.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       volumes:
       - name: portal-api-data-dynamic
 {{- if not .Values.persistence.enabled }}
@@ -199,3 +211,19 @@ spec:
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
 {{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
\ No newline at end of file
diff --git a/wicked/templates/portal-auth-deployment.yaml b/wicked/templates/portal-auth-deployment.yaml
index c70cbb3f..8561c279 100644
--- a/wicked/templates/portal-auth-deployment.yaml
+++ b/wicked/templates/portal-auth-deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-auth
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         prometheus.io/scrape: 'true'
         prometheus.io/path: '/metrics'
@@ -72,8 +78,30 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.auth | indent 10 }}
+{{- if .Values.auth }}
+{{- if .Values.auth.securityContext }}
+        securityContext:
+{{ toYaml .Values.auth.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
 {{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
diff --git a/wicked/templates/portal-chatbot-deployment.yaml b/wicked/templates/portal-chatbot-deployment.yaml
index 7cc57b72..ca989fe6 100644
--- a/wicked/templates/portal-chatbot-deployment.yaml
+++ b/wicked/templates/portal-chatbot-deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -22,9 +25,28 @@ spec:
       labels:
         service: {{ template "fullname" . }}-chatbot
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
 {{- end }}
       initContainers:
       - name: {{ template "fullname" . }}-chatbot-init
@@ -69,6 +91,12 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.chatbot | indent 10 }}
+{{- if .Values.chatbot }}
+{{- if .Values.chatbot.securityContext }}
+        securityContext:
+{{ toYaml .Values.chatbot.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/wicked/templates/portal-deployment.yaml b/wicked/templates/portal-deployment.yaml
index e3b89845..fdd61733 100644
--- a/wicked/templates/portal-deployment.yaml
+++ b/wicked/templates/portal-deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-portal
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
@@ -68,7 +74,29 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.portal | indent 10 }}
+{{- if .Values.portal }}
+{{- if .Values.portal.securityContext }}
+        securityContext:
+{{ toYaml .Values.portal.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
\ No newline at end of file
diff --git a/wicked/templates/portal-kong-adapter-deployment.yaml b/wicked/templates/portal-kong-adapter-deployment.yaml
index 85937211..4869c3fa 100644
--- a/wicked/templates/portal-kong-adapter-deployment.yaml
+++ b/wicked/templates/portal-kong-adapter-deployment.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,6 +24,9 @@ spec:
       labels:
         service: {{ template "fullname" . }}-kong-adapter
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
@@ -74,8 +80,30 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.kongAdapter | indent 10 }}
+{{- if .Values.kongAdapter }}
+{{- if .Values.kongAdapter.securityContext }}
+        securityContext:
+{{ toYaml .Values.kongAdapter.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
 {{- end -}}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
\ No newline at end of file
diff --git a/wicked/templates/portal-mailer-deployment.yaml b/wicked/templates/portal-mailer-deployment.yaml
index 6a0b37df..1e73851b 100644
--- a/wicked/templates/portal-mailer-deployment.yaml
+++ b/wicked/templates/portal-mailer-deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -22,9 +25,28 @@ spec:
       labels:
         service: {{ template "fullname" . }}-mailer
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
 {{- end }}
       initContainers:
       - name: {{ template "fullname" . }}-mailer-init
@@ -69,6 +91,12 @@ spec:
           timeoutSeconds: 2
         resources:
 {{ toYaml .Values.resources.mailer | indent 10 }}
+{{- if .Values.mailer }}
+{{- if .Values.mailer.securityContext }}
+        securityContext:
+{{ toYaml .Values.mailer.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/wicked/templates/post-install-hook.yaml b/wicked/templates/post-install-hook.yaml
index 8460fecf..d58cb327 100644
--- a/wicked/templates/post-install-hook.yaml
+++ b/wicked/templates/post-install-hook.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     release: {{ template "fullname" . }}
-    chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded,hook-failed
@@ -17,6 +17,9 @@ spec:
       labels:
         release: {{ template "fullname" . }}
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       restartPolicy: "Never"
 {{- if .Values.useRbac }}
@@ -25,6 +28,8 @@ spec:
       containers:
       - name: {{ template "fullname" . }}-post-install
         image: "{{ .Values.image.repository }}k8s-tool:{{ default "latest" .Values.image.tag }}"
+        resources:
+{{ toYaml .Values.resources.postinstall | indent 10 }}
         volumeMounts:
         - name: {{ template "fullname" . }}-post-install-config
           mountPath: "/config"
@@ -33,4 +38,4 @@ spec:
       - name: {{ template "fullname" . }}-post-install-config
         configMap:
           name: {{ template "fullname" . }}-post-install-config
-          defaultMode: 0744
+          defaultMode: 0744
\ No newline at end of file
diff --git a/wicked/templates/postgres-deployment.yaml b/wicked/templates/postgres-deployment.yaml
index 851eb4af..13a2e5ba 100644
--- a/wicked/templates/postgres-deployment.yaml
+++ b/wicked/templates/postgres-deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -19,9 +22,28 @@ spec:
       labels:
         service: {{ template "fullname" . }}-kong-database
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
 {{- end }}
       containers:
       - env:
@@ -74,6 +96,12 @@ spec:
 {{- end }}
         resources:
 {{ toYaml .Values.postgres.resources | indent 10 }}
+{{- if .Values.postgres }}
+{{- if .Values.postgres.securityContext }}
+        securityContext:
+{{ toYaml .Values.postgres.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
       volumes:
       - name: kong-db-data
diff --git a/wicked/templates/redis-deployment.yaml b/wicked/templates/redis-deployment.yaml
index b3217011..906b7bcf 100644
--- a/wicked/templates/redis-deployment.yaml
+++ b/wicked/templates/redis-deployment.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ default "default" .Values.namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- with .Values.deployments.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -19,9 +22,28 @@ spec:
       labels:
         service: {{ template "fullname" . }}-redis
         wicked: "true"
+        {{- with .Values.deployments.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
 {{- if .Values.useRbac }}
       serviceAccountName: {{ template "fullname" . }}-role
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+{{- if .Values.securityContext }}
+      securityContext:
+{{ toYaml .Values.securityContext | indent 8 }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
 {{- end }}
       containers:
       - name: {{ template "fullname" . }}-redis
@@ -30,5 +52,29 @@ spec:
         - name: "redis"
           containerPort: 6379
           protocol: TCP
+        livenessProbe:
+          tcpSocket:
+            port: 6379
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+          periodSeconds: 5
+          failureThreshold: 5
+          successThreshold: 1
+        readinessProbe:
+          exec:
+            command:
+            - redis-cli
+            - ping
+          initialDelaySeconds: 20
+          timeoutSeconds: 5
+          periodSeconds: 3
+        resources:
+{{ toYaml .Values.redis.resources | indent 10 }}
+{{- if .Values.redis }}
+{{- if .Values.redis.securityContext }}
+        securityContext:
+{{ toYaml .Values.redis.securityContext | indent 10 }}
+{{- end }}
+{{- end }}
       restartPolicy: Always
 {{- end -}}
diff --git a/wicked/templates/wicked-role.yaml b/wicked/templates/wicked-role.yaml
index 27c0d4be..85d334ac 100644
--- a/wicked/templates/wicked-role.yaml
+++ b/wicked/templates/wicked-role.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ template "fullname" . }}-role
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ default "default" .Values.namespace }}
   name: {{ template "fullname" . }}-read-pods
@@ -16,7 +16,7 @@ rules:
   verbs: ["get", "watch", "list"]
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ default "default" .Values.namespace }}
   name: {{ template "fullname" . }}-read-pods
diff --git a/wicked/values.yaml b/wicked/values.yaml
index cc0661cb..cc71c104 100644
--- a/wicked/values.yaml
+++ b/wicked/values.yaml
@@ -36,7 +36,6 @@ redis:
   host: "redis.provider.com"
   port: "6379"
   password: "some_password"
-
   # Redis resources
   resources:
     requests:
@@ -55,7 +54,7 @@ image:
   # need to pull your company's version of wicked.
   repository: "haufelexware/wicked."
   # The docker image tag to use; usually you don't change this.
-  tag: "1.0.0-rc.14"
+  tag: "1.0.0-rc.14-4"
   pullPolicy: IfNotPresent
 
 # Add imagePullSecrets like this in an override.yaml to pass in with helm install
@@ -146,6 +145,18 @@ resources:
     requests:
       cpu: 10m
       memory: 128Mi
+  auth:
+    requests:
+      cpu: 50m
+      memory: 128Mi
+  postinstall:
+    requests:
+      cpu: 50m
+      memory: 128Mi
+
+deployments:
+  labels: 
+    app: apim-wicked-app
 
 # Ingress specification
 ingress: