diff --git a/.github/workflows/branches-and-prs.yml b/.github/workflows/branches-and-prs.yml
index 96e44404f2..07938edb57 100644
--- a/.github/workflows/branches-and-prs.yml
+++ b/.github/workflows/branches-and-prs.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - master
+      - main
       - gh-pages
   pull_request:
     branches:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ff7dbc4506..bf4987704e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,13 +4,14 @@ on:
   push:
     branches:
       - master
+      - main
     tags:
       - 'spock-*'
 
 jobs:
   build-and-verify:
     runs-on: ${{ matrix.os }}
-    if: github.repository == 'spockframework/spock' && github.ref == 'refs/heads/master'
+    if: github.repository == 'spockframework/spock' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
     strategy:
       fail-fast: false
       matrix:
diff --git a/build.gradle b/build.gradle
index cb17587e82..da5d8df24e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -238,12 +238,12 @@ if (gradle.startParameter.taskNames == ["ghActionsBuild"]) {
 if (gradle.startParameter.taskNames == ["ghActionsPublish"] || gradle.startParameter.taskNames == ["ghActionsDocs"] ) {
   def originalStartParamteterTaskNames = gradle.startParameter.taskNames
   gradle.startParameter.taskNames = []
-  boolean isMaster = System.getenv("GITHUB_REF") == "refs/heads/master"
+  boolean isMain = (System.getenv("GITHUB_REF") == "refs/heads/master" || System.getenv("GITHUB_REF") == "refs/heads/main")
   boolean isTag = System.getenv("GITHUB_REF")?.startsWith('refs/tags/spock-')
   if (!(System.getenv("GITHUB_EVENT_NAME") == "push"
-          && (isMaster || isTag)
+          && (isMain || isTag)
           && System.getenv("GITHUB_REPOSITORY") == 'spockframework/spock')) {
-    throw new IllegalArgumentException("""ghActionsPublish can only be run on push to branch master or tag in repo spockframework/spock
+    throw new IllegalArgumentException("""ghActionsPublish can only be run on push to branch main or tag in repo spockframework/spock
       event: ${System.getenv("GITHUB_EVENT_NAME")}
       ref: ${System.getenv("GITHUB_REF")}
       repo: ${System.getenv("GITHUB_REPOSITORY")}""")
@@ -254,7 +254,7 @@ if (gradle.startParameter.taskNames == ["ghActionsPublish"] || gradle.startParam
       throw new IllegalArgumentException("ghActionsPublish can only be run on Java ${javaVersions.min()} but was run on $javaVersion")
     }
     /*
-      We want to release only snapshots directly from master, final releases will be tagged and then published from that tag.
+      We want to release only snapshots directly from main, final releases will be tagged and then published from that tag.
      */
     if (snapshotVersion || isTag) {
       gradle.startParameter.taskNames += ["publish"]