diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0baea44..469cd83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,6 +104,7 @@ jobs:
 
   publish:
     needs: generate-launchers
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/build.sc b/build.sc
index d98da02..720e414 100644
--- a/build.sc
+++ b/build.sc
@@ -165,13 +165,13 @@ def publishVersion0 = T {
       .stripPrefix("v")
 }
 
-def ghOrg = "scala-cli"
+def ghOrg = "VirtusLab"
 def ghName = "java-class-name"
 trait JavaClassNamePublishModule extends PublishModule {
   import mill.scalalib.publish._
   def pomSettings = PomSettings(
     description = artifactName(),
-    organization = "io.github.alexarchambault.scala-cli",
+    organization = "org.virtuslab.scala-cli.java-class-name",
     url = s"https://github.com/$ghOrg/$ghName",
     licenses = Seq(License.`Apache-2.0`),
     versionControl = VersionControl.github(ghOrg, ghName),