diff --git a/tests/templates/kuttl/external-access/10-create-listener-classes.yaml b/tests/templates/kuttl/external-access/10-create-listener-classes.yaml
new file mode 100644
index 00000000..6ca9b638
--- /dev/null
+++ b/tests/templates/kuttl/external-access/10-create-listener-classes.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      envsubst < 10_listener-classes.yaml | kubectl apply -n "$NAMESPACE" -f -
diff --git a/tests/templates/kuttl/external-access/10-listener-classes.yaml b/tests/templates/kuttl/external-access/10-listener-classes.yaml
deleted file mode 100644
index 842e17e5..00000000
--- a/tests/templates/kuttl/external-access/10-listener-classes.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - script: |
-      envsubst < listener-classes.yaml | kubectl apply -n "$NAMESPACE" -f -
diff --git a/tests/templates/kuttl/external-access/listener-classes.yaml b/tests/templates/kuttl/external-access/10_listener-classes.yaml
similarity index 100%
rename from tests/templates/kuttl/external-access/listener-classes.yaml
rename to tests/templates/kuttl/external-access/10_listener-classes.yaml
diff --git a/tests/templates/kuttl/external-access/20-install-hive.yaml b/tests/templates/kuttl/external-access/20-install-hive.yaml
index 73d580d6..1e863c8f 100644
--- a/tests/templates/kuttl/external-access/20-install-hive.yaml
+++ b/tests/templates/kuttl/external-access/20-install-hive.yaml
@@ -3,6 +3,5 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 timeout: 600
 commands:
-  - script: >
-      envsubst < install-hive.yaml |
-      kubectl apply -n "$NAMESPACE" -f -
+  - script: |
+      envsubst < 20_hive.yaml | kubectl apply -n "$NAMESPACE" -f -
diff --git a/tests/templates/kuttl/external-access/install-hive.yaml.j2 b/tests/templates/kuttl/external-access/20_hive.yaml.j2
similarity index 90%
rename from tests/templates/kuttl/external-access/install-hive.yaml.j2
rename to tests/templates/kuttl/external-access/20_hive.yaml.j2
index 84b8d47c..f462442a 100644
--- a/tests/templates/kuttl/external-access/install-hive.yaml.j2
+++ b/tests/templates/kuttl/external-access/20_hive.yaml.j2
@@ -26,6 +26,9 @@ spec:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleConfig:
       listenerClass: test-cluster-internal-$NAMESPACE
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
diff --git a/tests/templates/kuttl/external-access/helm-bitnami-postgresql-values.yaml.j2 b/tests/templates/kuttl/external-access/helm-bitnami-postgresql-values.yaml.j2
deleted file mode 100644
index 9e821599..00000000
--- a/tests/templates/kuttl/external-access/helm-bitnami-postgresql-values.yaml.j2
+++ /dev/null
@@ -1,31 +0,0 @@
----
-volumePermissions:
-  enabled: false
-  securityContext:
-    runAsUser: auto
-
-primary:
-  podSecurityContext:
-{% if test_scenario['values']['openshift'] == 'true' %}
-    enabled: false
-{% else %}
-    enabled: true
-{% endif %}
-  containerSecurityContext:
-    enabled: false
-  resources:
-    requests:
-      memory: "128Mi"
-      cpu: "512m"
-    limits:
-      memory: "128Mi"
-      cpu: "1"
-
-shmVolume:
-  chmod:
-    enabled: false
-
-auth:
-  username: hive
-  password: hive
-  database: hive