diff --git a/.htmltest.yml b/.htmltest.yml
index 163d7d87e676..53e80a8d75fb 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -14,7 +14,7 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored
   - ^(/..)?/docs/collector/registry/$
   - ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
   - ^((/..)?/docs/migration/)?opencensus/$
-  - ^/community/end-user/feedback-survey/$
+  - ^(/community/end-user/)?feedback-survey/$
 
   - ^https://deploy-preview-\d+--opentelemetry.netlify.app/
   - ^https://www\.googletagmanager\.com
diff --git a/content/en/community/end-user/_index.md b/content/en/community/end-user/_index.md
index 584d363b9b36..3d0d1e724d1f 100644
--- a/content/en/community/end-user/_index.md
+++ b/content/en/community/end-user/_index.md
@@ -18,7 +18,7 @@ right place!
     [OpenTelemetry YouTube channel](https://www.youtube.com/@otel-official)
 - To provide feedback and help prioritize issues:
   - Participate in a [direct interview/feedback session](interviews-feedback/)
-  - Take a [survey](/community/end-user/feedback-survey/)
+  - Take a [survey](feedback-survey/)
   - Join a panel discussion (more info coming soon!)
   - Vote on issues (more info coming soon!)
 
diff --git a/content/en/ecosystem/_index.md b/content/en/ecosystem/_index.md
index 8b08467f1a32..5160dd7d2015 100644
--- a/content/en/ecosystem/_index.md
+++ b/content/en/ecosystem/_index.md
@@ -1,7 +1,7 @@
 ---
 title: OpenTelemetry Ecosystem
 linkTitle: Ecosystem
-description: >-
+description: >
   OpenTelemetry's thriving ecosystem of components, examples, integrations and
   vendors
 cascade: { type: docs }
diff --git a/content/ja/ecosystem/_index.md b/content/ja/ecosystem/_index.md
new file mode 100644
index 000000000000..c6fc8cb7a02b
--- /dev/null
+++ b/content/ja/ecosystem/_index.md
@@ -0,0 +1,12 @@
+---
+title: OpenTelemetry Ecosystem
+linkTitle: Ecosystem
+description: >
+  OpenTelemetry's thriving ecosystem of components, examples, integrations and
+  vendors
+cascade: { type: docs }
+menu: { main: { weight: 20 } }
+redirect: /ecosystem/
+_build: { render: link }
+default_lang_commit: a575dfdbcd64b6d7b70b8fea9f9cabca602ddc04
+---
diff --git a/hugo.yaml b/hugo.yaml
index 670868f6e80e..2ef5e6fab6ff 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -218,12 +218,12 @@ module:
       target: content
       lang: ja
     # fallback pages
-    - excludeFiles: specs/*
-      source: content/en/docs
-      target: content/docs
-      lang: ja
-    - source: content/en/announcements
-      target: content/announcements
+    - source: content/en
+      target: content
+      excludeFiles: &fallbackExcludeFiles
+        - docs/specs/*
+        - ecosystem/*
+        - site
       lang: ja
 
     ## zh
@@ -231,12 +231,12 @@ module:
       target: content
       lang: zh
     # fallback pages
-    - excludeFiles: specs/*
-      source: content/en/docs
-      target: content/docs
+    - source: content/en
+      target: content
+      excludeFiles: *fallbackExcludeFiles
       lang: zh
-    - source: content/en/announcements
-      target: content/announcements
+    - source: content/ja/ecosystem
+      target: content
       lang: zh
 
     # Other site content