diff --git a/apps/arr/cm-common-env.yaml b/apps/arr/cm-common-env.yaml
new file mode 100644
index 0000000..bb365a2
--- /dev/null
+++ b/apps/arr/cm-common-env.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: common-env
+  namespace: arr
+data:
+  PUID: "1000"
+  PGID: "1000"
+  TZ: "Europe/Oslo"
diff --git a/apps/arr/common-values.yaml b/apps/arr/common-values.yaml
index ca937f0..b406e02 100644
--- a/apps/arr/common-values.yaml
+++ b/apps/arr/common-values.yaml
@@ -1,11 +1,20 @@
 namespace: arr
 env:
   - name: PUID
-    value: "1000"
+    valueFrom:
+      configMapKeyRef:
+        name: common-env
+        key: PUID
   - name: PGID
-    value: "1000"
+    valueFrom:
+      configMapKeyRef:
+        name: common-env
+        key: PGID
   - name: TZ
-    value: Europe/Oslo
+    valueFrom:
+      configMapKeyRef:
+        name: common-env
+        key: TZ
 additionalVolumes:
   - name: data
     mountPath: /app/data
diff --git a/apps/arr/kustomization.yaml b/apps/arr/kustomization.yaml
index e80a89d..78a1438 100644
--- a/apps/arr/kustomization.yaml
+++ b/apps/arr/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - cm-common-env.yaml
   - ingress.yaml
   - traefik-forward-auth
   - torrent