diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 59f632c895..520a893c5e 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -201,7 +201,7 @@
     dest: /root/fedora_openqa
   register: gittools
   # case of the 'n' seems inconstant, so intentionally omitted
-  when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)"
+  when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch main') != -1)"
 
 - name: Check if fedora_openqa is installed for current Python
   command: "pip show fedora_openqa"
diff --git a/roles/openqa/worker/defaults/main.yml b/roles/openqa/worker/defaults/main.yml
index a1dd3494c8..c44923f7e3 100644
--- a/roles/openqa/worker/defaults/main.yml
+++ b/roles/openqa/worker/defaults/main.yml
@@ -1,6 +1,6 @@
 openqa_hostname: localhost
 openqa_repo: updates
-openqa_createhdds_branch: master
+openqa_createhdds_branch: main
 openqa_nfs_worker: false
 openqa_tap: false
 openqa_hdds_worker: false
diff --git a/roles/openqa/worker/tasks/createhdds.yml b/roles/openqa/worker/tasks/createhdds.yml
index f0df315bb6..e4dd5b30b0 100644
--- a/roles/openqa/worker/tasks/createhdds.yml
+++ b/roles/openqa/worker/tasks/createhdds.yml
@@ -1,7 +1,7 @@
 # Required vars with defaults
 # - openqa_createhdds_branch
 ##       string - The git branch of createhdds to check out
-##       default - master
+##       default - main
 
 - name: Install required packages
   package: