diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml
index 450d7b0..ebb0e1f 100644
--- a/badhouseplants/helmfile.yaml
+++ b/badhouseplants/helmfile.yaml
@@ -107,6 +107,11 @@ releases:
     namespace: woodpecker-ci
     createNamespace: true
 
+  - <<: *openvpn-xor
+    installed: true
+    namespace: openvpn-service
+    createNamespace: false
+
 bases:
   - ../environments.yaml
   - ../repositories.yaml
diff --git a/badhouseplants/values/values.openvpn.yaml b/badhouseplants/values/values.openvpn-xor.yaml
similarity index 88%
rename from badhouseplants/values/values.openvpn.yaml
rename to badhouseplants/values/values.openvpn-xor.yaml
index 073bdfa..0f4c96c 100644
--- a/badhouseplants/values/values.openvpn.yaml
+++ b/badhouseplants/values/values.openvpn-xor.yaml
@@ -6,16 +6,14 @@
 istio:
   enabled: true
   istio:
-    - name: openvpn-tcp
+    - name: openvpn-tcp-xor
       gateway: istio-system/badhouseplants-vpn
       kind: tcp
       port_match: 1194
       hostname: "*"
-      service: openvpn
+      service: openvpn-xor
       port: 1194
 # ------------------------------------------
-image:
-  tag: v2.6.5-xor-4.0.0beta08
 storage:
   class: longhorn
   size: 512Mi
@@ -23,6 +21,7 @@ storage:
 openvpn:
   proto: tcp
   host: 195.201.250.50
+
 easyrsa:
   cn: Bad Houseplants
   country: Germany
diff --git a/badhouseplants/values/values.woodpecker-ci.yaml b/badhouseplants/values/values.woodpecker-ci.yaml
index 492d05c..ffd1564 100644
--- a/badhouseplants/values/values.woodpecker-ci.yaml
+++ b/badhouseplants/values/values.woodpecker-ci.yaml
@@ -35,14 +35,14 @@ server:
     WOODPECKER_ESCALATE: true
     WOODPECKER_BACKEND_K8S_NAMESPACE: woodpecker-ci
     WOODPECKER_BACKEND_K8S_STORAGE_CLASS: microk8s-hostpath
-  extraSecretNamesForEnvFrom: 
+  extraSecretNamesForEnvFrom:
     - woodpecker-postgres16-creds
 agent:
-  image: 
-    registry: git.badhouseplants.net
-    repository: allanger/woodpecker-agent
-    pullPolicy: Always
-    tag: dev
+  #image:
+  #  registry: git.badhouseplants.net
+  #  repository: allanger/woodpecker-agent
+  #  pullPolicy: Always
+  #  tag: dev
   enabled: true
   extraSecretNamesForEnvFrom: []
   env:
diff --git a/etersoft/helmfile.yaml b/etersoft/helmfile.yaml
index af38673..319da69 100644
--- a/etersoft/helmfile.yaml
+++ b/etersoft/helmfile.yaml
@@ -1,4 +1,9 @@
 ---
+releases:
+  - <<: *openvpn
+    installed: true
+    namespace: openvpn-service
+    createNamespace: false
 
 bases:
   - ../environments.yaml
diff --git a/helmfile.yaml b/helmfile.yaml
index 97375c2..06da863 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -36,11 +36,6 @@ releases:
     namespace: minio-service
     createNamespace: false
 
-  - <<: *openvpn
-    installed: true
-    namespace: openvpn-service
-    createNamespace: false
-  
   - <<: *metallb
     installed: true
     namespace: metallb-system
diff --git a/releases.yaml b/releases.yaml
index 0cca357..fe607c5 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -121,7 +121,7 @@ templates:
   argocd: &argocd
     name: argocd
     chart: argo/argo-cd
-    version: 5.51.6
+    version: 5.52.0
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -134,7 +134,7 @@ templates:
   prometheus: &prometheus
     name: prometheus
     chart: prometheus-community/kube-prometheus-stack
-    version: 55.3.1
+    version: 55.5.1
     inherit:
       - template: monitoring-common
       - template: default-env-values
@@ -145,7 +145,7 @@ templates:
   loki: &loki
     name: loki
     chart: grafana/loki
-    version: 5.41.1
+    version: 5.41.4
     inherit:
       - template: monitoring-common
       - template: default-env-values
@@ -198,10 +198,18 @@ templates:
   # ----------------------------
   # -- Applications
   # ----------------------------
+  openvpn-xor: &openvpn-xor
+    name: openvpn-xor
+    chart: allanger-gitea/openvpn-xor
+    version: 1.1.0
+    inherit:
+      - template: default-env-values
+      - template: ext-istio-resource
+
   openvpn: &openvpn
     name: openvpn
     chart: allanger-gitea/openvpn
-    version: 1.0.7
+    version: 1.0.8
     inherit:
       - template: default-env-values
       - template: ext-istio-resource
@@ -233,7 +241,7 @@ templates:
   woodpecker-ci: &woodpecker-ci
     name: woodpecker-ci
     chart: woodpecker/woodpecker
-    version: 1.0.1
+    version: 1.0.3
     inherit:
       - template: ext-database
       - template: default-env-values
@@ -243,7 +251,7 @@ templates:
   nrodionov: &nrodionov
     name: nrodionov
     chart: bitnami/wordpress
-    version: 18.1.24
+    version: 19.0.4
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -262,7 +270,7 @@ templates:
   minecraft: &minecraft
     name: minecraft
     chart: minecraft-server-charts/minecraft
-    version: 4.12.0
+    version: 4.14.0
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -271,7 +279,7 @@ templates:
   gitea: &gitea
     name: gitea
     chart: gitea/gitea
-    version: 9.6.1
+    version: 10.0.2
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -300,7 +308,7 @@ templates:
   redis: &redis
     name: redis
     chart: bitnami/redis
-    version: 18.5.0
+    version: 18.6.1
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -308,7 +316,7 @@ templates:
   postgres16: &postgres16
     name: postgres16
     chart: bitnami/postgresql
-    version: 13.2.24
+    version: 13.2.27
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -316,12 +324,12 @@ templates:
   db-operator: &db-operator
     name: db-operator
     chart: db-operator/db-operator
-    version: 1.14.1
+    version: 1.16.0
 
   db-instances: &db-instances
     name: db-instances
     chart: db-operator/db-instances
-    version: 2.1.1
+    version: 2.2.0
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -329,7 +337,7 @@ templates:
   mysql: &mysql
     name: mysql
     chart: bitnami/mysql
-    version: 9.14.4
+    version: 9.16.1
     inherit:
       - template: default-env-values
       - template: default-env-secrets