diff --git a/.github/javadoc-publish-clear b/.github/javadoc-publish-clear
index b3cd85f9b..1a5d6285a 100644
--- a/.github/javadoc-publish-clear
+++ b/.github/javadoc-publish-clear
@@ -1,3 +1,3 @@
-minestom-ce/**/*
+**/*
 !.git
 !CNAME
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
index bfc756bd2..ff2e4c643 100644
--- a/.github/workflows/javadoc.yml
+++ b/.github/workflows/javadoc.yml
@@ -2,7 +2,7 @@ name: Build and deploy Javadoc
 
 on:
   push:
-    branches: [main]
+    branches: [ master ]
 
 jobs:
   build:
@@ -10,22 +10,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build javadoc
-      run: ./gradlew javadoc
-      
-    - name: Deploy javadocs
-      uses: s0/git-publish-subdir-action@develop
-      env:
-        REPO: git@github.com:hollow-cube/javadocs.git
-        BRANCH: main
-        FOLDER: build/docs/javadoc
-        TARGET_DIR: minestom-ce
-        SSH_PRIVATE_KEY: ${{ secrets.JAVADOC_DEPLOY_PRIVATE_KEY }}
-        CLEAR_GLOBS_FILE: ".github/javadoc-publish-clear"
+      - uses: actions/checkout@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build javadoc
+        run: ./gradlew javadoc
+
+      - name: Deploy javadoc to its assigned branch
+        uses: s0/git-publish-subdir-action@develop
+        env:
+          REPO: self
+          BRANCH: javadoc
+          FOLDER: build/docs/javadoc
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CLEAR_GLOBS_FILE: ".github/javadoc-publish-clear"
\ No newline at end of file
diff --git a/.github/workflows/trigger-jitpack-build.yml b/.github/workflows/trigger-jitpack-build.yml
index 986d1c0f8..fb4bcd93b 100644
--- a/.github/workflows/trigger-jitpack-build.yml
+++ b/.github/workflows/trigger-jitpack-build.yml
@@ -9,4 +9,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Jitpack Build
-        run: curl "https://jitpack.io/com/github/hollow-cube/minestom-ce/${GITHUB_SHA:0:10}/build.log"
+        run: curl "https://jitpack.io/com/github/Minestom/Minestom/${GITHUB_SHA:0:10}/build.log"