diff --git a/roles/autohotkey/tasks/main.yaml b/roles/autohotkey/tasks/main.yaml
index 8f64b6d..96ed89f 100644
--- a/roles/autohotkey/tasks/main.yaml
+++ b/roles/autohotkey/tasks/main.yaml
@@ -8,7 +8,7 @@
   win_git:
     repo: git@code.infektor.net:config/AutoHotKey.git
     dest: '{{autohotkey_repo_dir}}'
-    branch: master
+    branch: main
 
 - name: create scheduled task
   win_scheduled_task:
diff --git a/roles/git/tasks/Windows.yaml b/roles/git/tasks/Windows.yaml
index 18ba008..14e3484 100644
--- a/roles/git/tasks/Windows.yaml
+++ b/roles/git/tasks/Windows.yaml
@@ -36,7 +36,7 @@
   win_git:
     repo: '{{item.repo}}'
     dest: '{{ansible_env.USERPROFILE}}/.config/{{item.name}}'
-    version: master
+    version: main
   with_items: '{{git_config_repos}}'
 
 # - TODO: install pip packages
diff --git a/roles/git/tasks/unix.yaml b/roles/git/tasks/unix.yaml
index c50e0bd..a21f635 100644
--- a/roles/git/tasks/unix.yaml
+++ b/roles/git/tasks/unix.yaml
@@ -3,7 +3,7 @@
   git:
     repo: '{{item.repo}}'
     dest: '~/.config/{{item.name}}'
-    version: master
+    version: main
   with_items: '{{git_config_repos}}'
 
 - name: install homebrew packages
diff --git a/roles/kitty/tasks/main.yaml b/roles/kitty/tasks/main.yaml
index 119f66c..702e8d6 100644
--- a/roles/kitty/tasks/main.yaml
+++ b/roles/kitty/tasks/main.yaml
@@ -5,3 +5,4 @@
   git:
     repo: git@code.infektor.net:config/kitty.git
     dest: ~/.config/kitty
+    version: main
diff --git a/roles/powershell/tasks/main.yaml b/roles/powershell/tasks/main.yaml
index 8b37946..39166f1 100644
--- a/roles/powershell/tasks/main.yaml
+++ b/roles/powershell/tasks/main.yaml
@@ -7,7 +7,7 @@
   win_git:
     repo: https://code.infektor.net/config/WindowsPowerShell.git
     dest: '{{powershell_config_dir}}'
-    branch: master
+    branch: main
 
 - name: remove cmder chocolatey package
   win_chocolatey:
diff --git a/roles/xremap/tasks/main.yaml b/roles/xremap/tasks/main.yaml
index 857a616..d0a97c4 100644
--- a/roles/xremap/tasks/main.yaml
+++ b/roles/xremap/tasks/main.yaml
@@ -108,6 +108,7 @@
   git:
     repo: git@code.infektor.net:config/xremap.git
     dest: '{{config_dir}}'
+    version: main
   notify: restart xremap
 
 - name: install xremap systemd unit