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/firewall-s3/test-connectivity/network-definitions/lan.yaml b/firewall-s3/test-connectivity/network-definitions/lan.yaml
deleted file mode 100644
index 1c32a21..0000000
--- a/firewall-s3/test-connectivity/network-definitions/lan.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# apiVersion: "k8s.cni.cncf.io/v1"
-# kind: NetworkAttachmentDefinition
-# metadata:
-#   name: lan-net
-#   namespace: ${TENANT_NAMESPACE}
-# spec:
-#   config: '{
-#     "cniVersion": "0.3.1",
-#     "type": "bridge",
-#     "bridge": "br-lan",
-#     "ipam": {
-#       "type": "static",
-#       "addresses": [
-#         {
-#           "address": "172.168.100.2/24",
-#           "gateway": "172.168.100.1"
-#         }
-#       ]
-#     }
-#   }'
\ No newline at end of file
diff --git a/kustomization.yaml b/kustomization.yaml
index 8aec8be..b6c706e 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -4,9 +4,8 @@ resources:
   - vars/ks.yaml
   - repos/ks.yaml
   - network/ks-lb.yaml
-  - 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/test-connectivity/app/test-connectivity/network-definitions/lan.yaml b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml
new file mode 100644
index 0000000..16d40cc
--- /dev/null
+++ b/test-connectivity/app/test-connectivity/network-definitions/lan.yaml
@@ -0,0 +1,19 @@
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: lan-ovn-160
+spec:
+  config: |
+    {
+      "cniVersion": "0.3.1",
+      "type": "ovn-k8s-cni-overlay",
+      "name": "lan-ovn-160",
+      "topology": "layer2",
+      "subnets": [
+        {"cidr": "192.168.160.0/24"}
+      ],
+      "mtu": 1400,
+      "routes": [
+        {"dst": "10.60.0.0/16", "gw": "192.168.10.1"}
+      ]
+    }
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/test-connectivity/app/test-connectivity/pod/pod.yaml b/test-connectivity/app/test-connectivity/pod/pod.yaml
new file mode 100644
index 0000000..44792b8
--- /dev/null
+++ b/test-connectivity/app/test-connectivity/pod/pod.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dualnet-pod-ovn
+  annotations:
+    k8s.v1.cni.cncf.io/networks: |
+      [
+        {
+          "name": "lan-ovn-160",
+          "namespace": "${TENANT_NAMESPACE}",
+          "interface": "net1"
+        }
+      ]
+spec:
+  containers:
+    - name: toolbox
+      image: quay.io/centos/centos:stream9
+      command: [ "/bin/bash", "-c", "sleep infinity" ]
+  restartPolicy: Never
\ No newline at end of file
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