diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index fa015a17..48a71129 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -43,8 +43,6 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           ORG_GRADLE_PROJECT_artifactoryPublishUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
           ORG_GRADLE_PROJECT_artifactoryPublishPassword: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         with:
           arguments: |
             -Dorg.gradle.internal.publish.checksums.insecure=true
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index f5036a50..2daffaf6 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -63,15 +63,16 @@ project.extensions.configure(PublishingExtension) { PublishingExtension pe ->
         repositories {
             maven {
                 credentials {
-                    username = project.findProperty('artifactoryPublishUsername') ?: System.getenv("ARTIFACTORY_USERNAME")
-                    password = project.findProperty('artifactoryPublishPassword') ?: System.getenv("ARTIFACTORY_PASSWORD")
+                    username = project.findProperty('artifactoryPublishUsername') ?: ''
+                    password = project.findProperty('artifactoryPublishPassword') ?: ''
                 }
-                url "https://repo.grails.org/grails/libs-snapshots-local"
+                url = isGrailsPlugin ?
+                    uri('https://repo.grails.org/grails/plugins3-snapshots-local') :
+                    uri('https://repo.grails.org/grails/libs-snapshots-local')
+
             }
         }
     }
-
-
 }
 
 afterEvaluate {