diff --git a/conf.yaml b/conf.yaml
index 8cd858b4a4775..f51043859aacd 100644
--- a/conf.yaml
+++ b/conf.yaml
@@ -619,7 +619,7 @@ contents:
                 sources:
                   -
                     repo:   elasticsearch-rs
-                    path:   docs/ 
+                    path:   docs/
               - title:      Java REST Client (deprecated)
                 prefix:     java-rest
                 current:   7.15
@@ -1323,9 +1323,9 @@ contents:
             sections:
               - title:      ECS Logging Overview
                 prefix:     overview
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/Guide
@@ -1342,9 +1342,9 @@ contents:
                     path:   shared/attributes.asciidoc
               - title:      ECS Logging Go (Logrus) Reference
                 prefix:     go-logrus
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/go-logrus/Guide
@@ -1364,9 +1364,9 @@ contents:
                     path:   docs
               - title:      ECS Logging Go (Zap) Reference
                 prefix:     go-zap
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/go-zap/Guide
@@ -1384,11 +1384,12 @@ contents:
                   -
                     repo:   ecs-logging
                     path:   docs
+
               - title:      ECS Logging Java Reference
                 prefix:     java
                 current:    1.x
-                branches:   [ master, 1.x, 0.x ]
-                live:       [ master, 1.x ]
+                branches:   [ {main: master}, 1.x, 0.x ]
+                live:       [ main, 1.x ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/java/Guide
@@ -1407,13 +1408,13 @@ contents:
                     repo:   ecs-logging
                     path:   docs
                     map_branches:
-                      1.x: master
-                      0.x: master
+                      1.x: main
+                      0.x: main
               - title:      ECS Logging .NET Reference
                 prefix:     dotnet
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/.NET/Guide
@@ -1433,9 +1434,9 @@ contents:
                     path:   docs
               - title:      ECS Logging Node.js Reference
                 prefix:     nodejs
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/nodejs/Guide
@@ -1455,9 +1456,9 @@ contents:
                     path:   docs
               - title:      ECS Logging Ruby Reference
                 prefix:     ruby
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/ruby/Guide
@@ -1477,9 +1478,9 @@ contents:
                     path:   docs
               - title:      ECS Logging PHP Reference
                 prefix:     php
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/php/Guide
@@ -1499,9 +1500,9 @@ contents:
                     path:   docs
               - title:      ECS Logging Python Reference
                 prefix:     python
-                current:    master
-                branches:   [ master ]
-                live:       [ master ]
+                current:    main
+                branches:   [ {main: master} ]
+                live:       [ main ]
                 index:      docs/index.asciidoc
                 chunk:      1
                 tags:       ECS-logging/python/Guide