diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00e613c88eb29da942f730710b9bbf69001c8afa..b54299c7106676889163d749135db242a61d9998 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,8 +71,7 @@ package tests:
   script:
     # Place kubernetes package test here
     - echo "Package tests go here"
-    - curl -v https://kiali.bigbang.dev
-    - curl -v https://kibana.bigbang.dev
+    - bash ./tests/virtualservices.sh
     - kubectl get helmrelease -A
 
   after_script:
diff --git a/chart/templates/istio/istio-controlplane-helmrelease.yaml b/chart/templates/istio/istio-controlplane-helmrelease.yaml
index 566ced45814c3e777663ee4f90ce2f1db66ae900..6a7bcf9ae621156a84a2cefa60314e31462897d0 100644
--- a/chart/templates/istio/istio-controlplane-helmrelease.yaml
+++ b/chart/templates/istio/istio-controlplane-helmrelease.yaml
@@ -36,7 +36,6 @@ spec:
     - name: values
       kind: Secret
       valuesKey: "istio.yaml"
-
   values:
     hostname: {{ .Values.hostname }}
 
diff --git a/chart/templates/values.yaml b/chart/templates/values.yaml
index 3019814a6c3626b5cc206482da71e272f0fe2d08..b34d7b46a7760326e7e0155b754ae94d245e8934 100644
--- a/chart/templates/values.yaml
+++ b/chart/templates/values.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace:  {{ .Release.Namespace }}
 type: generic
 stringData:
+  values.yaml: |
+{{ toYaml .Values | indent 4}}
   istio.yaml: |
 {{ toYaml .Values.istio.values | indent 4  }}
   gatekeeper.yaml: |
diff --git a/tests/virtualservices.sh b/tests/virtualservices.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8ce5e4474a8cf5145d00033f6ec49180ec0a151b
--- /dev/null
+++ b/tests/virtualservices.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+hosts=`kubectl get vs -A -o jsonpath="{ .items[*].spec.hosts[*] }"`
+
+for host in $hosts; do
+    curl -vI https://$host
+done
\ No newline at end of file