diff --git a/gatekeeper-repo.yml b/gatekeeper-repo.yml
index 02b9fc8..13ab723 100644
--- a/gatekeeper-repo.yml
+++ b/gatekeeper-repo.yml
@@ -1,13 +1,13 @@
 ---
 version: '3'
 includes:
-  helm-repo:
+  repo:
     taskfile: helm-repo.yml
-    internal: true
+    flatten: true
     vars:
       n: gatekeeper
       url: https://open-policy-agent.github.io/gatekeeper/charts
 tasks:
   default:
     deps:
-      - task: helm-repo:add
+      - task: add
diff --git a/gatekeeper.yml b/gatekeeper.yml
index 940a0a4..7baee4a 100644
--- a/gatekeeper.yml
+++ b/gatekeeper.yml
@@ -2,16 +2,20 @@
 version: '3'
 includes:
   repo: gatekeeper-repo.yml
+  kk:
+    taskfile: kubectl.yml
+    vars:
+      n: gatekeeper-system
+      labels: 'istio.io/dataplane-mode=ambient'
   helm:
     taskfile: helm.yml
     internal: true
     vars:
       namespace: gatekeeper-system
-      create_namespace: 'true'
       name: gatekeeper
       chart_repo_name: gatekeeper
       chart: gatekeeper
-      chart_ver: 3.18.1
+      chart_ver: 3.18.2
 tasks:
   default:
     deps:
@@ -20,10 +24,13 @@ tasks:
     deps:
       - task: repo
     cmds:
+      - task: kk:ns-create
+      - task: kk:ns-label
       - task: helm:upgrade
   delete:
     cmds:
       - task: helm:delete
+      - task: kk:ns-delete
   check:
     deps:
       - task: repo