diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fcd531c1..e72f50dd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @conor10 @iikirilov
\ No newline at end of file
+* @conor10 @gtebrean @NickSneo
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9594b662..188a1439 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,3 +7,8 @@
 ### Why is it needed?
 *required*
 
+## Checklist
+
+- [ ] I've read the contribution guidelines.
+- [ ] I've added tests (if applicable).
+- [ ] I've added a changelog entry if necessary.
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03ff3930..6795a5a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index f8ccbfc8..af3ad35c 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -3,7 +3,7 @@ name: Publish snapshot
 on:
   workflow_run:
     workflows: [ 'Build' ]
-    branches: [ master ]
+    branches: [ main ]
     types: [ completed ]
 
 jobs:
@@ -11,9 +11,10 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     env:
-      OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+      OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
@@ -29,8 +30,6 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Decrypt secret key
-        run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d
       - name: Publish snapshot
         run: ./gradlew publish
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cfd9077d..6830763e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,9 +7,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     env:
-      OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+      OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }}
       OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v2
@@ -36,8 +37,6 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      - name: Decrypt secret key
-        run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d
       - name: Release name
         id: release_name
         uses: actions/github-script@v4
diff --git a/.gitignore b/.gitignore
index 8ed1fc3b..13c9c3fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,8 +50,6 @@ docs/build
 **/.settings
 **/bin
 
-web3j.asc
-
 gradle/bintray
 gradle/jacoco
 gradle/java
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e1a2209..01849a08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,11 +11,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Features
 
-* 
+* Bump snapshot version to 4.11.3 [#109](https://github.com/hyperledger/web3j-openapi/pull/109)
 
 ### BREAKING CHANGES
 
-* 
+* Master branch rename to main and repo migration fixes [#111](https://github.com/hyperledger/web3j-openapi/pull/111)
 
 # [4.11.2](https://github.com/web3j/web3j-openapi/releases/tag/v4.11.2) (2024-03-27)
 
diff --git a/build.gradle b/build.gradle
index 77479d18..83ad19b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ subprojects {
                 'spotless'
         ].each { buildScript ->
             download {
-                src "https://raw.githubusercontent.com/web3j/build-tools/master/gradle/$buildScript/build.gradle"
+                src "https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/$buildScript/build.gradle"
                 dest "$rootDir/gradle/$buildScript/build.gradle"
                 overwrite false
                 quiet true
diff --git a/web3j.asc.enc b/web3j.asc.enc
deleted file mode 100644
index 2bc247e7..00000000
Binary files a/web3j.asc.enc and /dev/null differ