diff --git a/mkdocs.yml b/mkdocs.yml
index f2e3a51d..e7667b59 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -35,10 +35,11 @@ plugins:
       keep_docs_dir: true
       nav_repos:
         - name: kuadrant-operator
-          import_url: 'https://github.com/kuadrant/kuadrant-operator?edit_uri=/blob/main/&branch=v0.6.0'
+          import_url: 'https://github.com/kuadrant/kuadrant-operator?edit_uri=/blob/main/&branch=main'
           imports:
             - /README.md
             - /doc/*
+            - /config/samples/*
         - name: authorino
           import_url: 'https://github.com/kuadrant/authorino?edit_uri=/blob/main/&branch=v0.16.0'
           imports:
@@ -63,8 +64,14 @@ plugins:
           imports:
             - /README.md
             - /doc/*
+        - name: dns-operator
+          import_url: 'https://github.com/kuadrant/dns-operator?edit_uri=/blob/main/&branch=main'
+          imports:
+            - /README.md
+            - /docs/*
+            - /config/samples/*
         - name: multicluster-gateway-controller
-          import_url: 'https://github.com/kuadrant/multicluster-gateway-controller?edit_uri=/blob/main/&branch=release-0.3'
+          import_url: 'https://github.com/kuadrant/multicluster-gateway-controller?edit_uri=/blob/main/&branch=main'
           imports:
             - /README.md
             - /docs/*
@@ -90,14 +97,14 @@ nav:
       - 'Service Protection installation with Existing OCM': multicluster-gateway-controller/docs/installation/service-protection-installation.md
   - 'Concepts and APIs':
     - 'DNSPolicy':
-      - 'Overview': multicluster-gateway-controller/docs/dnspolicy/dnspolicy.md
-      - 'Reference': multicluster-gateway-controller/docs/reference/dnspolicy.md
+      - 'Overview': kuadrant-operator/doc/dns.md
+      - 'Reference': kuadrant-operator/doc/reference/dnspolicy.md
     - 'ManagedZone':
-      -  'Overview': multicluster-gateway-controller/docs/managed-zone.md
-      -  'Reference': multicluster-gateway-controller/docs/reference/managedzone.md
+      -  'Overview': dns-operator/docs/managedzone.md
+      -  'Reference': dns-operator/docs/reference/managedzone.md
     - 'TLSPolicy':
-      - 'Overview': multicluster-gateway-controller/docs/tlspolicy/tls-policy.md
-      - 'Reference': multicluster-gateway-controller/docs/reference/tlspolicy.md
+      - 'Overview': kuadrant-operator/doc/tls.md
+      - 'Reference': kuadrant-operator/doc/reference/tlspolicy.md
     - 'AuthPolicy':
       - 'Overview': kuadrant-operator/doc/auth.md
       - 'Reference': kuadrant-operator/doc/reference/authpolicy.md
@@ -112,12 +119,12 @@ nav:
     - 'Single Cluster':
       - 'Secure, connect and protect': kuadrant-operator/doc/user-guides/secure-protect-connect.md
     - 'DNS configuration and load balancing':
-      - 'Basic DNSPolicy': multicluster-gateway-controller/docs/dnspolicy/dnspolicy-quickstart.md
-      - 'DNS Health Checks': multicluster-gateway-controller/docs/dnspolicy/dns-health-checks.md
-      - 'DNS Providers': multicluster-gateway-controller/docs/dnspolicy/dns-provider.md
+      - 'DNSPolicy for Platform Engineers': kuadrant-operator/doc/user-guides/gateway-dns.md
+      - 'DNS Health Checks': kuadrant-operator/doc/dnshealthchecks.md
+      - 'DNS Providers': dns-operator/docs/provider.md
       - 'Advanced DNS based LoadBalancing': multicluster-gateway-controller/docs/how-to/multicluster-loadbalanced-dnspolicy.md
     - 'TLS configuration':
-      - 'TLSPolicy and Cert-Manager': multicluster-gateway-controller/docs/tlspolicy/tls-policy.md # new doc needed but this one is ok for now
+      - 'TLSPolicy for Platform Engineers': kuadrant-operator/doc/user-guides/gateway-tls.md
     - 'Authentication & Authorization':
       - 'AuthPolicy for Application Developers and Platform Engineers': kuadrant-operator/doc/user-guides/auth-for-app-devs-and-platform-engineers.md
       - 'Authentication with Kubernetes tokens (TokenReview API)': authorino/docs/user-guides/kubernetes-tokenreview.md
@@ -154,8 +161,6 @@ nav:
       - 'Multi-Cluster Metrics': multicluster-gateway-controller/docs/how-to/metrics-walkthrough.md
       - 'Authentication and Authorization': authorino/docs/user-guides/observability.md
   - 'Experimental':
-    - 'Kuadrant and Skupper Gateway Resiliency': multicluster-gateway-controller/docs/experimental/skupper-poc-2-gateways-resiliency-walkthrough.md
-    - 'Kuadrant and Submariner Gateway Resiliency': multicluster-gateway-controller/docs/experimental/submariner-poc-2-gateways-resiliency-walkthrough.md
     - 'API Quickstart': 'api-quickstart/README.md'
   - 'Proposals':
     - 'Request For Comments (RFC)':
@@ -200,6 +205,8 @@ nav:
         - 'Rate limit headers': limitador-operator/doc/rate-limit-headers.md
         - "Developer's Guide": limitador-operator/doc/development.md
         - limitador-operator/doc/logging.md
+    - 'Kuadrant DNS':
+        - 'Overview': dns-operator/README.md
     - 'Multicluster Gateway Controller':
       - 'Overview': multicluster-gateway-controller/README.md
       - 'Contribution':