diff --git a/.gitmodules b/.gitmodules
index 2ff6d08..45a230f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,5 +2,5 @@
 	path = base/minio
 	url = https://github.com/minio/operator.git
 [submodule "base/nginx-gateway"]
-	path = base/nginx-gateway
+	path = base/nginx/nginx-gateway
 	url = https://github.com/nginxinc/nginx-kubernetes-gateway.git
diff --git a/base/kustomization.yaml b/base/kustomization.yaml
index 139aa57..24e8962 100644
--- a/base/kustomization.yaml
+++ b/base/kustomization.yaml
@@ -5,5 +5,4 @@ bases:
   - https://raw.githubusercontent.com/flannel-io/flannel/master/Documentation/kube-flannel.yml
   - https://github.com/cert-manager/cert-manager/releases/download/v1.10.0/cert-manager.yaml
   - ./minio
-  - github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1
-  - ./nginx-gateway
\ No newline at end of file
+  - ./nginx
\ No newline at end of file
diff --git a/base/nginx/kustomization.yaml b/base/nginx/kustomization.yaml
new file mode 100644
index 0000000..858041d
--- /dev/null
+++ b/base/nginx/kustomization.yaml
@@ -0,0 +1,12 @@
+
+resources:
+  - github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1
+  - ./nginx-gateway/deploy/manifests/namespace.yaml
+  - ./nginx-gateway/deploy/manifests/gatewayclass.yaml
+  - ./nginx-gateway/deploy/manifests/nginx-gateway.yaml
+  - ./nginx-gateway/deploy/manifests/service/loadbalancer.yaml
+
+configMapGenerator:
+- name: njs-modules
+  files:
+  - ./nginx-gateway/internal/nginx/modules/src/httpmatches.js
diff --git a/base/nginx-gateway b/base/nginx/nginx-gateway
similarity index 100%
rename from base/nginx-gateway
rename to base/nginx/nginx-gateway