diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml
index 76ea2d5..8216466 100644
--- a/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml
+++ b/apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud-metrics
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: metrics
@@ -40,8 +40,9 @@ spec:
             secretKeyRef:
               name: nextcloud
               key: nextcloud-password
+        # NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
         - name: NEXTCLOUD_SERVER
-          value: http://nextcloud.kube.home
+          value: http://nextcloud:80
         - name: NEXTCLOUD_TIMEOUT
           value: 5s
         - name: NEXTCLOUD_TLS_SKIP_VERIFY
diff --git a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
index e251923..b928716 100644
--- a/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
+++ b/apps/nextcloud/apps_v1_Deployment_nextcloud.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: app
diff --git a/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml b/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml
index 2242036..0e6c660 100644
--- a/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml
+++ b/apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: app
diff --git a/apps/nextcloud/index.yaml b/apps/nextcloud/index.yaml
index b8b77d2..413343f 100644
--- a/apps/nextcloud/index.yaml
+++ b/apps/nextcloud/index.yaml
@@ -6,10 +6,10 @@ metadata:
   name: nextcloud
   description: null
 options:
-  domain-name:
-    default: your_company.com
+  domain:
+    default: your-company
     examples:
-    - your_company.com
+    - your-company
     type: string
   backups:
     default:
@@ -117,93 +117,11 @@ options:
         default: false
         type: boolean
     type: object
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
-    examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-    type: object
   openid-name:
     default: vynil
     examples:
     - vynil
     type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  redis:
-    default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    properties:
-      exporter:
-        default:
-          enabled: true
-          image: quay.io/opstree/redis-exporter:v1.44.0
-        properties:
-          enabled:
-            default: true
-            type: boolean
-          image:
-            default: quay.io/opstree/redis-exporter:v1.44.0
-            type: string
-        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.5
-        type: string
-      storage:
-        default: 2Gi
-        type: string
-    type: object
-  postgres:
-    default:
-      replicas: 1
-      storage: 5Gi
-      version: '14'
-    examples:
-    - replicas: 1
-      storage: 5Gi
-      version: '14'
-    properties:
-      replicas:
-        default: 1
-        type: integer
-      storage:
-        default: 5Gi
-        type: string
-      version:
-        default: '14'
-        type: string
-    type: object
   apps:
     default:
       audioplayer: false
@@ -294,6 +212,73 @@ options:
         default: true
         type: boolean
     type: object
+  redis:
+    default:
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    examples:
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    properties:
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
+        type: string
+    type: object
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+    type: object
+  admin:
+    default:
+      name: nextcloud_admin
+    examples:
+    - name: nextcloud_admin
+    properties:
+      name:
+        default: nextcloud_admin
+        type: string
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   images:
     default:
       collabora:
@@ -457,15 +442,35 @@ options:
             type: string
         type: object
     type: object
-  sub-domain:
-    default: files
+  postgres:
+    default:
+      replicas: 1
+      storage: 5Gi
+      version: '14'
     examples:
-    - files
+    - replicas: 1
+      storage: 5Gi
+      version: '14'
+    properties:
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 5Gi
+        type: string
+      version:
+        default: '14'
+        type: string
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
     type: string
-  issuer:
-    default: letsencrypt-prod
+  ingress-class:
+    default: traefik
     examples:
-    - letsencrypt-prod
+    - traefik
     type: string
   hpa:
     default:
@@ -487,16 +492,11 @@ options:
         default: 1
         type: integer
     type: object
-  admin:
-    default:
-      name: nextcloud_admin
+  sub-domain:
+    default: files
     examples:
-    - name: nextcloud_admin
-    properties:
-      name:
-        default: nextcloud_admin
-        type: string
-    type: object
+    - files
+    type: string
 dependencies:
 - dist: null
   category: share
diff --git a/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml b/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml
index f3ff5a1..a5ed6a6 100644
--- a/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml
+++ b/apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: "vynil-cloud"
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: metrics
diff --git a/apps/nextcloud/oauth2.tf b/apps/nextcloud/oauth2.tf
index 81ed2fb..d107ed2 100644
--- a/apps/nextcloud/oauth2.tf
+++ b/apps/nextcloud/oauth2.tf
@@ -22,6 +22,10 @@ data "kubernetes_secret_v1" "oauth2-client-id" {
   }
 }
 
+data "authentik_certificate_key_pair" "ca" {
+  name = "authentik Self-signed Certificate"
+}
+
 data "authentik_scope_mapping" "oauth2" {
   managed_list = [
     "goauthentik.io/providers/oauth2/scope-email",
@@ -43,6 +47,7 @@ resource "authentik_provider_oauth2" "oauth2" {
   authorization_flow  = data.authentik_flow.default-authorization-flow.id
   client_type         = "confidential"
   sub_mode            = "user_username"
+  signing_key         = data.authentik_certificate_key_pair.ca.id
   property_mappings   = data.authentik_scope_mapping.oauth2.ids
   redirect_uris       = [
     "https://${local.dns-name}/apps/user_oidc/code"
diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
index 55bc47a..14d0ea0 100644
--- a/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
+++ b/apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud-config
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
 data:
diff --git a/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml b/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml
index fdf5f34..f48f77b 100644
--- a/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml
+++ b/apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud-nginxconfig
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
 data:
@@ -13,7 +13,7 @@ data:
     worker_processes auto;
 
     error_log  /var/log/nginx/error.log warn;
-    pid        /var/run/nginx.pid;
+    pid        /tmp/nginx.pid;
 
 
     events {
diff --git a/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml b/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml
index 227f301..4a86645 100644
--- a/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml
+++ b/apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud-nextcloud
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: app
diff --git a/apps/nextcloud/v1_Service_nextcloud-metrics.yaml b/apps/nextcloud/v1_Service_nextcloud-metrics.yaml
index 3ae89f8..590bb6b 100644
--- a/apps/nextcloud/v1_Service_nextcloud-metrics.yaml
+++ b/apps/nextcloud/v1_Service_nextcloud-metrics.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud-metrics
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: metrics
diff --git a/apps/nextcloud/v1_Service_nextcloud.yaml b/apps/nextcloud/v1_Service_nextcloud.yaml
index 5b16625..5ed037b 100644
--- a/apps/nextcloud/v1_Service_nextcloud.yaml
+++ b/apps/nextcloud/v1_Service_nextcloud.yaml
@@ -5,7 +5,7 @@ metadata:
   name: nextcloud
   labels:
     app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.1.0
+    helm.sh/chart: nextcloud-4.3.1
     app.kubernetes.io/instance: nextcloud
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: app