diff --git a/data/redirects.yaml b/data/redirects.yaml
index 2a898e8..818b227 100644
--- a/data/redirects.yaml
+++ b/data/redirects.yaml
@@ -6,4 +6,11 @@
 - proto
 - web
 - dart
-- community
\ No newline at end of file
+- community
+- node
+- swift
+- php
+- java-api-checker
+- docker-library
+- experiments
+- haskell
diff --git a/layouts/index.redirects b/layouts/index.redirects
index c705406..5701af9 100644
--- a/layouts/index.redirects
+++ b/layouts/index.redirects
@@ -1,4 +1,4 @@
 {{- $redirects := site.Data.redirects -}}
-{{- range $redirects }}
-/grpc-{{ . }}     https://github.com/grpc/grpc-{{ . }}
-{{- end }}
+{{- range $redirects -}}
+/grpc-{{ . }}/*     https://github.com/grpc/grpc-{{ . }}/:splat
+{{ end -}}