diff --git a/charts/radix-oauth-guard/Chart.yaml b/charts/radix-oauth-guard/Chart.yaml
index 2061ab0..68297c2 100644
--- a/charts/radix-oauth-guard/Chart.yaml
+++ b/charts/radix-oauth-guard/Chart.yaml
@@ -1,6 +1,15 @@
-apiVersion: v1
-appVersion: 0.3.1
-version: 0.3.1
-description: Forward Auth to validate, authenticate and authorize JWT tokens
+apiVersion: v2
 name: radix-oauth-guard
 icon: https://radix.equinor.com/images/logos/logo.svg
+description: Forward Auth to validate, authenticate and authorize JWT tokens
+appVersion: 0.4.0
+version: 0.4.0
+kubeVersion: ">=1.24.0"
+keywords:
+  - radix
+home: radix.equinor.com
+sources:
+  - https://github.com/equinor/radix-cicd-canary
+maintainers:
+  - name: Omnia Radix
+    email: Radix@StatoilSRM.onmicrosoft.com
diff --git a/charts/radix-oauth-guard/templates/deployment.yaml b/charts/radix-oauth-guard/templates/deployment.yaml
index 253e6fe..c7f5a58 100644
--- a/charts/radix-oauth-guard/templates/deployment.yaml
+++ b/charts/radix-oauth-guard/templates/deployment.yaml
@@ -29,6 +29,18 @@ spec:
         fsGroup: 1000
         supplementalGroups:
           - 1000
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}      
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
diff --git a/charts/radix-oauth-guard/values.yaml b/charts/radix-oauth-guard/values.yaml
index 69b3996..8a6b033 100644
--- a/charts/radix-oauth-guard/values.yaml
+++ b/charts/radix-oauth-guard/values.yaml
@@ -29,3 +29,12 @@ resources:
   requests:
     cpu: 50m
     memory: 100Mi
+
+# Affinity for pod scheduling
+affinity: {}
+
+# Node selector for pod scheduling
+nodeSelector: {}
+
+# Tolerations for pod scheduling
+tolerations: []