diff --git a/.gitmodules b/.gitmodules
index 6a6e2f761..c5340e2f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,9 @@
 [submodule "submodules/kubespray"]
 	path = submodules/kubespray
 	url = https://github.com/kubernetes-sigs/kubespray
-[submodule "submodules/rook"]
-	path = submodules/rook
-	url = https://github.com/rook/rook.git
 [submodule "submodules/openstack-exporter"]
 	path = submodules/openstack-exporter
 	url = https://github.com/openstack-exporter/helm-charts
-[submodule "submodules/nginx-gateway-fabric"]
-	path = submodules/nginx-gateway-fabric
-	url = https://github.com/nginxinc/nginx-gateway-fabric.git
 [submodule "submodules/postgres-operator"]
 	path = submodules/postgres-operator
 	url = https://github.com/zalando/postgres-operator.git
diff --git a/docs/storage-ceph-rook-external.md b/docs/storage-ceph-rook-external.md
index 8e304a821..2dc1e3228 100644
--- a/docs/storage-ceph-rook-external.md
+++ b/docs/storage-ceph-rook-external.md
@@ -34,7 +34,7 @@ ceph orch apply mds myfs label:mds
 
 ``` shell
 ./cephadm shell
-yum install wget -y ; wget https://raw.githubusercontent.com/rook/rook/release-1.12/deploy/examples/create-external-cluster-resources.py
+yum install wget -y ; wget https://raw.githubusercontent.com/rook/rook/release-1.16/deploy/examples/create-external-cluster-resources.py
 python3 create-external-cluster-resources.py --rbd-data-pool-name general --cephfs-filesystem-name general-multi-attach --namespace rook-ceph-external --format bash
 ```
 
@@ -74,7 +74,8 @@ kubectl apply -k /etc/genestack/kustomize/rook-operator/
 /opt/genestack/scripts/import-external-cluster.sh
 helm repo add rook-release https://charts.rook.io/release
 kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.7
-helm install --create-namespace --namespace rook-ceph-external rook-ceph-cluster     --set operatorNamespace=rook-ceph rook-release/rook-ceph-cluster -f /opt/genestack/submodules/rook/deploy/charts/rook-ceph-cluster/values-external.yaml
+wget https://raw.githubusercontent.com/rook/rook/refs/tags/v1.16.5/deploy/charts/rook-ceph-cluster/values-external.yaml -O /etc/genestack/helm-configs/rook-values-external.yaml
+helm install --create-namespace --namespace rook-ceph-external rook-ceph-cluster --set operatorNamespace=rook-ceph rook-release/rook-ceph-cluster -f /etc/genestack/helm-configs/rook-values-external.yaml
 kubectl patch storageclass general -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
 ```
 
diff --git a/docs/storage-ceph-rook-internal.md b/docs/storage-ceph-rook-internal.md
index 159b8f965..e70cb25e0 100644
--- a/docs/storage-ceph-rook-internal.md
+++ b/docs/storage-ceph-rook-internal.md
@@ -17,7 +17,7 @@ kubectl apply -k /etc/genestack/kustomize/rook-operator/
     example of how one can pin the operator version if so desired.
 
     ``` shell
-    kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.7
+    kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.16.5
     ```
 
 ### Label the Storage Nodes
diff --git a/testing/deploy.yaml b/testing/deploy.yaml
index ecaced987..f3c36b156 100644
--- a/testing/deploy.yaml
+++ b/testing/deploy.yaml
@@ -244,10 +244,7 @@
 
     - name: Install gateway controller
       shell: |
-        cd /opt/genestack/submodules/nginx-gateway-fabric/charts
-        helm upgrade --install nginx-gateway-fabric ./nginx-gateway-fabric \
-          --namespace=nginx-gateway \
-          -f /etc/genestack/helm-configs/nginx-gateway-fabric/helm-overrides.yaml
+        /opt/genestack/bin/install-envoy-gateway.sh && /opt/genestack/bin/setup-envoy-gateway.sh
       args:
         executable: /bin/bash