diff --git a/test/docker/fs/etc/agent-in-kube/deployment.yaml.tmpl b/test/docker/fs/etc/agent-in-kube/deployment.yaml.tmpl
index cc9760a75..907ac2ad7 100644
--- a/test/docker/fs/etc/agent-in-kube/deployment.yaml.tmpl
+++ b/test/docker/fs/etc/agent-in-kube/deployment.yaml.tmpl
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: agent
-  namespace: openhorizon-agent
+  namespace: lily-test
 spec:
   replicas: 1
   selector:
@@ -52,3 +52,7 @@ spec:
           value: "1"
         - name: ANAX_LOG_LEVEL
           value: "5"
+        - name: HZN_NAMESPACE_SCOPED
+          value: "true"
+        - name: AGENT_NAMESPACE
+          value: "lily-test"
diff --git a/test/docker/fs/etc/agent-in-kube/deployment_nocert.yaml.tmpl b/test/docker/fs/etc/agent-in-kube/deployment_nocert.yaml.tmpl
index 65bf7fbd3..68b368cc2 100644
--- a/test/docker/fs/etc/agent-in-kube/deployment_nocert.yaml.tmpl
+++ b/test/docker/fs/etc/agent-in-kube/deployment_nocert.yaml.tmpl
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: agent
-  namespace: openhorizon-agent
+  namespace: lily-test
 spec:
   replicas: 1
   selector:
@@ -47,3 +47,7 @@ spec:
           value: "1"
         - name: ANAX_LOG_LEVEL
           value: "5"
+        - name: HZN_NAMESPACE_SCOPED
+          value: "true"
+        - name: AGENT_NAMESPACE
+          value: "lily-test"
diff --git a/test/docker/fs/etc/agent-in-kube/persistent-claim.yaml b/test/docker/fs/etc/agent-in-kube/persistent-claim.yaml
index 87cd5b1ed..d3144520b 100644
--- a/test/docker/fs/etc/agent-in-kube/persistent-claim.yaml
+++ b/test/docker/fs/etc/agent-in-kube/persistent-claim.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: agent-pvc-horizon
-  namespace: openhorizon-agent
+  namespace: lily-test
 spec:
   storageClassName: "microk8s-hostpath"
   accessModes:
diff --git a/test/gov/run_kube.sh b/test/gov/run_kube.sh
index 1c1b71ab8..be52b0ddb 100755
--- a/test/gov/run_kube.sh
+++ b/test/gov/run_kube.sh
@@ -12,7 +12,7 @@ ANAX_SOURCE=$2
 EXCH_ROOTPW=$3
 DOCKER_TEST_NETWORK=$4
 
-NAME_SPACE="openhorizon-agent"
+NAME_SPACE="lily-test"
 CONFIGMAP_NAME="agent-configmap-horizon"
 SECRET_NAME="agent-secret-cert"
 PVC_NAME="agent-pvc-horizon"
@@ -265,5 +265,6 @@ $cprefix microk8s.kubectl cp $PWD/gov/input_files/k8s_deploy/node.policy.json ${
 $cprefix microk8s.kubectl cp $PWD/gov/input_files/k8s_deploy/node_ui.json ${NAME_SPACE}/${POD}:/home/agentuser/.
 
 $cprefix microk8s.kubectl exec ${POD} -it -n ${NAME_SPACE} -- env ARCH=${ARCH} /usr/bin/hzn register -f /home/agentuser/node_ui.json -p e2edev@somecomp.com/sk8s -u root/root:${EXCH_ROOTPW}
+#$cprefix microk8s.kubectl exec ${POD} -it -n ${NAME_SPACE} -- env ARCH=${ARCH} /usr/bin/hzn register -f /home/agentuser/node_ui.json --policy /home/agentuser/node_ui.json -u root/root:${EXCH_ROOTPW}
 
 echo "Configured agent for policy, waiting for the agbot to start."
diff --git a/test/gov/stop_kube.sh b/test/gov/stop_kube.sh
index 2b503c796..2dbfee855 100755
--- a/test/gov/stop_kube.sh
+++ b/test/gov/stop_kube.sh
@@ -2,7 +2,7 @@
 
 # set -x
 
-NAME_SPACE="openhorizon-agent"
+NAME_SPACE="lily-test"
 CONFIGMAP_NAME="agent-configmap-horizon"
 SECRET_NAME="agent-secret-cert"