diff --git a/firewall-s3/ks-vm.yaml b/firewall-s3/ks-vm.yaml
index 827133e..61e2924 100644
--- a/firewall-s3/ks-vm.yaml
+++ b/firewall-s3/ks-vm.yaml
@@ -7,7 +7,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./firewall-s3
+  path: ./firewall-s3/vm/ksd
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/kustomization.yaml b/kustomization.yaml
index 8aec8be..56390ef 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -7,6 +7,7 @@ resources:
   - firewall/ks-vm.yaml
   - firewall-dev/ks-vm.yaml
   - firewall-s3/ks-vm.yaml
+  - test-connectivity/ks.yaml
   - windows-vm-standard/ks-vm.yaml
   - windows-vm-standard/ks-pvc.yaml
   - windows-vm-standard-dev/ks-vm.yaml
diff --git a/firewall-s3/test-connectivity/loadbalancers/fortigate-wan.yaml b/test-connectivity/app/test-connectivity/loadbalancers/fortigate-wan.yaml
similarity index 100%
rename from firewall-s3/test-connectivity/loadbalancers/fortigate-wan.yaml
rename to test-connectivity/app/test-connectivity/loadbalancers/fortigate-wan.yaml
diff --git a/firewall-s3/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml
similarity index 100%
rename from firewall-s3/test-connectivity/network-definitions/lan.yaml
rename to test-connectivity/app/test-connectivity/network-definitions/lan.yaml
diff --git a/firewall-s3/test-connectivity/network-definitions/mgmt.yaml b/test-connectivity/app/test-connectivity/network-definitions/mgmt.yaml
similarity index 100%
rename from firewall-s3/test-connectivity/network-definitions/mgmt.yaml
rename to test-connectivity/app/test-connectivity/network-definitions/mgmt.yaml
diff --git a/firewall-s3/test-connectivity/vm/fortigate.yaml b/test-connectivity/app/test-connectivity/vm/fortigate.yaml
similarity index 100%
rename from firewall-s3/test-connectivity/vm/fortigate.yaml
rename to test-connectivity/app/test-connectivity/vm/fortigate.yaml
diff --git a/firewall-s3/test-connectivity/vm/strongswan.yaml b/test-connectivity/app/test-connectivity/vm/strongswan.yaml
similarity index 100%
rename from firewall-s3/test-connectivity/vm/strongswan.yaml
rename to test-connectivity/app/test-connectivity/vm/strongswan.yaml
diff --git a/test-connectivity/ks.yaml b/test-connectivity/ks.yaml
new file mode 100644
index 0000000..2093015
--- /dev/null
+++ b/test-connectivity/ks.yaml
@@ -0,0 +1,18 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app test-connectivity
+  namespace: ${TENANT_NAMESPACE}
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./test-connectivity/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: tenant-repos
+  wait: false
+  interval: 30m
+  retryInterval: 1m
+  timeout: 5m
\ No newline at end of file