diff --git a/.github/tests/lockdown2/.env b/.github/tests/lockdown2/.env
deleted file mode 100644
index 7b6e741..0000000
--- a/.github/tests/lockdown2/.env
+++ /dev/null
@@ -1 +0,0 @@
-export EXTRA_HELM_ARGS="--values=examples/production/values.yaml"
diff --git a/.github/tests/lockdown2/values.yaml b/.github/tests/lockdown2/values.yaml
deleted file mode 100644
index 3260fb5..0000000
--- a/.github/tests/lockdown2/values.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-spiffe-oidc-discovery-provider:
-  namespaceOverride: spire-server
-
-spire-server:
-  namespaceOverride: spire-server
diff --git a/.github/tests/lockdown2/post-install.sh b/.github/tests/namespace-override/post-install.sh
similarity index 100%
rename from .github/tests/lockdown2/post-install.sh
rename to .github/tests/namespace-override/post-install.sh
diff --git a/.github/tests/lockdown2/pre-install.sh b/.github/tests/namespace-override/pre-install.sh
similarity index 100%
rename from .github/tests/lockdown2/pre-install.sh
rename to .github/tests/namespace-override/pre-install.sh
diff --git a/.github/tests/namespace-override/values.yaml b/.github/tests/namespace-override/values.yaml
new file mode 100644
index 0000000..64acaf3
--- /dev/null
+++ b/.github/tests/namespace-override/values.yaml
@@ -0,0 +1,24 @@
+spiffe-oidc-discovery-provider:
+  enabled: true
+  namespaceOverride: spire-server
+
+spire-server:
+  namespaceOverride: spire-server
+  nodeAttestor:
+    k8sPsat:
+      serviceAccountAllowList: ["spire-system:spire-agent"]
+  notifier:
+    k8sbundle:
+      namespace: spire-system
+
+spiffe-csi-driver:
+  enabled: true
+  namespaceOverride: spire-system
+
+spire-agent:
+  enabled: true
+  namespaceOverride: spire-system
+  serviceAccount:
+    name: spire-agent
+  server:
+    namespaceOverride: spire-server