diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a0efc72..431dfa8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -123,7 +123,7 @@ Changes to the Helm chart should be accompanied by appropriate unit tests.
 In all of the tests in this repo, the base command being run is [helm template](https://docs.helm.sh/helm/#helm-template) which turns the templated files into straight yaml output.
 In this way, we're able to test that the various conditionals in the templates render as we would expect.
 
-Each test defines the files that should be rendered using the `-x` flag, then it might adjust chart values by adding `--set` flags as well.
+Each test defines the files that should be rendered using the `--show-only` flag, then it might adjust chart values by adding `--set` flags as well.
 The output from this `helm template` command is then piped to [yq](https://pypi.org/project/yq/).
 `yq` allows us to pull out just the information we're interested in, either by referencing its position in the yaml file directly or giving information about it (like its length).
 The `-r` flag can be used with `yq` to return a raw string instead of a quoted one which is especially useful when looking for an exact match.
@@ -142,7 +142,7 @@ Here are some examples of common test patterns:
     @test "ui/Service: no type by default" {
       cd `chart_dir`
       local actual=$(helm template \
-          -x templates/ui-service.yaml  \
+          --show-only templates/ui-service.yaml  \
           . | tee /dev/stderr |
           yq -r '.spec.type' | tee /dev/stderr)
       [ "${actual}" = "null" ]
@@ -158,7 +158,7 @@ Here are some examples of common test patterns:
     @test "ui/Service: specified type" {
       cd `chart_dir`
       local actual=$(helm template \
-          -x templates/ui-service.yaml  \
+          --show-only templates/ui-service.yaml  \
           --set 'ui.serviceType=LoadBalancer' \
           . | tee /dev/stderr |
           yq -r '.spec.type' | tee /dev/stderr)
@@ -173,7 +173,7 @@ Here are some examples of common test patterns:
 	@test "server/standalone-StatefulSet: custom resources" {
 	  cd `chart_dir`
 	  local actual=$(helm template \
-		  -x templates/server-statefulset.yaml  \
+		  --show-only templates/server-statefulset.yaml  \
 		  --set 'server.standalone.enabled=true' \
 		  --set 'server.resources.requests.memory=256Mi' \
 		  --set 'server.resources.requests.cpu=250m' \
@@ -182,7 +182,7 @@ Here are some examples of common test patterns:
 	  [ "${actual}" = "256Mi" ]
 
 	  local actual=$(helm template \
-		  -x templates/server-statefulset.yaml  \
+		  --show-only templates/server-statefulset.yaml  \
 		  --set 'server.standalone.enabled=true' \
 		  --set 'server.resources.limits.memory=256Mi' \
 		  --set 'server.resources.limits.cpu=250m' \
@@ -197,10 +197,10 @@ Here are some examples of common test patterns:
     ```
     @test "syncCatalog/Deployment: disabled by default" {
       cd `chart_dir`
-      local actual=$(helm template \
-          -x templates/server-statefulset.yaml  \
+      local actual=$( (helm template \
+          --show-only templates/server-statefulset.yaml  \
           --set 'global.enabled=false' \
-          . | tee /dev/stderr |
+          . || echo "---") | tee /dev/stderr |
           yq 'length > 0' | tee /dev/stderr)
       [ "${actual}" = "false" ]
     }
diff --git a/Chart.yaml b/Chart.yaml
index f46cfe4..8a41081 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: vault
 version: 0.3.3
 description: Install and configure Vault on Kubernetes.
diff --git a/README.md b/README.md
index 8d93c45..c6071b7 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ of this README. Please refer to the Kubernetes and Helm documentation.
 
 The versions required are:
 
-  * **Helm 2.10+** - This is the earliest version of Helm tested. It is possible
+  * **Helm 3.0+** - This is the earliest version of Helm tested. It is possible
     it works with earlier versions but this chart is untested for those versions.
   * **Kubernetes 1.9+** - This is the earliest version of Kubernetes tested.
     It is possible that this chart works with earlier versions but it is
diff --git a/templates/injector-deployment.yaml b/templates/injector-deployment.yaml
index ed5a2da..86c54ff 100644
--- a/templates/injector-deployment.yaml
+++ b/templates/injector-deployment.yaml
@@ -1,5 +1,5 @@
-# Deployment for the injector
 {{- if and (eq (.Values.injector.enabled | toString) "true" ) (eq (.Values.global.enabled | toString) "true") }}
+# Deployment for the injector
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/templates/server-disruptionbudget.yaml b/templates/server-disruptionbudget.yaml
index f41aedd..40ba8b4 100644
--- a/templates/server-disruptionbudget.yaml
+++ b/templates/server-disruptionbudget.yaml
@@ -1,7 +1,7 @@
-# PodDisruptionBudget to prevent degrading the server cluster through
-# voluntary cluster changes.
 {{ template "vault.mode" . }}
 {{- if and (and (eq (.Values.global.enabled | toString) "true") (eq .mode "ha")) (eq (.Values.server.ha.disruptionBudget.enabled | toString) "true") -}}
+# PodDisruptionBudget to prevent degrading the server cluster through
+# voluntary cluster changes.
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
diff --git a/templates/server-service.yaml b/templates/server-service.yaml
index a9c5ede..4ea2363 100644
--- a/templates/server-service.yaml
+++ b/templates/server-service.yaml
@@ -1,5 +1,5 @@
-# Service for Vault cluster
 {{- if and (eq (.Values.server.service.enabled | toString) "true" ) (eq (.Values.global.enabled | toString) "true") }}
+# Service for Vault cluster
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index abde79d..8a51e6d 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -1,6 +1,6 @@
-# StatefulSet to run the actual vault server cluster.
 {{ template "vault.mode" . }}
 {{- if and (ne .mode "") (eq (.Values.global.enabled | toString) "true") }}
+# StatefulSet to run the actual vault server cluster.
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
diff --git a/templates/ui-service.yaml b/templates/ui-service.yaml
index 00bab47..cfc53e5 100644
--- a/templates/ui-service.yaml
+++ b/templates/ui-service.yaml
@@ -1,11 +1,11 @@
 {{ template "vault.mode" . }}
 {{- if and (ne .mode "") (eq (.Values.global.enabled | toString) "true") }}
+{{- if eq (.Values.ui.enabled | toString) "true" }}
 # Headless service for Vault server DNS entries. This service should only
 # point to Vault servers. For access to an agent, one should assume that
 # the agent is installed locally on the node and the NODE_IP should be used.
 # If the node can't run a Vault agent, then this service can be used to
 # communicate directly to a server agent.
-{{- if eq (.Values.ui.enabled | toString) "true" }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/test/acceptance/injector.bats b/test/acceptance/injector.bats
index 35f4b9c..2fdb7a5 100644
--- a/test/acceptance/injector.bats
+++ b/test/acceptance/injector.bats
@@ -19,7 +19,7 @@ load _helpers
 
   kubectl label secret test app=vault-agent-demo
 
-  helm install --name="$(name_prefix)" \
+  helm install "$(name_prefix)" \
     --set="server.extraVolumes[0].type=secret" \
     --set="server.extraVolumes[0].name=test" .
   wait_for_running $(name_prefix)-0
@@ -46,7 +46,7 @@ load _helpers
 # Clean up
 teardown() {
   echo "helm/pvc teardown"
-  helm delete --purge vault
+  helm delete vault
   kubectl delete --all pvc
   kubectl delete secret test 
   kubectl delete job pgdump
diff --git a/test/acceptance/server-dev.bats b/test/acceptance/server-dev.bats
index eeec698..05f3661 100644
--- a/test/acceptance/server-dev.bats
+++ b/test/acceptance/server-dev.bats
@@ -8,7 +8,7 @@ load _helpers
   kubectl create namespace acceptance
   kubectl config set-context --current --namespace=acceptance
 
-  helm install --name="$(name_prefix)" --set='server.dev.enabled=true' .
+  helm install "$(name_prefix)" --set='server.dev.enabled=true' .
   wait_for_running $(name_prefix)-0
 
   # Replicas
@@ -55,7 +55,7 @@ load _helpers
 # Clean up
 teardown() {
   echo "helm/pvc teardown"
-  helm delete --purge vault
+  helm delete vault
   kubectl delete --all pvc
   kubectl delete namespace acceptance --ignore-not-found=true
 }
diff --git a/test/acceptance/server-ha.bats b/test/acceptance/server-ha.bats
index 78d5505..f29e31f 100644
--- a/test/acceptance/server-ha.bats
+++ b/test/acceptance/server-ha.bats
@@ -5,8 +5,7 @@ load _helpers
 @test "server/ha: testing deployment" {
   cd `chart_dir`
 
-
-  helm install --name="$(name_prefix)" \
+  helm install "$(name_prefix)" \
     --set='server.ha.enabled=true' .
   wait_for_running $(name_prefix)-0
 
@@ -95,8 +94,8 @@ setup() {
   kubectl create namespace acceptance
   kubectl config set-context --current --namespace=acceptance
 
-  helm install https://github.com/hashicorp/consul-helm/archive/v0.8.1.tar.gz \
-    --name consul \
+  helm install consul \
+    https://github.com/hashicorp/consul-helm/archive/v0.16.2.tar.gz \
     --set 'ui.enabled=false' \
 
   wait_for_running_consul
@@ -104,8 +103,8 @@ setup() {
 
 #cleanup
 teardown() {
-  helm delete --purge vault
-  helm delete --purge consul
+  helm delete vault
+  helm delete consul
   kubectl delete --all pvc
   kubectl delete namespace acceptance --ignore-not-found=true
 }
diff --git a/test/acceptance/server.bats b/test/acceptance/server.bats
index 3c4a075..d8edbd5 100644
--- a/test/acceptance/server.bats
+++ b/test/acceptance/server.bats
@@ -9,7 +9,7 @@ load _helpers
   kubectl create namespace acceptance
   kubectl config set-context --current --namespace=acceptance
 
-  helm install --name="$(name_prefix)" .
+  helm install "$(name_prefix)" .
   wait_for_running $(name_prefix)-0
 
   # Sealed, not initialized
@@ -112,7 +112,7 @@ load _helpers
 # Clean up
 teardown() {
   echo "helm/pvc teardown"
-  helm delete --purge vault
+  helm delete vault
   kubectl delete --all pvc
   kubectl delete namespace acceptance --ignore-not-found=true
 }
diff --git a/test/docker/Test.dockerfile b/test/docker/Test.dockerfile
index 51cc166..003a06f 100644
--- a/test/docker/Test.dockerfile
+++ b/test/docker/Test.dockerfile
@@ -37,7 +37,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s
     mv ./kubectl /usr/local/bin/kubectl
 
 # helm
-RUN curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
+RUN curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 # bats
 RUN curl -sSL https://github.com/bats-core/bats-core/archive/v${BATS_VERSION}.tar.gz -o /tmp/bats.tgz \
diff --git a/test/terraform/main.tf b/test/terraform/main.tf
index c4f3516..e3fc2ef 100644
--- a/test/terraform/main.tf
+++ b/test/terraform/main.tf
@@ -1,7 +1,3 @@
-locals {
-  service_account_path = "${path.module}/service-account.yaml"
-}
-
 provider "google" {
   project = "${var.project}"
   region  = "us-central1"
@@ -15,7 +11,7 @@ resource "random_id" "suffix" {
 
 data "google_container_engine_versions" "main" {
   location = "${var.zone}"
-  version_prefix = "1.12."
+  version_prefix = "1.15."
 }
 
 data "google_service_account" "gcpapi" {
@@ -91,19 +87,3 @@ resource "null_resource" "kubectl" {
     command    = "kubectl config get-contexts | grep ${google_container_cluster.cluster.name} | xargs -n1 kubectl config delete-context"
   }
 }
-
-resource "null_resource" "helm" {
-  count      = "${var.init_cli ? 1 : 0 }"
-  depends_on = ["null_resource.kubectl"]
-
-  triggers = {
-    cluster = "${google_container_cluster.cluster.id}"
-  }
-
-  provisioner "local-exec" {
-    command = <<EOF
-kubectl apply -f '${local.service_account_path}'
-helm init --service-account helm
-EOF
-  }
-}
diff --git a/test/terraform/service-account.yaml b/test/terraform/service-account.yaml
deleted file mode 100644
index 05d1846..0000000
--- a/test/terraform/service-account.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: helm
-  namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  name: helm
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-  - kind: ServiceAccount
-    name: helm
-    namespace: kube-system
diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf
index 5fc445b..971af4e 100644
--- a/test/terraform/variables.tf
+++ b/test/terraform/variables.tf
@@ -15,7 +15,7 @@ variable "zone" {
 
 variable "init_cli" {
   default     = true
-  description = "Whether to init the CLI tools kubectl, helm, etc. or not."
+  description = "Whether to init kubectl or not."
 }
 
 variable "gcp_service_account" {
diff --git a/test/unit/injector-clusterrole.bats b/test/unit/injector-clusterrole.bats
index 4c5c1d9..7c25f39 100755
--- a/test/unit/injector-clusterrole.bats
+++ b/test/unit/injector-clusterrole.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "injector/ClusterRole: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-clusterrole.yaml  \
+      --show-only templates/injector-clusterrole.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -13,10 +13,10 @@ load _helpers
 
 @test "injector/ClusterRole: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-clusterrole.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-clusterrole.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
diff --git a/test/unit/injector-clusterrolebinding.bats b/test/unit/injector-clusterrolebinding.bats
index efeab4c..6e21787 100755
--- a/test/unit/injector-clusterrolebinding.bats
+++ b/test/unit/injector-clusterrolebinding.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "injector/ClusterRoleBinding: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-clusterrolebinding.yaml  \
+      --show-only templates/injector-clusterrolebinding.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -13,10 +13,10 @@ load _helpers
 
 @test "injector/ClusterRoleBinding: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-clusterrolebinding.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
diff --git a/test/unit/injector-deployment.bats b/test/unit/injector-deployment.bats
index cdb07ce..1f6caaa 100755
--- a/test/unit/injector-deployment.bats
+++ b/test/unit/injector-deployment.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "injector/deployment: default injector.enabled" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -14,7 +14,7 @@ load _helpers
 @test "injector/deployment: enable with injector.enabled true" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -23,11 +23,11 @@ load _helpers
 
 @test "injector/deployment: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-deployment.yaml  \
       --set 'global.enabled=false' \
       --set 'injector.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -35,7 +35,7 @@ load _helpers
 @test "injector/deployment: image defaults to injector.image" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.image.repository=foo' \
       --set 'injector.image.tag=1.2.3' \
       . | tee /dev/stderr |
@@ -43,7 +43,7 @@ load _helpers
   [ "${actual}" = "foo:1.2.3" ]
 
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.image.repository=foo' \
       --set 'injector.image.tag=1.2.3' \
       . | tee /dev/stderr |
@@ -54,7 +54,7 @@ load _helpers
 @test "injector/deployment: default imagePullPolicy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].imagePullPolicy' | tee /dev/stderr)
   [ "${actual}" = "IfNotPresent" ]
@@ -63,7 +63,7 @@ load _helpers
 @test "injector/deployment: default resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -72,7 +72,7 @@ load _helpers
 @test "injector/deployment: custom resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.enabled=true' \
       --set 'injector.resources.requests.memory=256Mi' \
       --set 'injector.resources.requests.cpu=250m' \
@@ -81,7 +81,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.enabled=true' \
       --set 'injector.resources.limits.memory=256Mi' \
       --set 'injector.resources.limits.cpu=250m' \
@@ -90,7 +90,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml \
+      --show-only templates/injector-deployment.yaml \
       --set 'injector.enabled=true' \
       --set 'injector.resources.requests.cpu=250m' \
       . | tee /dev/stderr |
@@ -98,7 +98,7 @@ load _helpers
   [ "${actual}" = "250m" ]
 
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml \
+      --show-only templates/injector-deployment.yaml \
       --set 'injector.enabled=true' \
       --set 'injector.resources.limits.cpu=250m' \
       . | tee /dev/stderr |
@@ -109,7 +109,7 @@ load _helpers
 @test "injector/deployment: manual TLS environment vars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       --set 'injector.certs.secretName=foobar' \
       --set 'injector.certs.certName=test.crt' \
       --set 'injector.certs.keyName=test.key' \
@@ -136,13 +136,13 @@ load _helpers
 @test "injector/deployment: auto TLS by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].volumeMounts | length' | tee /dev/stderr)
   [ "${actual}" = "0" ]
 
   local object=$(helm template \
-      -x templates/injector-deployment.yaml  \
+      --show-only templates/injector-deployment.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
 
diff --git a/test/unit/injector-mutating-webhook.bats b/test/unit/injector-mutating-webhook.bats
index dd0d643..2eefcf2 100755
--- a/test/unit/injector-mutating-webhook.bats
+++ b/test/unit/injector-mutating-webhook.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "injector/MutatingWebhookConfiguration: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+      --show-only templates/injector-mutating-webhook.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -13,20 +13,20 @@ load _helpers
 
 @test "injector/MutatingWebhookConfiguration: disable with global.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "injector/MutatingWebhookConfiguration: disable with injector.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'injector.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -34,7 +34,7 @@ load _helpers
 @test "injector/MutatingWebhookConfiguration: namespace is set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'injector.enabled=true' \
       --namespace foo \
       . | tee /dev/stderr |
@@ -45,7 +45,7 @@ load _helpers
 @test "injector/MutatingWebhookConfiguration: caBundle is empty" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'injector.enabled=true' \
       --namespace foo \
       . | tee /dev/stderr |
@@ -56,7 +56,7 @@ load _helpers
 @test "injector/MutatingWebhookConfiguration: namespaceSelector empty by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'injector.enabled=true' \
       --namespace foo \
       . | tee /dev/stderr |
@@ -67,7 +67,7 @@ load _helpers
 @test "injector/MutatingWebhookConfiguration: can set namespaceSelector" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-mutating-webhook.yaml  \
+      --show-only templates/injector-mutating-webhook.yaml  \
       --set 'injector.enabled=true' \
       --set 'injector.namespaceSelector.matchLabels.injector=true' \
       . | tee /dev/stderr |
diff --git a/test/unit/injector-service.bats b/test/unit/injector-service.bats
index 03f908f..af8787d 100755
--- a/test/unit/injector-service.bats
+++ b/test/unit/injector-service.bats
@@ -5,13 +5,13 @@ load _helpers
 @test "injector/Service: service enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-service.yaml \
+      --show-only templates/injector-service.yaml \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/injector-service.yaml \
+      --show-only templates/injector-service.yaml \
       --set 'injector.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -20,18 +20,18 @@ load _helpers
 
 @test "injector/Service: disable with global.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-service.yaml \
+  local actual=$( (helm template \
+      --show-only templates/injector-service.yaml \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/injector-service.yaml \
+  local actual=$( (helm template \
+      --show-only templates/injector-service.yaml \
       --set 'global.enabled=false' \
       --set 'injector.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
diff --git a/test/unit/injector-serviceaccount.bats b/test/unit/injector-serviceaccount.bats
index 7009a76..1055d90 100755
--- a/test/unit/injector-serviceaccount.bats
+++ b/test/unit/injector-serviceaccount.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "injector/ServiceAccount: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/injector-serviceaccount.yaml  \
+      --show-only templates/injector-serviceaccount.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -13,10 +13,10 @@ load _helpers
 
 @test "injector/ServiceAccount: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/injector-serviceaccount.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/injector-serviceaccount.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
diff --git a/test/unit/server-clusterrolebinding.bats b/test/unit/server-clusterrolebinding.bats
index 7d140b8..d1245c4 100755
--- a/test/unit/server-clusterrolebinding.bats
+++ b/test/unit/server-clusterrolebinding.bats
@@ -4,59 +4,59 @@ load _helpers
 
 @test "server/ClusterRoleBinding: enabled by default" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'server.ha.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
-      . | tee /dev/stderr |
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 }
 
 @test "server/ClusterRoleBinding: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/ClusterRoleBinding: can disable with server.authDelegator" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'server.authDelegator.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'server.authDelegator.enabled=false' \
       --set 'server.ha.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-clusterrolebinding.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-clusterrolebinding.yaml  \
       --set 'server.authDelegator.enabled=false' \
       --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
diff --git a/test/unit/server-configmap.bats b/test/unit/server-configmap.bats
index 7a66c53..679a76f 100755
--- a/test/unit/server-configmap.bats
+++ b/test/unit/server-configmap.bats
@@ -5,20 +5,20 @@ load _helpers
 @test "server/ConfigMap: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml \
+      --show-only templates/server-config-configmap.yaml \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml \
+      --show-only templates/server-config-configmap.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml \
+      --show-only templates/server-config-configmap.yaml \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -27,20 +27,20 @@ load _helpers
 
 @test "server/ConfigMap: disabled by server.dev.enabled true" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-config-configmap.yaml \
+  local actual=$( (helm template \
+      --show-only templates/server-config-configmap.yaml \
       --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/ConfigMap: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-config-configmap.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-config-configmap.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -48,7 +48,7 @@ load _helpers
 @test "server/ConfigMap: standalone extraConfig is set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml  \
+      --show-only templates/server-config-configmap.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.standalone.config="{\"hello\": \"world\"}"' \
       . | tee /dev/stderr |
@@ -56,7 +56,7 @@ load _helpers
   [ ! -z "${actual}" ]
 
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml  \
+      --show-only templates/server-config-configmap.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.standalone.config="{\"foo\": \"bar\"}"' \
       . | tee /dev/stderr |
@@ -67,7 +67,7 @@ load _helpers
 @test "server/ConfigMap: ha extraConfig is set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml  \
+      --show-only templates/server-config-configmap.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.config="{\"hello\": \"world\"}"' \
       . | tee /dev/stderr |
@@ -75,7 +75,7 @@ load _helpers
   [ ! -z "${actual}" ]
 
   local actual=$(helm template \
-      -x templates/server-config-configmap.yaml  \
+      --show-only templates/server-config-configmap.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.config="{\"foo\": \"bar\"}"' \
       . | tee /dev/stderr |
diff --git a/test/unit/server-dev-statefulset.bats b/test/unit/server-dev-statefulset.bats
index 5f1e45a..57acd20 100755
--- a/test/unit/server-dev-statefulset.bats
+++ b/test/unit/server-dev-statefulset.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "server/dev-StatefulSet: enable with server.dev.enabled true" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -14,11 +14,11 @@ load _helpers
 
 @test "server/dev-StatefulSet: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.enabled=false' \
       --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -26,7 +26,7 @@ load _helpers
 @test "server/dev-StatefulSet: image defaults to server.image.repository:tag" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=1.2.3' \
       --set 'server.dev.enabled=true' \
@@ -39,7 +39,7 @@ load _helpers
   cd `chart_dir`
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=' \
       --set 'server.dev.enabled=true' \
@@ -54,7 +54,7 @@ load _helpers
 @test "server/dev-StatefulSet: default replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.replicas' | tee /dev/stderr)
@@ -64,7 +64,7 @@ load _helpers
 @test "server/dev-StatefulSet: cant set replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.dev.replicas=100' \
       . | tee /dev/stderr |
@@ -78,7 +78,7 @@ load _helpers
 @test "server/dev-StatefulSet: updateStrategy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.updateStrategy.type' | tee /dev/stderr)
@@ -91,7 +91,7 @@ load _helpers
 @test "server/dev-StatefulSet: default resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
@@ -101,7 +101,7 @@ load _helpers
 @test "server/dev-StatefulSet: custom resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.resources.requests.memory=256Mi' \
       --set 'server.resources.requests.cpu=250m' \
@@ -110,7 +110,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.resources.limits.memory=256Mi' \
       --set 'server.resources.limits.cpu=250m' \
@@ -119,7 +119,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.resources.requests.cpu=250m' \
       . | tee /dev/stderr |
@@ -127,7 +127,7 @@ load _helpers
   [ "${actual}" = "250m" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.resources.limits.cpu=250m' \
       . | tee /dev/stderr |
@@ -143,7 +143,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -160,7 +160,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -181,7 +181,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.extraVolumes[0].type=secret' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -198,7 +198,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -217,7 +217,7 @@ load _helpers
 @test "server/dev-StatefulSet: no storageClass on claim by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.volumeClaimTemplates[0].spec.storageClassName' | tee /dev/stderr)
@@ -230,7 +230,7 @@ load _helpers
 @test "server/dev-StatefulSet: set extraEnvironmentVars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.extraEnvironmentVars.FOO=bar' \
       --set 'server.extraEnvironmentVars.FOOBAR=foobar' \
@@ -260,7 +260,7 @@ load _helpers
 @test "server/dev-StatefulSet: set extraSecretEnvironmentVars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraSecretEnvironmentVars[0].envName=ENV_FOO_0' \
       --set 'server.extraSecretEnvironmentVars[0].secretName=secret_name_0' \
       --set 'server.extraSecretEnvironmentVars[0].secretKey=secret_key_0' \
@@ -297,7 +297,7 @@ load _helpers
 @test "server/dev-StatefulSet: can't set storageClass" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
       --set 'server.dataStorage.storageClass=foo' \
@@ -306,7 +306,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.auditStorage.storageClass=foo' \
@@ -315,7 +315,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.auditStorage.storageClass=foo' \
@@ -331,7 +331,7 @@ load _helpers
 @test "server/dev-StatefulSet: uid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsUser' | tee /dev/stderr)
@@ -341,7 +341,7 @@ load _helpers
 @test "server/dev-StatefulSet: uid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.uid=2000' \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
@@ -352,7 +352,7 @@ load _helpers
 @test "server/dev-StatefulSet: gid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsGroup' | tee /dev/stderr)
@@ -362,7 +362,7 @@ load _helpers
 @test "server/dev-StatefulSet: gid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
@@ -373,7 +373,7 @@ load _helpers
 @test "server/dev-StatefulSet: fsgroup default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.fsGroup' | tee /dev/stderr)
@@ -383,7 +383,7 @@ load _helpers
 @test "server/dev-StatefulSet: fsgroup configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
diff --git a/test/unit/server-ha-disruptionbudget.bats b/test/unit/server-ha-disruptionbudget.bats
index 6e60707..2c0174a 100755
--- a/test/unit/server-ha-disruptionbudget.bats
+++ b/test/unit/server-ha-disruptionbudget.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "server/DisruptionBudget: enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -14,31 +14,31 @@ load _helpers
 
 @test "server/DisruptionBudget: disable with server.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'globa.enabled=false' \
       --set 'server.ha.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/DisruptionBudget: disable with server.disruptionBudget.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'server.ha.disruptionBudget.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/DisruptionBudget: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'global.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -46,7 +46,7 @@ load _helpers
 @test "server/DisruptionBudget: correct maxUnavailable with n=1" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.replicas=1' \
       . | tee /dev/stderr |
@@ -57,7 +57,7 @@ load _helpers
 @test "server/DisruptionBudget: correct maxUnavailable with n=3" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.replicas=3' \
       . | tee /dev/stderr |
@@ -68,7 +68,7 @@ load _helpers
 @test "server/DisruptionBudget: correct maxUnavailable with n=5" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-disruptionbudget.yaml  \
+      --show-only templates/server-disruptionbudget.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.replicas=5' \
       . | tee /dev/stderr |
diff --git a/test/unit/server-ha-statefulset.bats b/test/unit/server-ha-statefulset.bats
index 5f05c3c..a40e92f 100755
--- a/test/unit/server-ha-statefulset.bats
+++ b/test/unit/server-ha-statefulset.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "server/ha-StatefulSet: enable with server.ha.enabled true" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -14,11 +14,11 @@ load _helpers
 
 @test "server/ha-StatefulSet: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.enabled=false' \
       --set 'server.ha.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -26,7 +26,7 @@ load _helpers
 @test "server/ha-StatefulSet: image defaults to server.image.repository:tag" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=1.2.3' \
       --set 'server.ha.enabled=true' \
@@ -39,7 +39,7 @@ load _helpers
   cd `chart_dir`
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=' \
       --set 'server.ha.enabled=true' \
@@ -54,7 +54,7 @@ load _helpers
 @test "server/ha-StatefulSet: tls disabled" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.tlsDisable=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
@@ -70,7 +70,7 @@ load _helpers
 @test "server/ha-StatefulSet: tls enabled" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.tlsDisable=false' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
@@ -90,7 +90,7 @@ load _helpers
 @test "server/ha-StatefulSet: OnDelete updateStrategy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.updateStrategy.type' | tee /dev/stderr)
@@ -100,7 +100,7 @@ load _helpers
 @test "server/ha-StatefulSet: RollingUpdate updateStrategy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.updateStrategyType="RollingUpdate"' \
       . | tee /dev/stderr |
@@ -114,14 +114,14 @@ load _helpers
 @test "server/ha-StatefulSet: default affinity" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.affinity' | tee /dev/stderr)
   [ "${actual}" != "null" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.affinity=' \
       . | tee /dev/stderr |
@@ -135,7 +135,7 @@ load _helpers
 @test "server/ha-StatefulSet: default replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.replicas' | tee /dev/stderr)
@@ -145,7 +145,7 @@ load _helpers
 @test "server/ha-StatefulSet: custom replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.ha.replicas=10' \
       . | tee /dev/stderr |
@@ -159,7 +159,7 @@ load _helpers
 @test "server/ha-StatefulSet: default resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
@@ -169,7 +169,7 @@ load _helpers
 @test "server/ha-StatefulSet: custom resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.resources.requests.memory=256Mi' \
       --set 'server.resources.requests.cpu=250m' \
@@ -178,7 +178,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.resources.limits.memory=256Mi' \
       --set 'server.resources.limits.cpu=250m' \
@@ -187,7 +187,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.resources.requests.cpu=250m' \
       . | tee /dev/stderr |
@@ -195,7 +195,7 @@ load _helpers
   [ "${actual}" = "250m" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.resources.limits.cpu=250m' \
       . | tee /dev/stderr |
@@ -210,7 +210,7 @@ load _helpers
   cd `chart_dir`
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -227,7 +227,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -247,7 +247,7 @@ load _helpers
   cd `chart_dir`
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -269,7 +269,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -291,7 +291,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=secret' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -308,7 +308,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -330,7 +330,7 @@ load _helpers
 @test "server/ha-StatefulSet: set extraEnvironmentVars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraEnvironmentVars.FOO=bar' \
       --set 'server.extraEnvironmentVars.FOOBAR=foobar' \
@@ -360,7 +360,7 @@ load _helpers
 @test "server/ha-StatefulSet: set extraSecretEnvironmentVars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.extraSecretEnvironmentVars[0].envName=ENV_FOO_0' \
       --set 'server.extraSecretEnvironmentVars[0].secretName=secret_name_0' \
@@ -398,7 +398,7 @@ load _helpers
 @test "server/ha-StatefulSet: no storage by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.volumeClaimTemplates | length' | tee /dev/stderr)
@@ -409,7 +409,7 @@ load _helpers
 @test "server/ha-StatefulSet: cant set data storage" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
       --set 'server.dataStorage.storageClass=foo' \
@@ -421,7 +421,7 @@ load _helpers
 @test "server/ha-StatefulSet: can set storageClass" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.dataStorage.enabled=false' \
       --set 'server.auditStorage.enabled=true' \
@@ -434,7 +434,7 @@ load _helpers
 @test "server/ha-StatefulSet: can disable storage" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.auditStorage.enabled=false' \
       --set 'server.dataStorage.enabled=false' \
@@ -443,7 +443,7 @@ load _helpers
   [ "${actual}" = "0" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=false' \
@@ -455,7 +455,7 @@ load _helpers
 @test "server/ha-StatefulSet: can mount audit" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       . | tee /dev/stderr |
@@ -465,7 +465,7 @@ load _helpers
 @test "server/ha-StatefulSet: no data storage" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.auditStorage.enabled=false' \
       --set 'server.dataStorage.enabled=true' \
@@ -474,7 +474,7 @@ load _helpers
   [ "${actual}" = "0" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
@@ -486,7 +486,7 @@ load _helpers
 @test "server/ha-StatefulSet: tolerations not set by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq '.spec.template.spec | .tolerations? == null' | tee /dev/stderr)
@@ -496,7 +496,7 @@ load _helpers
 @test "server/ha-StatefulSet: tolerations can be set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.tolerations=foobar' \
       . | tee /dev/stderr |
@@ -507,7 +507,7 @@ load _helpers
 @test "server/ha-StatefulSet: nodeSelector is not set by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq '.spec.template.spec.nodeSelector' | tee /dev/stderr)
@@ -517,7 +517,7 @@ load _helpers
 @test "server/ha-StatefulSet: specified nodeSelector" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.ha.enabled=true' \
       --set 'server.nodeSelector=testing' \
       . | tee /dev/stderr |
@@ -530,7 +530,7 @@ load _helpers
 @test "server/ha-StatefulSet: uid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsUser' | tee /dev/stderr)
@@ -540,7 +540,7 @@ load _helpers
 @test "server/ha-StatefulSet: uid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.uid=2000' \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
@@ -551,7 +551,7 @@ load _helpers
 @test "server/ha-StatefulSet: gid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsGroup' | tee /dev/stderr)
@@ -561,7 +561,7 @@ load _helpers
 @test "server/ha-StatefulSet: gid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
@@ -572,7 +572,7 @@ load _helpers
 @test "server/ha-StatefulSet: fsgroup default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.fsGroup' | tee /dev/stderr)
@@ -582,7 +582,7 @@ load _helpers
 @test "server/ha-StatefulSet: fsgroup configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
diff --git a/test/unit/server-ingress.bats b/test/unit/server-ingress.bats
index b0950ca..1cf1576 100755
--- a/test/unit/server-ingress.bats
+++ b/test/unit/server-ingress.bats
@@ -4,9 +4,9 @@ load _helpers
 
 @test "server/ingress: disabled by default" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-ingress.yaml  \
-      . | tee /dev/stderr |
+  local actual=$( (helm template \
+      --show-only templates/server-ingress.yaml  \
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -14,7 +14,7 @@ load _helpers
 @test "server/ingress: checking host entry gets added and path is /" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-ingress.yaml \
+      --show-only templates/server-ingress.yaml \
       --set 'server.ingress.enabled=true' \
       --set 'server.ingress.hosts[0].host=test.com' \
       --set 'server.ingress.hosts[0].paths[0]=/' \
@@ -23,7 +23,7 @@ load _helpers
   [ "${actual}" = 'test.com' ]
 
   local actual=$(helm template \
-      -x templates/server-ingress.yaml \
+      --show-only templates/server-ingress.yaml \
       --set 'server.ingress.enabled=true' \
       --set 'server.ingress.hosts[0].host=test.com' \
       --set 'server.ingress.hosts[0].paths[0]=/' \
@@ -36,7 +36,7 @@ load _helpers
   cd `chart_dir`
 
   local actual=$(helm template \
-      -x templates/server-ingress.yaml \
+      --show-only templates/server-ingress.yaml \
       --set 'server.ingress.enabled=true' \
       --set 'server.ingress.hosts[0].host=test.com' \
       --set 'server.ingress.hosts[0].paths[0]=/' \
@@ -50,11 +50,11 @@ load _helpers
   cd `chart_dir`
 
   local actual=$(helm template \
-      -x templates/server-ingress.yaml \
+      --show-only templates/server-ingress.yaml \
       --set 'server.ingress.enabled=true' \
       --set 'server.ingress.labels.traffic=external' \
       --set 'server.ingress.labels.team=dev' \
       . | tee /dev/stderr |
       yq -r '.metadata.labels.traffic' | tee /dev/stderr)
   [ "${actual}" = "external" ]
-}
\ No newline at end of file
+}
diff --git a/test/unit/server-service.bats b/test/unit/server-service.bats
index c276c43..adcf95f 100755
--- a/test/unit/server-service.bats
+++ b/test/unit/server-service.bats
@@ -5,111 +5,110 @@ load _helpers
 @test "server/Service: service enabled by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 }
 
-
 @test "server/Service: disable with global.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/Service: disable with server.service.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "server/Service: disable with global.enabled false server.service.enabled false" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/server-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'global.enabled=false' \
       --set 'server.service.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -119,21 +118,21 @@ load _helpers
 @test "server/Service: tolerates unready endpoints" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
@@ -143,7 +142,7 @@ load _helpers
 @test "server/Service: generic annotations" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.annotations.vaultIsAwesome=true' \
       . | tee /dev/stderr |
       yq -r '.metadata.annotations["vaultIsAwesome"]' | tee /dev/stderr)
@@ -153,21 +152,21 @@ load _helpers
 @test "server/Service: publish not ready" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.publishNotReadyAddresses' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.publishNotReadyAddresses' | tee /dev/stderr)
   [ "${actual}" = "true" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.publishNotReadyAddresses' | tee /dev/stderr)
@@ -177,21 +176,21 @@ load _helpers
 @test "server/Service: type empty by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.type' | tee /dev/stderr)
   [ "${actual}" = "null" ]
 
     local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.type' | tee /dev/stderr)
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.type' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -200,7 +199,7 @@ load _helpers
 @test "server/Service: type can set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       --set 'server.service.type=NodePort' \
       . | tee /dev/stderr |
@@ -208,7 +207,7 @@ load _helpers
   [ "${actual}" = "NodePort" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       --set 'server.service.type=NodePort' \
       . | tee /dev/stderr |
@@ -216,7 +215,7 @@ load _helpers
   [ "${actual}" = "NodePort" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.type=NodePort' \
       . | tee /dev/stderr |
       yq -r '.spec.type' | tee /dev/stderr)
@@ -226,21 +225,21 @@ load _helpers
 @test "server/Service: clusterIP empty by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.clusterIP' | tee /dev/stderr)
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.clusterIP' | tee /dev/stderr)
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.clusterIP' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -249,7 +248,7 @@ load _helpers
 @test "server/Service: clusterIP can set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       --set 'server.service.clusterIP=None' \
       . | tee /dev/stderr |
@@ -257,7 +256,7 @@ load _helpers
   [ "${actual}" = "None" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       --set 'server.service.clusterIP=None' \
       . | tee /dev/stderr |
@@ -265,7 +264,7 @@ load _helpers
   [ "${actual}" = "None" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.clusterIP=None' \
       . | tee /dev/stderr |
       yq -r '.spec.clusterIP' | tee /dev/stderr)
@@ -275,13 +274,13 @@ load _helpers
 @test "server/Service: port and targetPort will be 8200 by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.ports[0].port' | tee /dev/stderr)
   [ "${actual}" = "8200" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.ports[0].targetPort' | tee /dev/stderr)
   [ "${actual}" = "8200" ]
@@ -290,14 +289,14 @@ load _helpers
 @test "server/Service: port and targetPort can be set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.port=8000' \
       . | tee /dev/stderr |
       yq -r '.spec.ports[0].port' | tee /dev/stderr)
   [ "${actual}" = "8000" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.targetPort=80' \
       . | tee /dev/stderr |
       yq -r '.spec.ports[0].targetPort' | tee /dev/stderr)
@@ -307,7 +306,7 @@ load _helpers
 @test "server/Service: nodeport can set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       --set 'server.service.type=NodePort' \
       --set 'server.service.nodePort=30008' \
@@ -316,7 +315,7 @@ load _helpers
   [ "${actual}" = "30008" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       --set 'server.service.type=NodePort' \
       --set 'server.service.nodePort=30009' \
@@ -325,7 +324,7 @@ load _helpers
   [ "${actual}" = "30009" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.service.type=NodePort' \
       --set 'server.service.nodePort=30010' \
       . | tee /dev/stderr |
@@ -336,7 +335,7 @@ load _helpers
 @test "server/Service: nodeport can't set when type isn't NodePort" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.dev.enabled=true' \
       --set 'server.service.nodePort=30008' \
       . | tee /dev/stderr |
@@ -344,7 +343,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.ha.enabled=true' \
       --set 'server.service.nodePort=30009' \
       . | tee /dev/stderr |
@@ -352,7 +351,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-service.yaml \
+      --show-only templates/server-service.yaml \
       --set 'server.standalone.enabled=true' \
       --set 'server.service.nodePort=30010' \
       . | tee /dev/stderr |
diff --git a/test/unit/server-serviceaccount.bats b/test/unit/server-serviceaccount.bats
index 23c4841..66fd84b 100755
--- a/test/unit/server-serviceaccount.bats
+++ b/test/unit/server-serviceaccount.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "server/ServiceAccount: specify annotations" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-serviceaccount.yaml  \
+      --show-only templates/server-serviceaccount.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'server.serviceAccount.annotations.foo=bar' \
       . | tee /dev/stderr |
@@ -13,7 +13,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-serviceaccount.yaml  \
+      --show-only templates/server-serviceaccount.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'server.serviceAccount.annotations.foo=bar' \
       . | tee /dev/stderr |
@@ -21,7 +21,7 @@ load _helpers
   [ "${actual}" = "bar" ]
 
   local actual=$(helm template \
-      -x templates/server-serviceaccount.yaml  \
+      --show-only templates/server-serviceaccount.yaml  \
       --set 'server.ha.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.metadata.annotations["foo"]' | tee /dev/stderr)
diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats
index 60b54c8..059e1c4 100755
--- a/test/unit/server-statefulset.bats
+++ b/test/unit/server-statefulset.bats
@@ -5,7 +5,7 @@ load _helpers
 @test "server/standalone-StatefulSet: default server.standalone.enabled" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -14,7 +14,7 @@ load _helpers
 @test "server/standalone-StatefulSet: enable with server.standalone.enabled true" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
@@ -23,11 +23,11 @@ load _helpers
 
 @test "server/standalone-StatefulSet: disable with global.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.enabled=false' \
       --set 'server.standalone.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -35,7 +35,7 @@ load _helpers
 @test "server/standalone-StatefulSet: image defaults to server.image.repository:tag" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=1.2.3' \
       . | tee /dev/stderr |
@@ -43,7 +43,7 @@ load _helpers
   [ "${actual}" = "foo:1.2.3" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=1.2.3' \
       --set 'server.standalone.enabled=true' \
@@ -55,7 +55,7 @@ load _helpers
 @test "server/standalone-StatefulSet: image tag defaults to latest" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=' \
       . | tee /dev/stderr |
@@ -63,7 +63,7 @@ load _helpers
   [ "${actual}" = "foo:latest" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.repository=foo' \
       --set 'server.image.tag=' \
       --set 'server.standalone.enabled=true' \
@@ -75,7 +75,7 @@ load _helpers
 @test "server/standalone-StatefulSet: default imagePullPolicy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].imagePullPolicy' | tee /dev/stderr)
   [ "${actual}" = "IfNotPresent" ]
@@ -84,7 +84,7 @@ load _helpers
 @test "server/standalone-StatefulSet: Custom imagePullPolicy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.image.pullPolicy=Always' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].imagePullPolicy' | tee /dev/stderr)
@@ -94,7 +94,7 @@ load _helpers
 @test "server/standalone-StatefulSet: Custom imagePullSecrets" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'global.imagePullSecrets[0].name=foo' \
       --set 'global.imagePullSecrets[1].name=bar' \
       . | tee /dev/stderr |
@@ -112,7 +112,7 @@ load _helpers
 @test "server/standalone-StatefulSet: default imagePullSecrets" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.imagePullSecrets' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -124,7 +124,7 @@ load _helpers
 @test "server/standalone-StatefulSet: OnDelete updateStrategy" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.updateStrategy.type' | tee /dev/stderr)
   [ "${actual}" = "OnDelete" ]
@@ -136,7 +136,7 @@ load _helpers
 @test "server/standalone-StatefulSet: default replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.replicas' | tee /dev/stderr)
@@ -146,14 +146,14 @@ load _helpers
 @test "server/standalone-StatefulSet: custom replicas" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.replicas=100' \
       . | tee /dev/stderr |
       yq -r '.spec.replicas' | tee /dev/stderr)
   [ "${actual}" = "1" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.standalone.replicas=100' \
       . | tee /dev/stderr |
@@ -167,7 +167,7 @@ load _helpers
 @test "server/standalone-StatefulSet: default resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].resources' | tee /dev/stderr)
@@ -177,7 +177,7 @@ load _helpers
 @test "server/standalone-StatefulSet: custom resources" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.resources.requests.memory=256Mi' \
       --set 'server.resources.requests.cpu=250m' \
@@ -186,7 +186,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.resources.limits.memory=256Mi' \
       --set 'server.resources.limits.cpu=250m' \
@@ -195,7 +195,7 @@ load _helpers
   [ "${actual}" = "256Mi" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.resources.requests.cpu=250m' \
       . | tee /dev/stderr |
@@ -203,7 +203,7 @@ load _helpers
   [ "${actual}" = "250m" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.resources.limits.cpu=250m' \
       . | tee /dev/stderr |
@@ -219,7 +219,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
       . | tee /dev/stderr |
@@ -234,7 +234,7 @@ load _helpers
   [ "${actual}" = "null" ]
 
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -251,7 +251,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
       . | tee /dev/stderr |
@@ -266,7 +266,7 @@ load _helpers
   [ "${actual}" = "/vault/userconfig/foo" ]
 
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -287,7 +287,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraVolumes[0].type=secret' \
       --set 'server.extraVolumes[0].name=foo' \
       . | tee /dev/stderr |
@@ -302,7 +302,7 @@ load _helpers
   [ "${actual}" = "foo" ]
 
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.extraVolumes[0].type=secret' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -319,7 +319,7 @@ load _helpers
 
   # Test that it mounts it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
       . | tee /dev/stderr |
@@ -334,7 +334,7 @@ load _helpers
   [ "${actual}" = "/vault/userconfig/foo" ]
 
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.extraVolumes[0].type=configMap' \
       --set 'server.extraVolumes[0].name=foo' \
@@ -353,7 +353,7 @@ load _helpers
 @test "server/standalone-StatefulSet: can mount audit" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].volumeMounts[] | select(.name == "audit")' | tee /dev/stderr)
@@ -365,7 +365,7 @@ load _helpers
 @test "server/standalone-StatefulSet: set extraEnvironmentVars" {
   cd `chart_dir`
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.stanadlone.enabled=true' \
       --set 'server.extraEnvironmentVars.FOO=bar' \
       --set 'server.extraEnvironmentVars.FOOBAR=foobar' \
@@ -389,7 +389,7 @@ load _helpers
   [ "${actual}" = "foobar" ]
 
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraEnvironmentVars.FOO=bar' \
       --set 'server.extraEnvironmentVars.FOOBAR=foobar' \
       . | tee /dev/stderr |
@@ -418,13 +418,13 @@ load _helpers
 @test "server/standalone-StatefulSet: storageClass on claim by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.volumeClaimTemplates[0].spec.storageClassName' | tee /dev/stderr)
   [ "${actual}" = "null" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.volumeClaimTemplates[0].spec.storageClassName' | tee /dev/stderr)
@@ -435,7 +435,7 @@ load _helpers
 @test "server/standalone-StatefulSet: can set storageClass" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.dataStorage.enabled=true' \
       --set 'server.dataStorage.storageClass=foo' \
       . | tee /dev/stderr |
@@ -443,7 +443,7 @@ load _helpers
   [ "${actual}" = "foo" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.dataStorage.enabled=false' \
       --set 'server.auditStorage.enabled=true' \
@@ -453,7 +453,7 @@ load _helpers
   [ "${actual}" = "foo" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.auditStorage.storageClass=foo' \
@@ -462,7 +462,7 @@ load _helpers
   [ "${actual}" = "foo" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
       . | tee /dev/stderr |
@@ -470,7 +470,7 @@ load _helpers
   [ "${actual}" = "2" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
@@ -482,7 +482,7 @@ load _helpers
 @test "server/standalone-StatefulSet: can disable storage" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=false' \
       --set 'server.dataStorage.enabled=true' \
       . | tee /dev/stderr |
@@ -490,7 +490,7 @@ load _helpers
   [ "${actual}" = "1" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=false' \
       . | tee /dev/stderr |
@@ -498,7 +498,7 @@ load _helpers
   [ "${actual}" = "1" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=false' \
       --set 'server.dataStorage.enabled=true' \
@@ -507,7 +507,7 @@ load _helpers
   [ "${actual}" = "1" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=false' \
@@ -516,7 +516,7 @@ load _helpers
   [ "${actual}" = "1" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
       . | tee /dev/stderr |
@@ -524,7 +524,7 @@ load _helpers
   [ "${actual}" = "2" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=true' \
       --set 'server.dataStorage.enabled=true' \
@@ -533,7 +533,7 @@ load _helpers
   [ "${actual}" = "2" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.auditStorage.enabled=fa;se' \
       --set 'server.dataStorage.enabled=false' \
       . | tee /dev/stderr |
@@ -541,7 +541,7 @@ load _helpers
   [ "${actual}" = "0" ]
 
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'server.auditStorage.enabled=false' \
       --set 'server.dataStorage.enabled=false' \
@@ -553,7 +553,7 @@ load _helpers
 @test "server/standalone-StatefulSet: tolerations not set by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq '.spec.template.spec | .tolerations? == null' | tee /dev/stderr)
   [ "${actual}" = "true" ]
@@ -562,7 +562,7 @@ load _helpers
 @test "server/standalone-StatefulSet: tolerations can be set" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.tolerations=foobar' \
       . | tee /dev/stderr |
       yq '.spec.template.spec.tolerations == "foobar"' | tee /dev/stderr)
@@ -572,7 +572,7 @@ load _helpers
 @test "server/standalone-StatefulSet: nodeSelector is not set by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq '.spec.template.spec.nodeSelector' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -581,7 +581,7 @@ load _helpers
 @test "server/standalone-StatefulSet: specified nodeSelector" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.nodeSelector=testing' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.nodeSelector' | tee /dev/stderr)
@@ -596,7 +596,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraContainers[0].image=test-image' \
       --set 'server.extraContainers[0].name=test-container' \
       --set 'server.extraContainers[0].ports[0].name=test-port' \
@@ -642,7 +642,7 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.extraContainers[0].image=test-image' \
       --set 'server.extraContainers[0].name=test-container' \
       --set 'server.extraContainers[1].image=test-image' \
@@ -661,13 +661,13 @@ load _helpers
 
   # Test that it defines it
   local object=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers' | tee /dev/stderr)
 
   local containers_count=$(echo $object |
       yq -r 'length' | tee /dev/stderr)
-  [ "${containers_count}" = 1 ]  
+  [ "${containers_count}" = 1 ]
 }
 
 # sharedProcessNamespace
@@ -677,7 +677,7 @@ load _helpers
 
   # Test that it defines it
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.shareProcessNamespace' | tee /dev/stderr)
 
@@ -689,7 +689,7 @@ load _helpers
 
   # Test that it defines it
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
+      --show-only templates/server-statefulset.yaml  \
       --set 'server.shareProcessNamespace=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.shareProcessNamespace' | tee /dev/stderr)
@@ -702,7 +702,7 @@ load _helpers
 @test "server/standalone-StatefulSet: specify extraLabels" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.extraLabels.foo=bar' \
       . | tee /dev/stderr |
       yq -r '.spec.template.metadata.labels.foo' | tee /dev/stderr)
@@ -715,7 +715,7 @@ load _helpers
 @test "server/standalone-StatefulSet: uid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsUser' | tee /dev/stderr)
   [ "${actual}" = "100" ]
@@ -724,7 +724,7 @@ load _helpers
 @test "server/standalone-StatefulSet: uid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.uid=2000' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsUser' | tee /dev/stderr)
@@ -734,7 +734,7 @@ load _helpers
 @test "server/standalone-StatefulSet: gid default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsGroup' | tee /dev/stderr)
   [ "${actual}" = "1000" ]
@@ -743,7 +743,7 @@ load _helpers
 @test "server/standalone-StatefulSet: gid configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.runAsGroup' | tee /dev/stderr)
@@ -753,7 +753,7 @@ load _helpers
 @test "server/standalone-StatefulSet: fsgroup default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.fsGroup' | tee /dev/stderr)
   [ "${actual}" = "1000" ]
@@ -762,7 +762,7 @@ load _helpers
 @test "server/standalone-StatefulSet: fsgroup configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.gid=2000' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.securityContext.fsGroup' | tee /dev/stderr)
@@ -775,7 +775,7 @@ load _helpers
 @test "server/standalone-StatefulSet: readinessProbe default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].readinessProbe.exec.command[2]' | tee /dev/stderr)
   [ "${actual}" = "vault status -tls-skip-verify" ]
@@ -784,7 +784,7 @@ load _helpers
 @test "server/standalone-StatefulSet: readinessProbe configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.readinessProbe.enabled=false' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].readinessProbe' | tee /dev/stderr)
@@ -795,7 +795,7 @@ load _helpers
 @test "server/standalone-StatefulSet: livenessProbe default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].livenessProbe' | tee /dev/stderr)
   [ "${actual}" = "null" ]
@@ -804,7 +804,7 @@ load _helpers
 @test "server/standalone-StatefulSet: livenessProbe configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.livenessProbe.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].livenessProbe.httpGet.path' | tee /dev/stderr)
@@ -814,7 +814,7 @@ load _helpers
 @test "server/standalone-StatefulSet: livenessProbe initialDelaySeconds default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.livenessProbe.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].livenessProbe.initialDelaySeconds' | tee /dev/stderr)
@@ -824,7 +824,7 @@ load _helpers
 @test "server/standalone-StatefulSet: livenessProbe initialDelaySeconds configurable" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.livenessProbe.enabled=true' \
       --set 'server.livenessProbe.initialDelaySeconds=30' \
       . | tee /dev/stderr |
@@ -835,7 +835,7 @@ load _helpers
 @test "server/standalone-StatefulSet: add extraArgs" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.extraArgs=foobar' \
       . | tee /dev/stderr |
        yq -r '.spec.template.spec.containers[0].args[0]' | tee /dev/stderr)
@@ -847,7 +847,7 @@ load _helpers
 @test "server/standalone-StatefulSet: preStop sleep duration default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       . | tee /dev/stderr |
        yq -r '.spec.template.spec.containers[0].lifecycle.preStop.exec.command[2]' | tee /dev/stderr)
   [[ "${actual}" = "sleep 5 &&"* ]]
@@ -856,7 +856,7 @@ load _helpers
 @test "server/standalone-StatefulSet: preStop sleep duration 10" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/server-statefulset.yaml \
+      --show-only templates/server-statefulset.yaml \
       --set 'server.preStopSleepSeconds=10' \
       . | tee /dev/stderr |
        yq -r '.spec.template.spec.containers[0].lifecycle.preStop.exec.command[2]' | tee /dev/stderr)
diff --git a/test/unit/ui-service.bats b/test/unit/ui-service.bats
index 98d41ff..b0da7bf 100755
--- a/test/unit/ui-service.bats
+++ b/test/unit/ui-service.bats
@@ -4,51 +4,51 @@ load _helpers
 
 @test "ui/Service: disabled by default" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/ui-service.yaml \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml \
       --set 'server.dev.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml  \
       --set 'server.standalone.enabled=true' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
 
 @test "ui/Service: disable with ui.enabled" {
   cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'ui.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 
-  local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+  local actual=$( (helm template \
+      --show-only templates/ui-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'ui.enabled=false' \
-      . | tee /dev/stderr |
+      . || echo "---") | tee /dev/stderr |
       yq 'length > 0' | tee /dev/stderr)
   [ "${actual}" = "false" ]
 }
@@ -56,7 +56,7 @@ load _helpers
 @test "ui/Service: ClusterIP type by default" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.enabled=true' \
       . | tee /dev/stderr |
@@ -64,7 +64,7 @@ load _helpers
   [ "${actual}" = "ClusterIP" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'ui.enabled=true' \
       . | tee /dev/stderr |
@@ -72,7 +72,7 @@ load _helpers
   [ "${actual}" = "ClusterIP" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'ui.enabled=true' \
       . | tee /dev/stderr |
@@ -83,7 +83,7 @@ load _helpers
 @test "ui/Service: specified type" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -92,7 +92,7 @@ load _helpers
   [ "${actual}" = "LoadBalancer" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -101,7 +101,7 @@ load _helpers
   [ "${actual}" = "LoadBalancer" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.standalone.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -113,7 +113,7 @@ load _helpers
 @test "ui/Service: LoadBalancerIP set if specified and serviceType == LoadBalancer" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -123,7 +123,7 @@ load _helpers
   [ "${actual}" = "123.123.123.123" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=ClusterIP' \
       --set 'ui.enabled=true' \
@@ -136,7 +136,7 @@ load _helpers
 @test "ui/Service: set loadBalancerSourceRanges when LoadBalancer is configured as serviceType" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -146,7 +146,7 @@ load _helpers
   [ "${actual}" = "123.123.123.123" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=ClusterIP' \
       --set 'ui.enabled=true' \
@@ -159,7 +159,7 @@ load _helpers
 @test "ui/Service: specify annotations" {
   cd `chart_dir`
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.dev.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -169,7 +169,7 @@ load _helpers
   [ "${actual}" = "bar" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \
@@ -179,7 +179,7 @@ load _helpers
   [ "${actual}" = "bar" ]
 
   local actual=$(helm template \
-      -x templates/ui-service.yaml  \
+      --show-only templates/ui-service.yaml  \
       --set 'server.ha.enabled=true' \
       --set 'ui.serviceType=LoadBalancer' \
       --set 'ui.enabled=true' \