diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 543f1e9..1d6dd03 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -37,7 +37,7 @@
       cache-key: rb-nightly-${{ matrix.gem }}
       run: |
         export GEM_HOST_API_KEY="Bearer $GITHUB_TOKEN"
-        ./go rb:release['nightly','--config=release']
+        ./go rb:release[nightly,--config=release]
   on-ruby-failure:
     name: On Ruby Failure
     runs-on: ubuntu-latest
@@ -90,7 +90,7 @@
     with:
       name: Nightly Java Release
       cache-key: java-nightly
-      run: ./go publish-maven-snapshot
+      run: ./go java:release[--stamp,nightly]
     secrets: inherit
   on-java-failure:
     name: On Java Failure
diff --git a/Rakefile b/Rakefile
index e3fbf4d..cf17e08 100644
--- a/Rakefile
+++ b/Rakefile
@@ -914,8 +914,27 @@
   desc 'Deploy all jars to Maven'
   task :release do |_task, arguments|
     args = arguments.to_a.compact.empty? ? ['--stamp'] : arguments.to_a.compact
-    Rake::Task['java:package'].invoke(*args)
-    Rake::Task['publish-maven'].invoke
+    nightly = args.delete('nightly')
+
+    JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('build', args, target) }
+
+    user, password = read_m2_user_pass
+    repo = nightly ? 'content/repositories/snapshots' : 'service/local/staging/deploy/maven2'
+    gpg = nightly ? 'false' : 'true'
+
+    Rake::Task['java:version'].invoke if nightly
+
+    release_args = ['--stamp',
+                    '--define',
+                    "maven_repo=https://oss.sonatype.org/#{repo}",
+                    '--define',
+                    "maven_user=#{user}",
+                    "--define",
+                    "maven_password=#{password}",
+                    '--define',
+                    "gpg_sign=#{gpg}"]
+
+    JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('run', release_args, target) }
   end
 
   desc 'Install jars to local m2 directory'