diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index 8df89f2..991ecd8 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -27,7 +27,8 @@ jobs:
 
       - name: Build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ env.GITHUB_ACTOR }}
+          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --no-daemon
 
       - name: Upload artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3fa57b8..e4ea471 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,8 @@ jobs:
 
       - name: Build
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew assembleRelease --no-daemon
 
       - name: Setup Node.js
@@ -60,6 +61,8 @@ jobs:
         id: release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
           KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
diff --git a/build.gradle.kts b/build.gradle.kts
index e938bf9..4c613bc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,18 +9,14 @@ plugins {
     signing
 }
 
-repositories {
-    mavenLocal()
-    google()
-    mavenCentral()
-    maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/revanced/registry")
-        credentials {
-            username = providers.gradleProperty("gpr.user")
-                .getOrElse(System.getenv("GITHUB_ACTOR"))
-            password =
-                providers.gradleProperty("gpr.key").getOrElse(System.getenv("GITHUB_TOKEN"))
+subprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            name = "githubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/registry")
+            credentials(PasswordCredentials::class)
         }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a3fd007..f056a1c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,12 +5,9 @@ pluginManagement {
         gradlePluginPortal()
         google()
         maven {
-            name = "GitHubPackages"
+            name = "githubPackages"
             url = uri("https://maven.pkg.github.com/revanced/registry")
-            credentials {
-                username = providers.gradleProperty("gpr.user").getOrElse(System.getenv("GITHUB_ACTOR"))
-                password = providers.gradleProperty("gpr.key").getOrElse(System.getenv("GITHUB_TOKEN"))
-            }
+            credentials(PasswordCredentials::class)
         }
     }
 }
\ No newline at end of file