diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e0df471..a32d62e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Deploy
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
     tags:
       - 'v*'
 
@@ -19,7 +19,7 @@ jobs:
       - run: npm ci
       - run: npm run build:production
       - name: Sonar analysis
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarcloud-github-action@main
         with:
           projectBaseDir: .
         env:
@@ -28,7 +28,7 @@ jobs:
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} 
       # Only trigger if it's release tag. 
       - name: Create Release
-        if: ${{ endsWith(github.ref, 'master') == false }}
+        if: ${{ endsWith(github.ref, 'main') == false }}
         id: create_release
         uses: actions/create-release@v1
         env:
@@ -39,7 +39,7 @@ jobs:
           draft: false
           prerelease: false
       - name: Upload release asset
-        if: ${{ endsWith(github.ref, 'master') == false }}
+        if: ${{ endsWith(github.ref, 'main') == false }}
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
@@ -50,7 +50,7 @@ jobs:
           asset_name: user-feedback-form.min.js
           asset_content_type: text/javascript
       - name: Publish npm package
-        if: ${{ endsWith(github.ref, 'master') == false }}
+        if: ${{ endsWith(github.ref, 'main') == false }}
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_AUTH_TOKEN}}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cebf654..874a4e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,12 +32,12 @@ jobs:
             --nodePackageSkipDevDependencies
             --nodeAuditSkipDevDependencies
       - name: Upload OWAPS results
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@main
         with:
            name: Depcheck report
            path: ${{github.workspace}}/reports
       - name: Sonar analysis
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: sonarsource/sonarcloud-github-action@main
         with:
           projectBaseDir: .
         env:
diff --git a/.gitpod.yml b/.gitpod.yml
index fe4cc47..a1c558d 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -9,7 +9,7 @@ tasks:
 github:
   prebuilds:
     # enable for the default branch (defaults to true)
-    master: true
+    main: true
     # enable for all branches in this repo (defaults to false)
     branches: true
     # enable for pull requests coming from this repo (defaults to true)