diff --git a/.circleci/config.yml b/.circleci/config.yml
index b358073eac6d..90a3e4c2604b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,12 +7,12 @@ version: 2
   <<: *tags
   branches: { ignore: "/.*/" }
 
-.tag-or-master: &tag-or-master
-  branches: { only: master }
+.tag-or-main: &tag-or-main
+  branches: { only: main }
   <<: *tags
 
-.no-master: &no-master # contrary to tags, the branches must be excluded
-  branches: { ignore: master }
+.no-main: &no-main # contrary to tags, the branches must be excluded
+  branches: { ignore: main }
 
 workflows:
   version: 2
@@ -27,10 +27,10 @@ workflows:
 
       - build/docker-driver:
           requires: [test]
-          filters: { <<: *no-master }
+          filters: { <<: *no-main }
       - publish/docker-driver:
           requires: [test]
-          filters: { <<: *tag-or-master }
+          filters: { <<: *tag-or-main }
 
       - publish/binaries:
           requires: [test]
diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
index 0ad992ce4ff9..603c3e0c0531 100644
--- a/.drone/drone.jsonnet
+++ b/.drone/drone.jsonnet
@@ -4,11 +4,11 @@ local archs = ['amd64', 'arm64', 'arm'];
 local build_image_version = std.extVar('__build-image-version');
 
 local condition(verb) = {
-  tagMaster: {
+  tagMain: {
     ref: {
       [verb]:
         [
-          'refs/heads/master',
+          'refs/heads/main',
           'refs/heads/k??',
           'refs/tags/v*',
         ],
@@ -87,22 +87,22 @@ local promtail_win() = pipeline('promtail-windows') {
   }],
 };
 
-local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'latest,master') {
+local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'latest,main') {
   steps+: [
-    // dry run for everything that is not tag or master
+    // dry run for everything that is not tag or main
     clients_docker('amd64', 'fluent-bit') {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMaster,
+      when: condition('exclude').tagMain,
       settings+: {
         dry_run: true,
         repo: 'grafana/fluent-bit-plugin-loki',
       },
     },
   ] + [
-    // publish for tag or master
+    // publish for tag or main
     clients_docker('amd64', 'fluent-bit') {
       depends_on: ['image-tag'],
-      when: condition('include').tagMaster,
+      when: condition('include').tagMain,
       settings+: {
         repo: 'grafana/fluent-bit-plugin-loki',
       },
@@ -111,22 +111,22 @@ local fluentbit() = pipeline('fluent-bit-amd64') + arch_image('amd64', 'latest,m
   depends_on: ['check'],
 };
 
-local fluentd() = pipeline('fluentd-amd64') + arch_image('amd64', 'latest,master') {
+local fluentd() = pipeline('fluentd-amd64') + arch_image('amd64', 'latest,main') {
   steps+: [
-    // dry run for everything that is not tag or master
+    // dry run for everything that is not tag or main
     clients_docker('amd64', 'fluentd') {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMaster,
+      when: condition('exclude').tagMain,
       settings+: {
         dry_run: true,
         repo: 'grafana/fluent-plugin-loki',
       },
     },
   ] + [
-    // publish for tag or master
+    // publish for tag or main
     clients_docker('amd64', 'fluentd') {
       depends_on: ['image-tag'],
-      when: condition('include').tagMaster,
+      when: condition('include').tagMain,
       settings+: {
         repo: 'grafana/fluent-plugin-loki',
       },
@@ -135,22 +135,22 @@ local fluentd() = pipeline('fluentd-amd64') + arch_image('amd64', 'latest,master
   depends_on: ['check'],
 };
 
-local logstash() = pipeline('logstash-amd64') + arch_image('amd64', 'latest,master') {
+local logstash() = pipeline('logstash-amd64') + arch_image('amd64', 'latest,main') {
   steps+: [
-    // dry run for everything that is not tag or master
+    // dry run for everything that is not tag or main
     clients_docker('amd64', 'logstash') {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMaster,
+      when: condition('exclude').tagMain,
       settings+: {
         dry_run: true,
         repo: 'grafana/logstash-output-loki',
       },
     },
   ] + [
-    // publish for tag or master
+    // publish for tag or main
     clients_docker('amd64', 'logstash') {
       depends_on: ['image-tag'],
-      when: condition('include').tagMaster,
+      when: condition('include').tagMain,
       settings+: {
         repo: 'grafana/logstash-output-loki',
       },
@@ -161,20 +161,20 @@ local logstash() = pipeline('logstash-amd64') + arch_image('amd64', 'latest,mast
 
 local promtail(arch) = pipeline('promtail-' + arch) + arch_image(arch) {
 steps+: [
-    // dry run for everything that is not tag or master
+    // dry run for everything that is not tag or main
     clients_docker(arch, 'promtail') {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMaster,
+      when: condition('exclude').tagMain,
       settings+: {
         dry_run: true,
         build_args: ['TOUCH_PROTOS=1'],
       },
     }
   ] + [
-    // publish for tag or master
+    // publish for tag or main
     clients_docker(arch, 'promtail') {
       depends_on: ['image-tag'],
-      when: condition('include').tagMaster,
+      when: condition('include').tagMain,
       settings+: {
         build_args: ['TOUCH_PROTOS=1'],
       },
@@ -185,10 +185,10 @@ steps+: [
 
 local multiarch_image(arch) = pipeline('docker-' + arch) + arch_image(arch) {
   steps+: [
-    // dry run for everything that is not tag or master
+    // dry run for everything that is not tag or main
     docker(arch, app) {
       depends_on: ['image-tag'],
-      when: condition('exclude').tagMaster,
+      when: condition('exclude').tagMain,
       settings+: {
         dry_run: true,
         build_args: ['TOUCH_PROTOS=1'],
@@ -196,10 +196,10 @@ local multiarch_image(arch) = pipeline('docker-' + arch) + arch_image(arch) {
     }
     for app in apps
   ] + [
-    // publish for tag or master
+    // publish for tag or main
     docker(arch, app) {
       depends_on: ['image-tag'],
-      when: condition('include').tagMaster,
+      when: condition('include').tagMain,
       settings+: {
         build_args: ['TOUCH_PROTOS=1'],
       },
@@ -290,11 +290,11 @@ local manifest(apps) = pipeline('manifest') {
   logstash(),
 ] + [
   manifest(['promtail', 'loki', 'loki-canary']) {
-    trigger: condition('include').tagMaster,
+    trigger: condition('include').tagMain,
   },
 ] + [
   pipeline('deploy') {
-    trigger: condition('include').tagMaster,
+    trigger: condition('include').tagMain,
     depends_on: ['manifest'],
     steps: [
       {
diff --git a/.drone/drone.yml b/.drone/drone.yml
index 5f9fff6f17b3..76207fbd8c30 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -72,7 +72,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -93,7 +93,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -114,7 +114,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -133,7 +133,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -152,7 +152,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -171,7 +171,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -211,7 +211,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -232,7 +232,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -253,7 +253,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -272,7 +272,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -291,7 +291,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -310,7 +310,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -350,7 +350,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -371,7 +371,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -392,7 +392,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -411,7 +411,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -430,7 +430,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -449,7 +449,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -489,7 +489,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -508,7 +508,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -548,7 +548,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -567,7 +567,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -607,7 +607,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -626,7 +626,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -650,7 +650,7 @@ steps:
   - apk add --no-cache bash git
   - git fetch origin --tags
   - echo $(./tools/image-tag)-amd64 > .tags
-  - echo ",latest,master" >> .tags
+  - echo ",latest,main" >> .tags
 
 - name: build-fluent-bit-image
   image: plugins/docker
@@ -665,7 +665,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -682,7 +682,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -706,7 +706,7 @@ steps:
   - apk add --no-cache bash git
   - git fetch origin --tags
   - echo $(./tools/image-tag)-amd64 > .tags
-  - echo ",latest,master" >> .tags
+  - echo ",latest,main" >> .tags
 
 - name: build-fluentd-image
   image: plugins/docker
@@ -721,7 +721,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -738,7 +738,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -762,7 +762,7 @@ steps:
   - apk add --no-cache bash git
   - git fetch origin --tags
   - echo $(./tools/image-tag)-amd64 > .tags
-  - echo ",latest,master" >> .tags
+  - echo ",latest,main" >> .tags
 
 - name: build-logstash-image
   image: plugins/docker
@@ -777,7 +777,7 @@ steps:
   when:
     ref:
       exclude:
-      - refs/heads/master
+      - refs/heads/main
       - refs/heads/k??
       - refs/tags/v*
   depends_on:
@@ -794,7 +794,7 @@ steps:
       from_secret: docker_username
   when:
     ref:
-    - refs/heads/master
+    - refs/heads/main
     - refs/heads/k??
     - refs/tags/v*
   depends_on:
@@ -852,7 +852,7 @@ steps:
 
 trigger:
   ref:
-  - refs/heads/master
+  - refs/heads/main
   - refs/heads/k??
   - refs/tags/v*
 
@@ -885,7 +885,7 @@ steps:
 
 trigger:
   ref:
-  - refs/heads/master
+  - refs/heads/main
   - refs/heads/k??
   - refs/tags/v*