diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..da5735c
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+ame: Release
+on: workflow_dispatch
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    env:
+      PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8.0.372+7
+          cache: sbt
+          gpg-private-key: ${{ secrets.PGP_SECRET }}
+          gpg-passphrase: PGP_PASSPHRASE
+      - run: git config user.email "release-bot@sbt.github.com"
+      - run: git config user.name "sbt release bot"
+      - name: Push tag
+        run: sbt release with-defaults
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
index 5fc8f39..29135e8 100644
--- a/.github/workflows/scala.yml
+++ b/.github/workflows/scala.yml
@@ -12,10 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
-        java-version: 1.8
+        distribution: temurin
+        java-version: 8.0.372+7
+        cache: sbt
     - name: Run tests
       run: sbt "^ scripted"
\ No newline at end of file
diff --git a/README.md b/README.md
index a959f44..6a02e00 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,9 @@ This sbt plugin adds Java agents to projects in a general way. It can enable age
 Add the plugin to your `project/plugins.sbt`:
 
 ```scala
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % versionNumber)
+addSbtPlugin("com.github.sbt" % "sbt-javaagent" % versionNumber)
+// Until version 0.1.6
+addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
 ```
 
 See [sbt-javaagent releases] for a list of released versions.
diff --git a/build.sbt b/build.sbt
index ac80a32..575a11b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,7 +7,7 @@ lazy val `sbt-javaagent` = project in file(".")
 sbtPlugin := true
 
 name := "sbt-javaagent"
-organization := "com.lightbend.sbt"
+organization := "com.github.sbt"
 
 // sbt cross build
 crossSbtVersions := Seq("0.13.18", "1.2.8")
@@ -79,12 +79,14 @@ scriptedDependencies := {
 }
 
 // publish settings
-publishMavenStyle := false
-bintrayOrganization := Some("sbt")
-bintrayRepository := "sbt-plugin-releases"
-bintrayPackage := "sbt-javaagent"
-bintrayReleaseOnPublish := false
+publishMavenStyle := true
 licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")
+scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-javaagent"), "scm:git:git@github.com:sbt/sbt-javaagent.git"))
+homepage := scmInfo.value.map(_.browseUrl)
+developers := List(
+  Developer("contributors", "Contributors", "https://github.com/sbt/sbt-javaagent/discussions", url("https://github.com/sbt/sbt-javaagent/graphs/contributors"))
+)
+publishTo := sonatypePublishTo.value
 
 // release settings
 import ReleaseTransformations._
@@ -96,8 +98,8 @@ releaseProcess := Seq[ReleaseStep](
   setReleaseVersion,
   commitReleaseVersion,
   tagRelease,
-  releaseStepCommandAndRemaining("^ publish"),
-  releaseStepTask(bintrayRelease),
+  releaseStepCommandAndRemaining("^ publishSigned"),
+  releaseStepCommand("sonatypeReleaseAll"),
   setNextVersion,
   commitNextVersion,
   pushChanges
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7e10ec9..3b3ff6e 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -3,6 +3,7 @@
  */
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
-addSbtPlugin("me.lessis"         % "bintray-sbt" % "0.3.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
diff --git a/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt b/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt
index ee8dffc..d2ea58f 100644
--- a/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt
+++ b/src/sbt-test-0.13/agent/dist_1.0.x/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.10x.version"))
diff --git a/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt b/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt
index c971d1c..f5f727d 100644
--- a/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt
+++ b/src/sbt-test-0.13/agent/dist_1.1.x/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.11x.version"))
diff --git a/src/sbt-test/agent/arguments/project/plugins.sbt b/src/sbt-test/agent/arguments/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/arguments/project/plugins.sbt
+++ b/src/sbt-test/agent/arguments/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/compile/project/plugins.sbt b/src/sbt-test/agent/compile/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/compile/project/plugins.sbt
+++ b/src/sbt-test/agent/compile/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/confs/project/plugins.sbt b/src/sbt-test/agent/confs/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/confs/project/plugins.sbt
+++ b/src/sbt-test/agent/confs/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/dist/project/plugins.sbt b/src/sbt-test/agent/dist/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/dist/project/plugins.sbt
+++ b/src/sbt-test/agent/dist/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/dist_1.2.x/project/plugins.sbt b/src/sbt-test/agent/dist_1.2.x/project/plugins.sbt
index 13108c7..a779442 100644
--- a/src/sbt-test/agent/dist_1.2.x/project/plugins.sbt
+++ b/src/sbt-test/agent/dist_1.2.x/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.12x.version"))
diff --git a/src/sbt-test/agent/named/project/plugins.sbt b/src/sbt-test/agent/named/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/named/project/plugins.sbt
+++ b/src/sbt-test/agent/named/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/provided/project/plugins.sbt b/src/sbt-test/agent/provided/project/plugins.sbt
index 59f584f..a996aba 100644
--- a/src/sbt-test/agent/provided/project/plugins.sbt
+++ b/src/sbt-test/agent/provided/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent"       % sys.props("project.version"))
 addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % sys.props("packager.version"))
diff --git a/src/sbt-test/agent/run/project/plugins.sbt b/src/sbt-test/agent/run/project/plugins.sbt
index d3e4bd9..376bec1 100644
--- a/src/sbt-test/agent/run/project/plugins.sbt
+++ b/src/sbt-test/agent/run/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
diff --git a/src/sbt-test/agent/test/project/plugins.sbt b/src/sbt-test/agent/test/project/plugins.sbt
index d3e4bd9..376bec1 100644
--- a/src/sbt-test/agent/test/project/plugins.sbt
+++ b/src/sbt-test/agent/test/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
+addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))