diff --git a/charts/collabora/1.0.0/charts/common-2112.0.0.tgz b/charts/collabora/1.0.0/charts/common-2112.0.0.tgz
deleted file mode 100644
index 62591a2a38..0000000000
Binary files a/charts/collabora/1.0.0/charts/common-2112.0.0.tgz and /dev/null differ
diff --git a/charts/collabora/1.0.0/.helmignore b/charts/collabora/1.1.0/.helmignore
similarity index 100%
rename from charts/collabora/1.0.0/.helmignore
rename to charts/collabora/1.1.0/.helmignore
diff --git a/charts/collabora/1.0.0/Chart.yaml b/charts/collabora/1.1.0/Chart.yaml
similarity index 97%
rename from charts/collabora/1.0.0/Chart.yaml
rename to charts/collabora/1.1.0/Chart.yaml
index cde9ab11e8..3e88f1bf93 100644
--- a/charts/collabora/1.0.0/Chart.yaml
+++ b/charts/collabora/1.1.0/Chart.yaml
@@ -15,4 +15,4 @@ name: collabora
 sources:
 - https://github.com/CollaboraOnline/online.git
 - https://hub.docker.com/r/collabora/code
-version: 1.0.0
+version: 1.1.0
diff --git a/charts/collabora/1.0.0/README.md b/charts/collabora/1.1.0/README.md
similarity index 100%
rename from charts/collabora/1.0.0/README.md
rename to charts/collabora/1.1.0/README.md
diff --git a/charts/collabora/1.0.0/app-readme.md b/charts/collabora/1.1.0/app-readme.md
similarity index 100%
rename from charts/collabora/1.0.0/app-readme.md
rename to charts/collabora/1.1.0/app-readme.md
diff --git a/charts/ipfs/1.1.6/charts/common-2112.0.0.tgz b/charts/collabora/1.1.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from charts/ipfs/1.1.6/charts/common-2112.0.0.tgz
rename to charts/collabora/1.1.0/charts/common-2112.0.0.tgz
diff --git a/charts/collabora/1.0.0/ix_values.yaml b/charts/collabora/1.1.0/ix_values.yaml
similarity index 100%
rename from charts/collabora/1.0.0/ix_values.yaml
rename to charts/collabora/1.1.0/ix_values.yaml
diff --git a/charts/collabora/1.0.0/questions.yaml b/charts/collabora/1.1.0/questions.yaml
similarity index 100%
rename from charts/collabora/1.0.0/questions.yaml
rename to charts/collabora/1.1.0/questions.yaml
diff --git a/test/collabora/1.0.0/requirements.lock b/charts/collabora/1.1.0/requirements.lock
similarity index 100%
rename from test/collabora/1.0.0/requirements.lock
rename to charts/collabora/1.1.0/requirements.lock
diff --git a/charts/collabora/1.0.0/templates/_helpers.tpl b/charts/collabora/1.1.0/templates/_helpers.tpl
similarity index 100%
rename from charts/collabora/1.0.0/templates/_helpers.tpl
rename to charts/collabora/1.1.0/templates/_helpers.tpl
diff --git a/charts/collabora/1.0.0/templates/deployment.yaml b/charts/collabora/1.1.0/templates/deployment.yaml
similarity index 100%
rename from charts/collabora/1.0.0/templates/deployment.yaml
rename to charts/collabora/1.1.0/templates/deployment.yaml
diff --git a/charts/collabora/1.0.0/templates/nginx-conf.yaml b/charts/collabora/1.1.0/templates/nginx-conf.yaml
similarity index 100%
rename from charts/collabora/1.0.0/templates/nginx-conf.yaml
rename to charts/collabora/1.1.0/templates/nginx-conf.yaml
diff --git a/charts/collabora/1.0.0/templates/nginx-service.yaml b/charts/collabora/1.1.0/templates/nginx-service.yaml
similarity index 100%
rename from charts/collabora/1.0.0/templates/nginx-service.yaml
rename to charts/collabora/1.1.0/templates/nginx-service.yaml
diff --git a/charts/collabora/1.0.0/templates/secrets.yaml b/charts/collabora/1.1.0/templates/secrets.yaml
similarity index 100%
rename from charts/collabora/1.0.0/templates/secrets.yaml
rename to charts/collabora/1.1.0/templates/secrets.yaml
diff --git a/charts/collabora/1.1.0/templates/tests/deployment-check.yaml b/charts/collabora/1.1.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..c8fb506367
--- /dev/null
+++ b/charts/collabora/1.1.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-collabora-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ks https://{{ $serviceName }}/loleaflet/dist/admin/admin.html
+    restartPolicy: Never
diff --git a/charts/collabora/1.0.0/test_values.yaml b/charts/collabora/1.1.0/test_values.yaml
similarity index 100%
rename from charts/collabora/1.0.0/test_values.yaml
rename to charts/collabora/1.1.0/test_values.yaml
diff --git a/charts/ipfs/1.1.6/default_values.yaml b/charts/ipfs/1.1.6/default_values.yaml
deleted file mode 100644
index 407c7a3732..0000000000
--- a/charts/ipfs/1.1.6/default_values.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: ipfs/go-ipfs
-  tag: v0.8.0-rc1
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to ipfs binary
-extraArgs: []
-
-updateStrategy: Recreate
-
-service:
-  swarmPort: 9401
-  apiPort: 9501
-  gatewayPort: 9080
-
-environment:
-
-appVolumeMounts:
-  staging:
-    emptyDir: true
-    mountPath: "/export"
-  data:
-    emptyDir: true
-    mountPath: "/data/ipfs"
-
diff --git a/charts/ipfs/1.1.6/values.yaml b/charts/ipfs/1.1.6/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/charts/ipfs/1.1.6/.helmignore b/charts/ipfs/1.2.0/.helmignore
similarity index 100%
rename from charts/ipfs/1.1.6/.helmignore
rename to charts/ipfs/1.2.0/.helmignore
diff --git a/test/ipfs/1.1.6/Chart.yaml b/charts/ipfs/1.2.0/Chart.yaml
similarity index 96%
rename from test/ipfs/1.1.6/Chart.yaml
rename to charts/ipfs/1.2.0/Chart.yaml
index 16841e1b9f..b133e6b6ce 100644
--- a/test/ipfs/1.1.6/Chart.yaml
+++ b/charts/ipfs/1.2.0/Chart.yaml
@@ -15,4 +15,4 @@ sources:
 - https://github.com/ipfs/go-ipfs
 - https://hub.docker.com/r/ipfs/go-ipfs
 upstream_version: 0.8.0-rc1
-version: 1.1.6
+version: 1.2.0
diff --git a/charts/ipfs/1.1.6/README.md b/charts/ipfs/1.2.0/README.md
similarity index 100%
rename from charts/ipfs/1.1.6/README.md
rename to charts/ipfs/1.2.0/README.md
diff --git a/charts/ipfs/1.1.6/app-readme.md b/charts/ipfs/1.2.0/app-readme.md
similarity index 100%
rename from charts/ipfs/1.1.6/app-readme.md
rename to charts/ipfs/1.2.0/app-readme.md
diff --git a/charts/minio/1.5.10/charts/common-2112.0.0.tgz b/charts/ipfs/1.2.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from charts/minio/1.5.10/charts/common-2112.0.0.tgz
rename to charts/ipfs/1.2.0/charts/common-2112.0.0.tgz
diff --git a/charts/ipfs/1.1.6/ix_values.yaml b/charts/ipfs/1.2.0/ix_values.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/ix_values.yaml
rename to charts/ipfs/1.2.0/ix_values.yaml
diff --git a/charts/ipfs/1.1.6/questions.yaml b/charts/ipfs/1.2.0/questions.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/questions.yaml
rename to charts/ipfs/1.2.0/questions.yaml
diff --git a/charts/ipfs/1.1.6/requirements.lock b/charts/ipfs/1.2.0/requirements.lock
similarity index 100%
rename from charts/ipfs/1.1.6/requirements.lock
rename to charts/ipfs/1.2.0/requirements.lock
diff --git a/charts/ipfs/1.1.6/templates/NOTES.txt b/charts/ipfs/1.2.0/templates/NOTES.txt
similarity index 100%
rename from charts/ipfs/1.1.6/templates/NOTES.txt
rename to charts/ipfs/1.2.0/templates/NOTES.txt
diff --git a/charts/ipfs/1.1.6/templates/deployment.yaml b/charts/ipfs/1.2.0/templates/deployment.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/templates/deployment.yaml
rename to charts/ipfs/1.2.0/templates/deployment.yaml
diff --git a/charts/ipfs/1.1.6/templates/service.yaml b/charts/ipfs/1.2.0/templates/service.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/templates/service.yaml
rename to charts/ipfs/1.2.0/templates/service.yaml
diff --git a/charts/ipfs/1.1.6/templates/serviceaccount.yaml b/charts/ipfs/1.2.0/templates/serviceaccount.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/templates/serviceaccount.yaml
rename to charts/ipfs/1.2.0/templates/serviceaccount.yaml
diff --git a/charts/ipfs/1.2.0/templates/tests/deployment-check.yaml b/charts/ipfs/1.2.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..d68ce8e043
--- /dev/null
+++ b/charts/ipfs/1.2.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-ipfs-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.apiPort }}/webui/
+    restartPolicy: Never
diff --git a/charts/ipfs/1.1.6/test_values.yaml b/charts/ipfs/1.2.0/test_values.yaml
similarity index 100%
rename from charts/ipfs/1.1.6/test_values.yaml
rename to charts/ipfs/1.2.0/test_values.yaml
diff --git a/charts/minio/1.5.10/default_values.yaml b/charts/minio/1.5.10/default_values.yaml
deleted file mode 100644
index 7afa31dc0d..0000000000
--- a/charts/minio/1.5.10/default_values.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to minio binary
-extraArgs: []
-
-updateStrategy: RollingUpdate
-
-service:
-  nodePort: 9000
-
-environment:
-  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
-
-appVolumeMounts:
-  export:
-    emptyDir: true
-    mountPath: "/export"
diff --git a/charts/minio/1.5.10/values.yaml b/charts/minio/1.5.10/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/charts/minio/1.5.10/.helmignore b/charts/minio/1.6.0/.helmignore
similarity index 100%
rename from charts/minio/1.5.10/.helmignore
rename to charts/minio/1.6.0/.helmignore
diff --git a/charts/minio/1.5.10/CHANGELOG.md b/charts/minio/1.6.0/CHANGELOG.md
similarity index 100%
rename from charts/minio/1.5.10/CHANGELOG.md
rename to charts/minio/1.6.0/CHANGELOG.md
diff --git a/charts/minio/1.5.10/Chart.yaml b/charts/minio/1.6.0/Chart.yaml
similarity index 91%
rename from charts/minio/1.5.10/Chart.yaml
rename to charts/minio/1.6.0/Chart.yaml
index fbb5b50537..3f65c2bbe6 100644
--- a/charts/minio/1.5.10/Chart.yaml
+++ b/charts/minio/1.6.0/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: '2022-03-22'
+appVersion: '2022-03-17'
 dependencies:
 - name: common
   repository: file://../../../library/common/2112.0.0
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.5.10
+version: 1.6.0
diff --git a/charts/minio/1.5.10/README.md b/charts/minio/1.6.0/README.md
similarity index 100%
rename from charts/minio/1.5.10/README.md
rename to charts/minio/1.6.0/README.md
diff --git a/charts/minio/1.5.10/app-readme.md b/charts/minio/1.6.0/app-readme.md
similarity index 100%
rename from charts/minio/1.5.10/app-readme.md
rename to charts/minio/1.6.0/app-readme.md
diff --git a/charts/nextcloud/1.3.13/charts/common-2112.0.0.tgz b/charts/minio/1.6.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from charts/nextcloud/1.3.13/charts/common-2112.0.0.tgz
rename to charts/minio/1.6.0/charts/common-2112.0.0.tgz
diff --git a/charts/minio/1.5.10/ix_values.yaml b/charts/minio/1.6.0/ix_values.yaml
similarity index 71%
rename from charts/minio/1.5.10/ix_values.yaml
rename to charts/minio/1.6.0/ix_values.yaml
index 0d1a9f2918..28263c7744 100644
--- a/charts/minio/1.5.10/ix_values.yaml
+++ b/charts/minio/1.6.0/ix_values.yaml
@@ -1,6 +1,6 @@
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 runAsGroup: 473
 runAsUser: 473
diff --git a/charts/minio/1.5.10/migrations/migrate b/charts/minio/1.6.0/migrations/migrate
similarity index 100%
rename from charts/minio/1.5.10/migrations/migrate
rename to charts/minio/1.6.0/migrations/migrate
diff --git a/charts/minio/1.5.10/migrations/migrate_from_1.0.0 b/charts/minio/1.6.0/migrations/migrate_from_1.0.0
similarity index 100%
rename from charts/minio/1.5.10/migrations/migrate_from_1.0.0
rename to charts/minio/1.6.0/migrations/migrate_from_1.0.0
diff --git a/charts/minio/1.5.10/questions.yaml b/charts/minio/1.6.0/questions.yaml
similarity index 100%
rename from charts/minio/1.5.10/questions.yaml
rename to charts/minio/1.6.0/questions.yaml
diff --git a/charts/minio/1.5.10/requirements.lock b/charts/minio/1.6.0/requirements.lock
similarity index 100%
rename from charts/minio/1.5.10/requirements.lock
rename to charts/minio/1.6.0/requirements.lock
diff --git a/charts/minio/1.5.10/templates/NOTES.txt b/charts/minio/1.6.0/templates/NOTES.txt
similarity index 100%
rename from charts/minio/1.5.10/templates/NOTES.txt
rename to charts/minio/1.6.0/templates/NOTES.txt
diff --git a/charts/minio/1.5.10/templates/_cert.tpl b/charts/minio/1.6.0/templates/_cert.tpl
similarity index 100%
rename from charts/minio/1.5.10/templates/_cert.tpl
rename to charts/minio/1.6.0/templates/_cert.tpl
diff --git a/charts/minio/1.5.10/templates/_helpers.tpl b/charts/minio/1.6.0/templates/_helpers.tpl
similarity index 100%
rename from charts/minio/1.5.10/templates/_helpers.tpl
rename to charts/minio/1.6.0/templates/_helpers.tpl
diff --git a/charts/minio/1.5.10/templates/configmap.yaml b/charts/minio/1.6.0/templates/configmap.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/configmap.yaml
rename to charts/minio/1.6.0/templates/configmap.yaml
diff --git a/charts/minio/1.5.10/templates/deployment.yaml b/charts/minio/1.6.0/templates/deployment.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/deployment.yaml
rename to charts/minio/1.6.0/templates/deployment.yaml
diff --git a/charts/minio/1.5.10/templates/pre-install-job.yaml b/charts/minio/1.6.0/templates/pre-install-job.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/pre-install-job.yaml
rename to charts/minio/1.6.0/templates/pre-install-job.yaml
diff --git a/charts/minio/1.5.10/templates/secrets.yaml b/charts/minio/1.6.0/templates/secrets.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/secrets.yaml
rename to charts/minio/1.6.0/templates/secrets.yaml
diff --git a/charts/minio/1.5.10/templates/service.yaml b/charts/minio/1.6.0/templates/service.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/service.yaml
rename to charts/minio/1.6.0/templates/service.yaml
diff --git a/charts/minio/1.5.10/templates/serviceaccount.yaml b/charts/minio/1.6.0/templates/serviceaccount.yaml
similarity index 100%
rename from charts/minio/1.5.10/templates/serviceaccount.yaml
rename to charts/minio/1.6.0/templates/serviceaccount.yaml
diff --git a/charts/minio/1.6.0/templates/tests/deployment-check.yaml b/charts/minio/1.6.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..af842d4690
--- /dev/null
+++ b/charts/minio/1.6.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-minio-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.consolePort }}/
+    restartPolicy: Never
diff --git a/charts/minio/1.5.10/test_values.yaml b/charts/minio/1.6.0/test_values.yaml
similarity index 91%
rename from charts/minio/1.5.10/test_values.yaml
rename to charts/minio/1.6.0/test_values.yaml
index fd74db0858..a4ff45fa6b 100644
--- a/charts/minio/1.5.10/test_values.yaml
+++ b/charts/minio/1.6.0/test_values.yaml
@@ -13,7 +13,7 @@ extraArgs: []
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 minioDomain: null
 runAsGroup: 473
 runAsUser: 473
diff --git a/charts/nextcloud/1.3.13/.helmignore b/charts/nextcloud/1.4.0/.helmignore
similarity index 100%
rename from charts/nextcloud/1.3.13/.helmignore
rename to charts/nextcloud/1.4.0/.helmignore
diff --git a/charts/nextcloud/1.3.13/Chart.lock b/charts/nextcloud/1.4.0/Chart.lock
similarity index 100%
rename from charts/nextcloud/1.3.13/Chart.lock
rename to charts/nextcloud/1.4.0/Chart.lock
diff --git a/test/nextcloud/1.3.13/Chart.yaml b/charts/nextcloud/1.4.0/Chart.yaml
similarity index 97%
rename from test/nextcloud/1.3.13/Chart.yaml
rename to charts/nextcloud/1.4.0/Chart.yaml
index c1bfa99d10..b472a894ed 100644
--- a/test/nextcloud/1.3.13/Chart.yaml
+++ b/charts/nextcloud/1.4.0/Chart.yaml
@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.3.13
+version: 1.4.0
diff --git a/charts/nextcloud/1.3.13/README.md b/charts/nextcloud/1.4.0/README.md
similarity index 100%
rename from charts/nextcloud/1.3.13/README.md
rename to charts/nextcloud/1.4.0/README.md
diff --git a/charts/nextcloud/1.3.13/app-readme.md b/charts/nextcloud/1.4.0/app-readme.md
similarity index 100%
rename from charts/nextcloud/1.3.13/app-readme.md
rename to charts/nextcloud/1.4.0/app-readme.md
diff --git a/charts/plex/1.6.25/charts/common-2112.0.0.tgz b/charts/nextcloud/1.4.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from charts/plex/1.6.25/charts/common-2112.0.0.tgz
rename to charts/nextcloud/1.4.0/charts/common-2112.0.0.tgz
diff --git a/charts/nextcloud/1.3.13/ix_values.yaml b/charts/nextcloud/1.4.0/ix_values.yaml
similarity index 84%
rename from charts/nextcloud/1.3.13/ix_values.yaml
rename to charts/nextcloud/1.4.0/ix_values.yaml
index 6d119de053..fc08a59c3e 100644
--- a/charts/nextcloud/1.3.13/ix_values.yaml
+++ b/charts/nextcloud/1.4.0/ix_values.yaml
@@ -7,3 +7,4 @@ nginx:
     pullPolicy: IfNotPresent
     repository: nginx
     tag: 1.21.3
+useServiceNameForHost: false
diff --git a/charts/nextcloud/1.3.13/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.4.0/migrations/migrate_from_1.1.0
similarity index 100%
rename from charts/nextcloud/1.3.13/migrations/migrate_from_1.1.0
rename to charts/nextcloud/1.4.0/migrations/migrate_from_1.1.0
diff --git a/charts/nextcloud/1.3.13/questions.yaml b/charts/nextcloud/1.4.0/questions.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/questions.yaml
rename to charts/nextcloud/1.4.0/questions.yaml
diff --git a/charts/nextcloud/1.3.13/requirements.lock b/charts/nextcloud/1.4.0/requirements.lock
similarity index 100%
rename from charts/nextcloud/1.3.13/requirements.lock
rename to charts/nextcloud/1.4.0/requirements.lock
diff --git a/charts/nextcloud/1.3.13/templates/NOTES.txt b/charts/nextcloud/1.4.0/templates/NOTES.txt
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/NOTES.txt
rename to charts/nextcloud/1.4.0/templates/NOTES.txt
diff --git a/charts/nextcloud/1.3.13/templates/_nginx.tpl b/charts/nextcloud/1.4.0/templates/_nginx.tpl
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/_nginx.tpl
rename to charts/nextcloud/1.4.0/templates/_nginx.tpl
diff --git a/charts/nextcloud/1.3.13/templates/_postgres.tpl b/charts/nextcloud/1.4.0/templates/_postgres.tpl
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/_postgres.tpl
rename to charts/nextcloud/1.4.0/templates/_postgres.tpl
diff --git a/charts/nextcloud/1.3.13/templates/backup-postgres-config.yaml b/charts/nextcloud/1.4.0/templates/backup-postgres-config.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/backup-postgres-config.yaml
rename to charts/nextcloud/1.4.0/templates/backup-postgres-config.yaml
diff --git a/charts/nextcloud/1.3.13/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.4.0/templates/backup-postgres-hook.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/backup-postgres-hook.yaml
rename to charts/nextcloud/1.4.0/templates/backup-postgres-hook.yaml
diff --git a/charts/nextcloud/1.3.13/templates/deployment.yaml b/charts/nextcloud/1.4.0/templates/deployment.yaml
similarity index 95%
rename from charts/nextcloud/1.3.13/templates/deployment.yaml
rename to charts/nextcloud/1.4.0/templates/deployment.yaml
index 12822304c4..64c0eb687c 100644
--- a/charts/nextcloud/1.3.13/templates/deployment.yaml
+++ b/charts/nextcloud/1.4.0/templates/deployment.yaml
@@ -40,7 +40,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
         {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
         {{ end }}
-        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" .Values.nextcloud.host) }}
+        {{ $hostName := .Values.nextcloud.host }}
+        {{ if .Values.useServiceNameForHost }}
+        {{ $hostName = (include "common.names.fullname" .) }}
+        {{ end }}
+        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" $hostName) }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-username") }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-password") }}
         {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
diff --git a/charts/nextcloud/1.3.13/templates/nginx-configmap.yaml b/charts/nextcloud/1.4.0/templates/nginx-configmap.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/nginx-configmap.yaml
rename to charts/nextcloud/1.4.0/templates/nginx-configmap.yaml
diff --git a/charts/nextcloud/1.3.13/templates/nginx-secret.yaml b/charts/nextcloud/1.4.0/templates/nginx-secret.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/nginx-secret.yaml
rename to charts/nextcloud/1.4.0/templates/nginx-secret.yaml
diff --git a/charts/nextcloud/1.3.13/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.4.0/templates/nuke-deployments-hook.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/nuke-deployments-hook.yaml
rename to charts/nextcloud/1.4.0/templates/nuke-deployments-hook.yaml
diff --git a/charts/nextcloud/1.3.13/templates/postgres-deployment.yaml b/charts/nextcloud/1.4.0/templates/postgres-deployment.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/postgres-deployment.yaml
rename to charts/nextcloud/1.4.0/templates/postgres-deployment.yaml
diff --git a/charts/nextcloud/1.3.13/templates/postgres-secret.yaml b/charts/nextcloud/1.4.0/templates/postgres-secret.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/postgres-secret.yaml
rename to charts/nextcloud/1.4.0/templates/postgres-secret.yaml
diff --git a/charts/nextcloud/1.3.13/templates/postgres-service.yaml b/charts/nextcloud/1.4.0/templates/postgres-service.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/postgres-service.yaml
rename to charts/nextcloud/1.4.0/templates/postgres-service.yaml
diff --git a/charts/nextcloud/1.3.13/templates/secrets.yaml b/charts/nextcloud/1.4.0/templates/secrets.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/secrets.yaml
rename to charts/nextcloud/1.4.0/templates/secrets.yaml
diff --git a/charts/nextcloud/1.3.13/templates/service.yaml b/charts/nextcloud/1.4.0/templates/service.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/service.yaml
rename to charts/nextcloud/1.4.0/templates/service.yaml
diff --git a/charts/nextcloud/1.3.13/templates/serviceaccount.yaml b/charts/nextcloud/1.4.0/templates/serviceaccount.yaml
similarity index 100%
rename from charts/nextcloud/1.3.13/templates/serviceaccount.yaml
rename to charts/nextcloud/1.4.0/templates/serviceaccount.yaml
diff --git a/charts/nextcloud/1.4.0/templates/tests/deployment-check.yaml b/charts/nextcloud/1.4.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..7a511a5786
--- /dev/null
+++ b/charts/nextcloud/1.4.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-nextcloud-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}/login
+    restartPolicy: Never
diff --git a/charts/nextcloud/1.3.13/test_values.yaml b/charts/nextcloud/1.4.0/test_values.yaml
similarity index 96%
rename from charts/nextcloud/1.3.13/test_values.yaml
rename to charts/nextcloud/1.4.0/test_values.yaml
index 1f46439602..b851963051 100644
--- a/charts/nextcloud/1.3.13/test_values.yaml
+++ b/charts/nextcloud/1.4.0/test_values.yaml
@@ -38,3 +38,4 @@ postgresql:
 service:
   nodePort: 31000
 updateStrategy: Recreate
+useServiceNameForHost: true
diff --git a/charts/plex/1.6.25/values.yaml b/charts/plex/1.6.25/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/charts/plex/1.6.25/.helmignore b/charts/plex/1.7.0/.helmignore
similarity index 100%
rename from charts/plex/1.6.25/.helmignore
rename to charts/plex/1.7.0/.helmignore
diff --git a/charts/plex/1.6.25/Chart.lock b/charts/plex/1.7.0/Chart.lock
similarity index 100%
rename from charts/plex/1.6.25/Chart.lock
rename to charts/plex/1.7.0/Chart.lock
diff --git a/charts/plex/1.6.25/Chart.yaml b/charts/plex/1.7.0/Chart.yaml
similarity index 96%
rename from charts/plex/1.6.25/Chart.yaml
rename to charts/plex/1.7.0/Chart.yaml
index 4bf163bf0d..789b922de0 100644
--- a/charts/plex/1.6.25/Chart.yaml
+++ b/charts/plex/1.7.0/Chart.yaml
@@ -14,4 +14,4 @@ sources:
 - https://hub.docker.com/r/plexinc/pms-docker/
 - https://github.com/k8s-at-home/charts/tree/master/charts/plex
 upstream_version: 2.1.0
-version: 1.6.25
+version: 1.7.0
diff --git a/charts/plex/1.6.25/README.md b/charts/plex/1.7.0/README.md
similarity index 100%
rename from charts/plex/1.6.25/README.md
rename to charts/plex/1.7.0/README.md
diff --git a/charts/plex/1.6.25/app-readme.md b/charts/plex/1.7.0/app-readme.md
similarity index 100%
rename from charts/plex/1.6.25/app-readme.md
rename to charts/plex/1.7.0/app-readme.md
diff --git a/test/collabora/1.0.0/charts/common-2112.0.0.tgz b/charts/plex/1.7.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/collabora/1.0.0/charts/common-2112.0.0.tgz
rename to charts/plex/1.7.0/charts/common-2112.0.0.tgz
diff --git a/charts/plex/1.6.25/default_values.yaml b/charts/plex/1.7.0/default_values.yaml
similarity index 100%
rename from charts/plex/1.6.25/default_values.yaml
rename to charts/plex/1.7.0/default_values.yaml
diff --git a/charts/plex/1.6.25/ix_values.yaml b/charts/plex/1.7.0/ix_values.yaml
similarity index 100%
rename from charts/plex/1.6.25/ix_values.yaml
rename to charts/plex/1.7.0/ix_values.yaml
diff --git a/charts/plex/1.6.25/migrations/migrate_from_1.0.0 b/charts/plex/1.7.0/migrations/migrate_from_1.0.0
similarity index 100%
rename from charts/plex/1.6.25/migrations/migrate_from_1.0.0
rename to charts/plex/1.7.0/migrations/migrate_from_1.0.0
diff --git a/charts/plex/1.6.25/questions.yaml b/charts/plex/1.7.0/questions.yaml
similarity index 100%
rename from charts/plex/1.6.25/questions.yaml
rename to charts/plex/1.7.0/questions.yaml
diff --git a/charts/plex/1.6.25/templates/NOTES.txt b/charts/plex/1.7.0/templates/NOTES.txt
similarity index 100%
rename from charts/plex/1.6.25/templates/NOTES.txt
rename to charts/plex/1.7.0/templates/NOTES.txt
diff --git a/charts/plex/1.6.25/templates/deployment.yaml b/charts/plex/1.7.0/templates/deployment.yaml
similarity index 100%
rename from charts/plex/1.6.25/templates/deployment.yaml
rename to charts/plex/1.7.0/templates/deployment.yaml
diff --git a/charts/plex/1.6.25/templates/probe_config.yaml b/charts/plex/1.7.0/templates/probe_config.yaml
similarity index 100%
rename from charts/plex/1.6.25/templates/probe_config.yaml
rename to charts/plex/1.7.0/templates/probe_config.yaml
diff --git a/charts/plex/1.6.25/templates/service-tcp.yaml b/charts/plex/1.7.0/templates/service-tcp.yaml
similarity index 100%
rename from charts/plex/1.6.25/templates/service-tcp.yaml
rename to charts/plex/1.7.0/templates/service-tcp.yaml
diff --git a/charts/plex/1.6.25/templates/service-udp.yaml b/charts/plex/1.7.0/templates/service-udp.yaml
similarity index 100%
rename from charts/plex/1.6.25/templates/service-udp.yaml
rename to charts/plex/1.7.0/templates/service-udp.yaml
diff --git a/charts/plex/1.7.0/templates/tests/deployment-check.yaml b/charts/plex/1.7.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..8e223fe348
--- /dev/null
+++ b/charts/plex/1.7.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-plex-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32400/identity
+    restartPolicy: Never
diff --git a/charts/plex/1.6.25/test_values.yaml b/charts/plex/1.7.0/test_values.yaml
similarity index 100%
rename from charts/plex/1.6.25/test_values.yaml
rename to charts/plex/1.7.0/test_values.yaml
diff --git a/test/collabora/1.0.0/.helmignore b/test/collabora/1.1.0/.helmignore
similarity index 100%
rename from test/collabora/1.0.0/.helmignore
rename to test/collabora/1.1.0/.helmignore
diff --git a/test/collabora/1.0.0/Chart.yaml b/test/collabora/1.1.0/Chart.yaml
similarity index 97%
rename from test/collabora/1.0.0/Chart.yaml
rename to test/collabora/1.1.0/Chart.yaml
index cde9ab11e8..3e88f1bf93 100644
--- a/test/collabora/1.0.0/Chart.yaml
+++ b/test/collabora/1.1.0/Chart.yaml
@@ -15,4 +15,4 @@ name: collabora
 sources:
 - https://github.com/CollaboraOnline/online.git
 - https://hub.docker.com/r/collabora/code
-version: 1.0.0
+version: 1.1.0
diff --git a/test/collabora/1.0.0/README.md b/test/collabora/1.1.0/README.md
similarity index 100%
rename from test/collabora/1.0.0/README.md
rename to test/collabora/1.1.0/README.md
diff --git a/test/collabora/1.0.0/app-readme.md b/test/collabora/1.1.0/app-readme.md
similarity index 100%
rename from test/collabora/1.0.0/app-readme.md
rename to test/collabora/1.1.0/app-readme.md
diff --git a/test/ipfs/1.1.6/charts/common-2112.0.0.tgz b/test/collabora/1.1.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/ipfs/1.1.6/charts/common-2112.0.0.tgz
rename to test/collabora/1.1.0/charts/common-2112.0.0.tgz
diff --git a/test/collabora/1.0.0/ix_values.yaml b/test/collabora/1.1.0/ix_values.yaml
similarity index 100%
rename from test/collabora/1.0.0/ix_values.yaml
rename to test/collabora/1.1.0/ix_values.yaml
diff --git a/test/collabora/1.0.0/questions.yaml b/test/collabora/1.1.0/questions.yaml
similarity index 100%
rename from test/collabora/1.0.0/questions.yaml
rename to test/collabora/1.1.0/questions.yaml
diff --git a/charts/collabora/1.0.0/requirements.lock b/test/collabora/1.1.0/requirements.lock
similarity index 79%
rename from charts/collabora/1.0.0/requirements.lock
rename to test/collabora/1.1.0/requirements.lock
index 63eaf5e67a..137d873a09 100644
--- a/charts/collabora/1.0.0/requirements.lock
+++ b/test/collabora/1.1.0/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: file://../../../library/common/2112.0.0
   version: 2112.0.0
 digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0
-generated: "2021-12-06T21:40:37.099966+05:00"
+generated: "2021-12-06T21:24:36.674776+05:00"
diff --git a/test/collabora/1.0.0/templates/_helpers.tpl b/test/collabora/1.1.0/templates/_helpers.tpl
similarity index 100%
rename from test/collabora/1.0.0/templates/_helpers.tpl
rename to test/collabora/1.1.0/templates/_helpers.tpl
diff --git a/test/collabora/1.0.0/templates/deployment.yaml b/test/collabora/1.1.0/templates/deployment.yaml
similarity index 100%
rename from test/collabora/1.0.0/templates/deployment.yaml
rename to test/collabora/1.1.0/templates/deployment.yaml
diff --git a/test/collabora/1.0.0/templates/nginx-conf.yaml b/test/collabora/1.1.0/templates/nginx-conf.yaml
similarity index 100%
rename from test/collabora/1.0.0/templates/nginx-conf.yaml
rename to test/collabora/1.1.0/templates/nginx-conf.yaml
diff --git a/test/collabora/1.0.0/templates/nginx-service.yaml b/test/collabora/1.1.0/templates/nginx-service.yaml
similarity index 100%
rename from test/collabora/1.0.0/templates/nginx-service.yaml
rename to test/collabora/1.1.0/templates/nginx-service.yaml
diff --git a/test/collabora/1.0.0/templates/secrets.yaml b/test/collabora/1.1.0/templates/secrets.yaml
similarity index 100%
rename from test/collabora/1.0.0/templates/secrets.yaml
rename to test/collabora/1.1.0/templates/secrets.yaml
diff --git a/test/collabora/1.1.0/templates/tests/deployment-check.yaml b/test/collabora/1.1.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..c8fb506367
--- /dev/null
+++ b/test/collabora/1.1.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-collabora-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ks https://{{ $serviceName }}/loleaflet/dist/admin/admin.html
+    restartPolicy: Never
diff --git a/test/collabora/1.0.0/test_values.yaml b/test/collabora/1.1.0/test_values.yaml
similarity index 100%
rename from test/collabora/1.0.0/test_values.yaml
rename to test/collabora/1.1.0/test_values.yaml
diff --git a/test/ipfs/1.1.6/default_values.yaml b/test/ipfs/1.1.6/default_values.yaml
deleted file mode 100644
index 407c7a3732..0000000000
--- a/test/ipfs/1.1.6/default_values.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: ipfs/go-ipfs
-  tag: v0.8.0-rc1
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to ipfs binary
-extraArgs: []
-
-updateStrategy: Recreate
-
-service:
-  swarmPort: 9401
-  apiPort: 9501
-  gatewayPort: 9080
-
-environment:
-
-appVolumeMounts:
-  staging:
-    emptyDir: true
-    mountPath: "/export"
-  data:
-    emptyDir: true
-    mountPath: "/data/ipfs"
-
diff --git a/test/ipfs/1.1.6/values.yaml b/test/ipfs/1.1.6/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/ipfs/1.1.6/.helmignore b/test/ipfs/1.2.0/.helmignore
similarity index 100%
rename from test/ipfs/1.1.6/.helmignore
rename to test/ipfs/1.2.0/.helmignore
diff --git a/charts/ipfs/1.1.6/Chart.yaml b/test/ipfs/1.2.0/Chart.yaml
similarity index 96%
rename from charts/ipfs/1.1.6/Chart.yaml
rename to test/ipfs/1.2.0/Chart.yaml
index 16841e1b9f..b133e6b6ce 100644
--- a/charts/ipfs/1.1.6/Chart.yaml
+++ b/test/ipfs/1.2.0/Chart.yaml
@@ -15,4 +15,4 @@ sources:
 - https://github.com/ipfs/go-ipfs
 - https://hub.docker.com/r/ipfs/go-ipfs
 upstream_version: 0.8.0-rc1
-version: 1.1.6
+version: 1.2.0
diff --git a/test/ipfs/1.1.6/README.md b/test/ipfs/1.2.0/README.md
similarity index 100%
rename from test/ipfs/1.1.6/README.md
rename to test/ipfs/1.2.0/README.md
diff --git a/test/ipfs/1.1.6/app-readme.md b/test/ipfs/1.2.0/app-readme.md
similarity index 100%
rename from test/ipfs/1.1.6/app-readme.md
rename to test/ipfs/1.2.0/app-readme.md
diff --git a/test/minio/1.5.10/charts/common-2112.0.0.tgz b/test/ipfs/1.2.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/minio/1.5.10/charts/common-2112.0.0.tgz
rename to test/ipfs/1.2.0/charts/common-2112.0.0.tgz
diff --git a/test/ipfs/1.1.6/ix_values.yaml b/test/ipfs/1.2.0/ix_values.yaml
similarity index 100%
rename from test/ipfs/1.1.6/ix_values.yaml
rename to test/ipfs/1.2.0/ix_values.yaml
diff --git a/test/ipfs/1.1.6/questions.yaml b/test/ipfs/1.2.0/questions.yaml
similarity index 100%
rename from test/ipfs/1.1.6/questions.yaml
rename to test/ipfs/1.2.0/questions.yaml
diff --git a/test/ipfs/1.1.6/requirements.lock b/test/ipfs/1.2.0/requirements.lock
similarity index 100%
rename from test/ipfs/1.1.6/requirements.lock
rename to test/ipfs/1.2.0/requirements.lock
diff --git a/test/ipfs/1.1.6/templates/NOTES.txt b/test/ipfs/1.2.0/templates/NOTES.txt
similarity index 100%
rename from test/ipfs/1.1.6/templates/NOTES.txt
rename to test/ipfs/1.2.0/templates/NOTES.txt
diff --git a/test/ipfs/1.1.6/templates/deployment.yaml b/test/ipfs/1.2.0/templates/deployment.yaml
similarity index 100%
rename from test/ipfs/1.1.6/templates/deployment.yaml
rename to test/ipfs/1.2.0/templates/deployment.yaml
diff --git a/test/ipfs/1.1.6/templates/service.yaml b/test/ipfs/1.2.0/templates/service.yaml
similarity index 100%
rename from test/ipfs/1.1.6/templates/service.yaml
rename to test/ipfs/1.2.0/templates/service.yaml
diff --git a/test/ipfs/1.1.6/templates/serviceaccount.yaml b/test/ipfs/1.2.0/templates/serviceaccount.yaml
similarity index 100%
rename from test/ipfs/1.1.6/templates/serviceaccount.yaml
rename to test/ipfs/1.2.0/templates/serviceaccount.yaml
diff --git a/test/ipfs/1.2.0/templates/tests/deployment-check.yaml b/test/ipfs/1.2.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..d68ce8e043
--- /dev/null
+++ b/test/ipfs/1.2.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-ipfs-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.apiPort }}/webui/
+    restartPolicy: Never
diff --git a/test/ipfs/1.1.6/test_values.yaml b/test/ipfs/1.2.0/test_values.yaml
similarity index 100%
rename from test/ipfs/1.1.6/test_values.yaml
rename to test/ipfs/1.2.0/test_values.yaml
diff --git a/test/minio/1.5.10/default_values.yaml b/test/minio/1.5.10/default_values.yaml
deleted file mode 100644
index 7afa31dc0d..0000000000
--- a/test/minio/1.5.10/default_values.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to minio binary
-extraArgs: []
-
-updateStrategy: RollingUpdate
-
-service:
-  nodePort: 9000
-
-environment:
-  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
-
-appVolumeMounts:
-  export:
-    emptyDir: true
-    mountPath: "/export"
diff --git a/test/minio/1.5.10/values.yaml b/test/minio/1.5.10/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/minio/1.5.10/.helmignore b/test/minio/1.6.0/.helmignore
similarity index 100%
rename from test/minio/1.5.10/.helmignore
rename to test/minio/1.6.0/.helmignore
diff --git a/test/minio/1.5.10/CHANGELOG.md b/test/minio/1.6.0/CHANGELOG.md
similarity index 100%
rename from test/minio/1.5.10/CHANGELOG.md
rename to test/minio/1.6.0/CHANGELOG.md
diff --git a/test/minio/1.5.10/Chart.yaml b/test/minio/1.6.0/Chart.yaml
similarity index 91%
rename from test/minio/1.5.10/Chart.yaml
rename to test/minio/1.6.0/Chart.yaml
index fbb5b50537..3f65c2bbe6 100644
--- a/test/minio/1.5.10/Chart.yaml
+++ b/test/minio/1.6.0/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: '2022-03-22'
+appVersion: '2022-03-17'
 dependencies:
 - name: common
   repository: file://../../../library/common/2112.0.0
@@ -16,4 +16,4 @@ sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-version: 1.5.10
+version: 1.6.0
diff --git a/test/minio/1.5.10/README.md b/test/minio/1.6.0/README.md
similarity index 100%
rename from test/minio/1.5.10/README.md
rename to test/minio/1.6.0/README.md
diff --git a/test/minio/1.5.10/app-readme.md b/test/minio/1.6.0/app-readme.md
similarity index 100%
rename from test/minio/1.5.10/app-readme.md
rename to test/minio/1.6.0/app-readme.md
diff --git a/test/nextcloud/1.3.13/charts/common-2112.0.0.tgz b/test/minio/1.6.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/nextcloud/1.3.13/charts/common-2112.0.0.tgz
rename to test/minio/1.6.0/charts/common-2112.0.0.tgz
diff --git a/test/minio/1.5.10/ix_values.yaml b/test/minio/1.6.0/ix_values.yaml
similarity index 71%
rename from test/minio/1.5.10/ix_values.yaml
rename to test/minio/1.6.0/ix_values.yaml
index 0d1a9f2918..28263c7744 100644
--- a/test/minio/1.5.10/ix_values.yaml
+++ b/test/minio/1.6.0/ix_values.yaml
@@ -1,6 +1,6 @@
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 runAsGroup: 473
 runAsUser: 473
diff --git a/test/minio/1.5.10/migrations/migrate b/test/minio/1.6.0/migrations/migrate
similarity index 100%
rename from test/minio/1.5.10/migrations/migrate
rename to test/minio/1.6.0/migrations/migrate
diff --git a/test/minio/1.5.10/migrations/migrate_from_1.0.0 b/test/minio/1.6.0/migrations/migrate_from_1.0.0
similarity index 100%
rename from test/minio/1.5.10/migrations/migrate_from_1.0.0
rename to test/minio/1.6.0/migrations/migrate_from_1.0.0
diff --git a/test/minio/1.5.10/questions.yaml b/test/minio/1.6.0/questions.yaml
similarity index 100%
rename from test/minio/1.5.10/questions.yaml
rename to test/minio/1.6.0/questions.yaml
diff --git a/test/minio/1.5.10/requirements.lock b/test/minio/1.6.0/requirements.lock
similarity index 100%
rename from test/minio/1.5.10/requirements.lock
rename to test/minio/1.6.0/requirements.lock
diff --git a/test/minio/1.5.10/templates/NOTES.txt b/test/minio/1.6.0/templates/NOTES.txt
similarity index 100%
rename from test/minio/1.5.10/templates/NOTES.txt
rename to test/minio/1.6.0/templates/NOTES.txt
diff --git a/test/minio/1.5.10/templates/_cert.tpl b/test/minio/1.6.0/templates/_cert.tpl
similarity index 100%
rename from test/minio/1.5.10/templates/_cert.tpl
rename to test/minio/1.6.0/templates/_cert.tpl
diff --git a/test/minio/1.5.10/templates/_helpers.tpl b/test/minio/1.6.0/templates/_helpers.tpl
similarity index 100%
rename from test/minio/1.5.10/templates/_helpers.tpl
rename to test/minio/1.6.0/templates/_helpers.tpl
diff --git a/test/minio/1.5.10/templates/configmap.yaml b/test/minio/1.6.0/templates/configmap.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/configmap.yaml
rename to test/minio/1.6.0/templates/configmap.yaml
diff --git a/test/minio/1.5.10/templates/deployment.yaml b/test/minio/1.6.0/templates/deployment.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/deployment.yaml
rename to test/minio/1.6.0/templates/deployment.yaml
diff --git a/test/minio/1.5.10/templates/pre-install-job.yaml b/test/minio/1.6.0/templates/pre-install-job.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/pre-install-job.yaml
rename to test/minio/1.6.0/templates/pre-install-job.yaml
diff --git a/test/minio/1.5.10/templates/secrets.yaml b/test/minio/1.6.0/templates/secrets.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/secrets.yaml
rename to test/minio/1.6.0/templates/secrets.yaml
diff --git a/test/minio/1.5.10/templates/service.yaml b/test/minio/1.6.0/templates/service.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/service.yaml
rename to test/minio/1.6.0/templates/service.yaml
diff --git a/test/minio/1.5.10/templates/serviceaccount.yaml b/test/minio/1.6.0/templates/serviceaccount.yaml
similarity index 100%
rename from test/minio/1.5.10/templates/serviceaccount.yaml
rename to test/minio/1.6.0/templates/serviceaccount.yaml
diff --git a/test/minio/1.6.0/templates/tests/deployment-check.yaml b/test/minio/1.6.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..af842d4690
--- /dev/null
+++ b/test/minio/1.6.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-minio-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.service.consolePort }}/
+    restartPolicy: Never
diff --git a/test/minio/1.5.10/test_values.yaml b/test/minio/1.6.0/test_values.yaml
similarity index 91%
rename from test/minio/1.5.10/test_values.yaml
rename to test/minio/1.6.0/test_values.yaml
index fd74db0858..a4ff45fa6b 100644
--- a/test/minio/1.5.10/test_values.yaml
+++ b/test/minio/1.6.0/test_values.yaml
@@ -13,7 +13,7 @@ extraArgs: []
 image:
   pullPolicy: IfNotPresent
   repository: minio/minio
-  tag: RELEASE.2022-03-22T02-05-10Z
+  tag: RELEASE.2022-03-17T06-34-49Z
 minioDomain: null
 runAsGroup: 473
 runAsUser: 473
diff --git a/test/nextcloud/1.3.13/.helmignore b/test/nextcloud/1.4.0/.helmignore
similarity index 100%
rename from test/nextcloud/1.3.13/.helmignore
rename to test/nextcloud/1.4.0/.helmignore
diff --git a/test/nextcloud/1.3.13/Chart.lock b/test/nextcloud/1.4.0/Chart.lock
similarity index 100%
rename from test/nextcloud/1.3.13/Chart.lock
rename to test/nextcloud/1.4.0/Chart.lock
diff --git a/charts/nextcloud/1.3.13/Chart.yaml b/test/nextcloud/1.4.0/Chart.yaml
similarity index 97%
rename from charts/nextcloud/1.3.13/Chart.yaml
rename to test/nextcloud/1.4.0/Chart.yaml
index c1bfa99d10..b472a894ed 100644
--- a/charts/nextcloud/1.3.13/Chart.yaml
+++ b/test/nextcloud/1.4.0/Chart.yaml
@@ -19,4 +19,4 @@ sources:
 - https://github.com/nextcloud/docker
 - https://github.com/nextcloud/helm
 upstream_version: 2.3.2
-version: 1.3.13
+version: 1.4.0
diff --git a/test/nextcloud/1.3.13/README.md b/test/nextcloud/1.4.0/README.md
similarity index 100%
rename from test/nextcloud/1.3.13/README.md
rename to test/nextcloud/1.4.0/README.md
diff --git a/test/nextcloud/1.3.13/app-readme.md b/test/nextcloud/1.4.0/app-readme.md
similarity index 100%
rename from test/nextcloud/1.3.13/app-readme.md
rename to test/nextcloud/1.4.0/app-readme.md
diff --git a/test/plex/1.6.25/charts/common-2112.0.0.tgz b/test/nextcloud/1.4.0/charts/common-2112.0.0.tgz
similarity index 100%
rename from test/plex/1.6.25/charts/common-2112.0.0.tgz
rename to test/nextcloud/1.4.0/charts/common-2112.0.0.tgz
diff --git a/test/nextcloud/1.3.13/ix_values.yaml b/test/nextcloud/1.4.0/ix_values.yaml
similarity index 84%
rename from test/nextcloud/1.3.13/ix_values.yaml
rename to test/nextcloud/1.4.0/ix_values.yaml
index 6d119de053..fc08a59c3e 100644
--- a/test/nextcloud/1.3.13/ix_values.yaml
+++ b/test/nextcloud/1.4.0/ix_values.yaml
@@ -7,3 +7,4 @@ nginx:
     pullPolicy: IfNotPresent
     repository: nginx
     tag: 1.21.3
+useServiceNameForHost: false
diff --git a/test/nextcloud/1.3.13/migrations/migrate_from_1.1.0 b/test/nextcloud/1.4.0/migrations/migrate_from_1.1.0
similarity index 100%
rename from test/nextcloud/1.3.13/migrations/migrate_from_1.1.0
rename to test/nextcloud/1.4.0/migrations/migrate_from_1.1.0
diff --git a/test/nextcloud/1.3.13/questions.yaml b/test/nextcloud/1.4.0/questions.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/questions.yaml
rename to test/nextcloud/1.4.0/questions.yaml
diff --git a/test/nextcloud/1.3.13/requirements.lock b/test/nextcloud/1.4.0/requirements.lock
similarity index 100%
rename from test/nextcloud/1.3.13/requirements.lock
rename to test/nextcloud/1.4.0/requirements.lock
diff --git a/test/nextcloud/1.3.13/templates/NOTES.txt b/test/nextcloud/1.4.0/templates/NOTES.txt
similarity index 100%
rename from test/nextcloud/1.3.13/templates/NOTES.txt
rename to test/nextcloud/1.4.0/templates/NOTES.txt
diff --git a/test/nextcloud/1.3.13/templates/_nginx.tpl b/test/nextcloud/1.4.0/templates/_nginx.tpl
similarity index 100%
rename from test/nextcloud/1.3.13/templates/_nginx.tpl
rename to test/nextcloud/1.4.0/templates/_nginx.tpl
diff --git a/test/nextcloud/1.3.13/templates/_postgres.tpl b/test/nextcloud/1.4.0/templates/_postgres.tpl
similarity index 100%
rename from test/nextcloud/1.3.13/templates/_postgres.tpl
rename to test/nextcloud/1.4.0/templates/_postgres.tpl
diff --git a/test/nextcloud/1.3.13/templates/backup-postgres-config.yaml b/test/nextcloud/1.4.0/templates/backup-postgres-config.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/backup-postgres-config.yaml
rename to test/nextcloud/1.4.0/templates/backup-postgres-config.yaml
diff --git a/test/nextcloud/1.3.13/templates/backup-postgres-hook.yaml b/test/nextcloud/1.4.0/templates/backup-postgres-hook.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/backup-postgres-hook.yaml
rename to test/nextcloud/1.4.0/templates/backup-postgres-hook.yaml
diff --git a/test/nextcloud/1.3.13/templates/deployment.yaml b/test/nextcloud/1.4.0/templates/deployment.yaml
similarity index 95%
rename from test/nextcloud/1.3.13/templates/deployment.yaml
rename to test/nextcloud/1.4.0/templates/deployment.yaml
index 12822304c4..64c0eb687c 100644
--- a/test/nextcloud/1.3.13/templates/deployment.yaml
+++ b/test/nextcloud/1.4.0/templates/deployment.yaml
@@ -40,7 +40,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
         {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
         {{ end }}
-        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" .Values.nextcloud.host) }}
+        {{ $hostName := .Values.nextcloud.host }}
+        {{ if .Values.useServiceNameForHost }}
+        {{ $hostName = (include "common.names.fullname" .) }}
+        {{ end }}
+        {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_TRUSTED_DOMAINS" "value" $hostName) }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-username") }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_ADMIN_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "nextcloud-password") }}
         {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
diff --git a/test/nextcloud/1.3.13/templates/nginx-configmap.yaml b/test/nextcloud/1.4.0/templates/nginx-configmap.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/nginx-configmap.yaml
rename to test/nextcloud/1.4.0/templates/nginx-configmap.yaml
diff --git a/test/nextcloud/1.3.13/templates/nginx-secret.yaml b/test/nextcloud/1.4.0/templates/nginx-secret.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/nginx-secret.yaml
rename to test/nextcloud/1.4.0/templates/nginx-secret.yaml
diff --git a/test/nextcloud/1.3.13/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.4.0/templates/nuke-deployments-hook.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/nuke-deployments-hook.yaml
rename to test/nextcloud/1.4.0/templates/nuke-deployments-hook.yaml
diff --git a/test/nextcloud/1.3.13/templates/postgres-deployment.yaml b/test/nextcloud/1.4.0/templates/postgres-deployment.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/postgres-deployment.yaml
rename to test/nextcloud/1.4.0/templates/postgres-deployment.yaml
diff --git a/test/nextcloud/1.3.13/templates/postgres-secret.yaml b/test/nextcloud/1.4.0/templates/postgres-secret.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/postgres-secret.yaml
rename to test/nextcloud/1.4.0/templates/postgres-secret.yaml
diff --git a/test/nextcloud/1.3.13/templates/postgres-service.yaml b/test/nextcloud/1.4.0/templates/postgres-service.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/postgres-service.yaml
rename to test/nextcloud/1.4.0/templates/postgres-service.yaml
diff --git a/test/nextcloud/1.3.13/templates/secrets.yaml b/test/nextcloud/1.4.0/templates/secrets.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/secrets.yaml
rename to test/nextcloud/1.4.0/templates/secrets.yaml
diff --git a/test/nextcloud/1.3.13/templates/service.yaml b/test/nextcloud/1.4.0/templates/service.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/service.yaml
rename to test/nextcloud/1.4.0/templates/service.yaml
diff --git a/test/nextcloud/1.3.13/templates/serviceaccount.yaml b/test/nextcloud/1.4.0/templates/serviceaccount.yaml
similarity index 100%
rename from test/nextcloud/1.3.13/templates/serviceaccount.yaml
rename to test/nextcloud/1.4.0/templates/serviceaccount.yaml
diff --git a/test/nextcloud/1.4.0/templates/tests/deployment-check.yaml b/test/nextcloud/1.4.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..7a511a5786
--- /dev/null
+++ b/test/nextcloud/1.4.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-nextcloud-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}/login
+    restartPolicy: Never
diff --git a/test/nextcloud/1.3.13/test_values.yaml b/test/nextcloud/1.4.0/test_values.yaml
similarity index 96%
rename from test/nextcloud/1.3.13/test_values.yaml
rename to test/nextcloud/1.4.0/test_values.yaml
index 1f46439602..b851963051 100644
--- a/test/nextcloud/1.3.13/test_values.yaml
+++ b/test/nextcloud/1.4.0/test_values.yaml
@@ -38,3 +38,4 @@ postgresql:
 service:
   nodePort: 31000
 updateStrategy: Recreate
+useServiceNameForHost: true
diff --git a/test/plex/1.6.25/values.yaml b/test/plex/1.6.25/values.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/plex/1.6.25/.helmignore b/test/plex/1.7.0/.helmignore
similarity index 100%
rename from test/plex/1.6.25/.helmignore
rename to test/plex/1.7.0/.helmignore
diff --git a/test/plex/1.6.25/Chart.lock b/test/plex/1.7.0/Chart.lock
similarity index 100%
rename from test/plex/1.6.25/Chart.lock
rename to test/plex/1.7.0/Chart.lock
diff --git a/test/plex/1.6.25/Chart.yaml b/test/plex/1.7.0/Chart.yaml
similarity index 96%
rename from test/plex/1.6.25/Chart.yaml
rename to test/plex/1.7.0/Chart.yaml
index 4bf163bf0d..789b922de0 100644
--- a/test/plex/1.6.25/Chart.yaml
+++ b/test/plex/1.7.0/Chart.yaml
@@ -14,4 +14,4 @@ sources:
 - https://hub.docker.com/r/plexinc/pms-docker/
 - https://github.com/k8s-at-home/charts/tree/master/charts/plex
 upstream_version: 2.1.0
-version: 1.6.25
+version: 1.7.0
diff --git a/test/plex/1.6.25/README.md b/test/plex/1.7.0/README.md
similarity index 100%
rename from test/plex/1.6.25/README.md
rename to test/plex/1.7.0/README.md
diff --git a/test/plex/1.6.25/app-readme.md b/test/plex/1.7.0/app-readme.md
similarity index 100%
rename from test/plex/1.6.25/app-readme.md
rename to test/plex/1.7.0/app-readme.md
diff --git a/test/plex/1.7.0/charts/common-2112.0.0.tgz b/test/plex/1.7.0/charts/common-2112.0.0.tgz
new file mode 100644
index 0000000000..62c214e1c8
Binary files /dev/null and b/test/plex/1.7.0/charts/common-2112.0.0.tgz differ
diff --git a/test/plex/1.6.25/default_values.yaml b/test/plex/1.7.0/default_values.yaml
similarity index 100%
rename from test/plex/1.6.25/default_values.yaml
rename to test/plex/1.7.0/default_values.yaml
diff --git a/test/plex/1.6.25/ix_values.yaml b/test/plex/1.7.0/ix_values.yaml
similarity index 100%
rename from test/plex/1.6.25/ix_values.yaml
rename to test/plex/1.7.0/ix_values.yaml
diff --git a/test/plex/1.6.25/migrations/migrate_from_1.0.0 b/test/plex/1.7.0/migrations/migrate_from_1.0.0
similarity index 100%
rename from test/plex/1.6.25/migrations/migrate_from_1.0.0
rename to test/plex/1.7.0/migrations/migrate_from_1.0.0
diff --git a/test/plex/1.6.25/questions.yaml b/test/plex/1.7.0/questions.yaml
similarity index 100%
rename from test/plex/1.6.25/questions.yaml
rename to test/plex/1.7.0/questions.yaml
diff --git a/test/plex/1.6.25/templates/NOTES.txt b/test/plex/1.7.0/templates/NOTES.txt
similarity index 100%
rename from test/plex/1.6.25/templates/NOTES.txt
rename to test/plex/1.7.0/templates/NOTES.txt
diff --git a/test/plex/1.6.25/templates/deployment.yaml b/test/plex/1.7.0/templates/deployment.yaml
similarity index 100%
rename from test/plex/1.6.25/templates/deployment.yaml
rename to test/plex/1.7.0/templates/deployment.yaml
diff --git a/test/plex/1.6.25/templates/probe_config.yaml b/test/plex/1.7.0/templates/probe_config.yaml
similarity index 100%
rename from test/plex/1.6.25/templates/probe_config.yaml
rename to test/plex/1.7.0/templates/probe_config.yaml
diff --git a/test/plex/1.6.25/templates/service-tcp.yaml b/test/plex/1.7.0/templates/service-tcp.yaml
similarity index 100%
rename from test/plex/1.6.25/templates/service-tcp.yaml
rename to test/plex/1.7.0/templates/service-tcp.yaml
diff --git a/test/plex/1.6.25/templates/service-udp.yaml b/test/plex/1.7.0/templates/service-udp.yaml
similarity index 100%
rename from test/plex/1.6.25/templates/service-udp.yaml
rename to test/plex/1.7.0/templates/service-udp.yaml
diff --git a/test/plex/1.7.0/templates/tests/deployment-check.yaml b/test/plex/1.7.0/templates/tests/deployment-check.yaml
new file mode 100644
index 0000000000..8e223fe348
--- /dev/null
+++ b/test/plex/1.7.0/templates/tests/deployment-check.yaml
@@ -0,0 +1,21 @@
+{{- $serviceName := (include "common.names.fullname" .) -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ .Release.Name }}-plex-test"
+  labels:
+    app: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+    containers:
+      - name: test-curl
+        image: alpine/curl
+        imagePullPolicy: "IfNotPresent"
+        command:
+          - /bin/sh
+          - -ec
+          - |
+            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32400/identity
+    restartPolicy: Never
diff --git a/test/plex/1.6.25/test_values.yaml b/test/plex/1.7.0/test_values.yaml
similarity index 100%
rename from test/plex/1.6.25/test_values.yaml
rename to test/plex/1.7.0/test_values.yaml