diff --git a/docs/website/layouts/docs/baseof.html b/docs/website/layouts/docs/baseof.html
index b716e44cf0e..81316ffad50 100644
--- a/docs/website/layouts/docs/baseof.html
+++ b/docs/website/layouts/docs/baseof.html
@@ -37,10 +37,13 @@
     {{ $ancient := gt $rank 5 }}
 
     {{ $isEdge := (eq $version "edge") }}
+    {{ $isEcosystem := (eq (index (split .File.Path "/") 2) "ecosystem" }}
     {{ $isNotLatest := (and (ne $version $latest) (ne $version $latestVersionString)) }}
 
     <div class="dashboard-wrapper {{ if (or $isEdge $isNotLatest) }}showing-banner-version-warning{{ end }}">
       {{- if $isEdge }}
+      <!-- {{ $isEcosystem }}
+      {{ ${{ index (split .File.Path "/") 2 }} -->
       <div class="message is-info banner-version-warning">
         <div class="message-body">
           This version is still under development! Latest stable release is <a href="/docs/latest">{{ $latestVersionString }}</a>
diff --git a/docs/website/layouts/docs/ecosystem.html.html b/docs/website/layouts/docs/ecosystem.html.html
index 3b95c4525a3..4d9acfa7b4d 100644
--- a/docs/website/layouts/docs/ecosystem.html.html
+++ b/docs/website/layouts/docs/ecosystem.html.html
@@ -87,7 +87,7 @@
       <section class="section">
         <div class="content">
           <p>
-            Please see the latest docs for the <a href="https://www.openpolicyagent.org/docs/latest/ecosystem/">OPA Ecosytem List</a>.
+            Please see the latest docs for the <a href="https://www.openpolicyagent.org/docs/edge/ecosystem/">OPA Ecosystem List</a>.
           </p>
         </div>
         {{ if (and (not .Params.hide_feedback) (site.Params.ui.feedback.enable)) }}
@@ -102,4 +102,4 @@
 
 {{ partial "javascript.html" . }}
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docs/website/layouts/partials/nav.html b/docs/website/layouts/partials/nav.html
index e6b89cb9790..8b10d973448 100644
--- a/docs/website/layouts/partials/nav.html
+++ b/docs/website/layouts/partials/nav.html
@@ -18,7 +18,7 @@
         <ul class="navbar-nav">
           <li class="nav-item"><a class="nav-link" href="/docs/">Docs</a></li>
           <li class="nav-item"><a class="nav-link" href="/docs/#running-opa">Download</a></li>
-          <li class="nav-item"><a class="nav-link" href="/docs/latest/ecosystem/">Ecosystem</a></li>
+          <li class="nav-item"><a class="nav-link" href="/docs/edge/ecosystem/">Ecosystem</a></li>
           <li class="nav-item"><a class="nav-link" href="/security">Security</a></li>
           <li class="nav-item"><a class="nav-link" href="/support">Support</a></li>
           <li class="nav-item"><a class="nav-link" href="/community">Community</a></li>
@@ -46,4 +46,4 @@
       </div>
     </div>
   </nav>
-</div>
\ No newline at end of file
+</div>