diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index c464490e..e29c5bbc 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -72,21 +72,21 @@ jobs:
 
           # test the helm chart with postgresql subchart enabled
           - name: PostgreSQL Enabled
-            helm_args: '--helm-extra-set-args "--set=postgresql.enabled=true --set=postgresql.global.postgresql.auth.password=testing123456 --set=internalDatabase.enabled=false --set=externalDatabase.enabled=True --set=externalDatabase.type=postgresql --set=externalDatabase.password=testing12345"'
+            helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/postgresql.yaml"'
 
           # test the helm chart with nginx container enabled
           - name: Nginx Enabled
-            helm_args: '--helm-extra-set-args "--set=image.flavor=fpm --set=nginx.enabled=true"'
+            helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/nginx.yaml"'
 
           # test the helm chart with horizontal pod autoscaling enabled
           - name: Horizontal Pod Autoscaling Enabled
-            helm_args: '--helm-extra-set-args "--set=hpa.enabled=true --set=hpa.minPods=2 --set=hpa.maxPods=3 --set=hpa.targetCPUUtilizationPercentage=75"'
+            helm_args: '--helm-extra-set-args "--values charts/nextcloud/test-values/hpa.yaml"'
 
           # test the helm chart with s3 as the primary storage
           - name: S3 Enabled as Primary Storage
             # we need to skip the clean up so we can test adding a file
             helm_args: |
-                --namespace nextcloud --skip-clean-up --helm-extra-set-args "--set=fullnameOverride=nextcloud --set=nextcloud.objectStore.s3.enabled=true --set=nextcloud.objectStore.s3.accessKey=nextcloud --set=nextcloud.objectStore.s3.secretKey=rootpass123 --set=nextcloud.objectStore.s3.host=minio.nextcloud.svc.cluster.local --set=nextcloud.objectStore.s3.port=9000 --set=nextcloud.objectStore.s3.ssl=false --set=nextcloud.objectStore.s3.bucket=nextcloud --set=nextcloud.objectStore.s3.usePathStyle=true --set=image.flavor=fpm --set=nginx.enabled=true --set=nextcloud.host=nextcloud --set=nextcloud.trustedDomains[0]='*'"
+                --namespace nextcloud --skip-clean-up --helm-extra-set-args "--values charts/nextcloud/test-values/s3-as-primary-storage.yaml"
 
     steps:
       - name: Checkout
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 6edf7833..e3e5534a 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 6.2.3
+version: 6.2.4
 appVersion: 30.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/test-values/hpa.yaml b/charts/nextcloud/test-values/hpa.yaml
new file mode 100644
index 00000000..eb7e39e1
--- /dev/null
+++ b/charts/nextcloud/test-values/hpa.yaml
@@ -0,0 +1,5 @@
+hpa:
+  enabled: true
+  minPods: 2
+  maxPods: 3
+  targetCPUUtilizationPercentage: 75
diff --git a/charts/nextcloud/test-values/nginx.yaml b/charts/nextcloud/test-values/nginx.yaml
new file mode 100644
index 00000000..82ff4b84
--- /dev/null
+++ b/charts/nextcloud/test-values/nginx.yaml
@@ -0,0 +1,5 @@
+image:
+  flavor: fpm
+
+nginx:
+  enabled: true
diff --git a/charts/nextcloud/test-values/postgresql.yaml b/charts/nextcloud/test-values/postgresql.yaml
new file mode 100644
index 00000000..4b4600e7
--- /dev/null
+++ b/charts/nextcloud/test-values/postgresql.yaml
@@ -0,0 +1,14 @@
+postgresql:
+  enabled: true
+  global:
+    postgresql:
+      auth:
+        password: "testing123456"
+
+internalDatabase:
+  enabled: false
+
+externalDatabase:
+  enabled: true
+  type: postgresql
+  password: "testing123456"
diff --git a/charts/nextcloud/test-values/s3-as-primary-storage.yaml b/charts/nextcloud/test-values/s3-as-primary-storage.yaml
new file mode 100644
index 00000000..d6efd878
--- /dev/null
+++ b/charts/nextcloud/test-values/s3-as-primary-storage.yaml
@@ -0,0 +1,22 @@
+fullnameOverride: nextcloud
+
+image:
+  flavor: fpm
+
+nginx:
+  enabled: true
+
+nextcloud:
+  host: nextcloud
+  trustedDomains:
+    - '*'
+  objectStore:
+    s3:
+      enabled: true
+      accessKey: nextcloud
+      secretKey: rootpass123
+      host: minio.nextcloud.svc.cluster.local
+      port: 9000
+      ssl: false
+      bucket: nextcloud
+      usePathStyle: true