diff --git a/kokoro/release/linux/build_artifacts.sh b/kokoro/release/linux/build_artifacts.sh
deleted file mode 100755
index ae7dc813c4ed..000000000000
--- a/kokoro/release/linux/build_artifacts.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# change to repo root
-cd $(dirname $0)/../../..
-
-source kokoro/release/linux/prepare_build.sh
-
-# ruby environment
-source kokoro/release/linux/ruby/ruby_build_environment.sh
-
-# build artifacts
-bash kokoro/release/linux/ruby/ruby_build.sh
diff --git a/kokoro/release/ruby/linux/build_artifacts.sh b/kokoro/release/ruby/linux/build_artifacts.sh
new file mode 100755
index 000000000000..88555226b01f
--- /dev/null
+++ b/kokoro/release/ruby/linux/build_artifacts.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -ex
+
+# change to repo root
+cd $(dirname $0)/../../../..
+
+source kokoro/release/ruby/linux/prepare_build.sh
+
+# ruby environment
+source kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
+
+# build artifacts
+bash kokoro/release/ruby/linux/ruby/ruby_build.sh
diff --git a/kokoro/release/linux/prepare_build.sh b/kokoro/release/ruby/linux/prepare_build.sh
similarity index 100%
rename from kokoro/release/linux/prepare_build.sh
rename to kokoro/release/ruby/linux/prepare_build.sh
diff --git a/kokoro/release/linux/release.cfg b/kokoro/release/ruby/linux/release.cfg
similarity index 63%
rename from kokoro/release/linux/release.cfg
rename to kokoro/release/ruby/linux/release.cfg
index 5dae7019d449..dbc71b2ceb30 100644
--- a/kokoro/release/linux/release.cfg
+++ b/kokoro/release/ruby/linux/release.cfg
@@ -1,5 +1,5 @@
 # Configuration for Linux release builds
-build_file: "protobuf/kokoro/release/linux/build_artifacts.sh"
+build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh"
 
 action {
   define_artifacts {
diff --git a/kokoro/release/linux/ruby/ruby_build.sh b/kokoro/release/ruby/linux/ruby/ruby_build.sh
similarity index 100%
rename from kokoro/release/linux/ruby/ruby_build.sh
rename to kokoro/release/ruby/linux/ruby/ruby_build.sh
diff --git a/kokoro/release/linux/ruby/ruby_build_environment.sh b/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
similarity index 100%
rename from kokoro/release/linux/ruby/ruby_build_environment.sh
rename to kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
diff --git a/kokoro/release/macos/build_artifacts.sh b/kokoro/release/ruby/macos/build_artifacts.sh
similarity index 59%
rename from kokoro/release/macos/build_artifacts.sh
rename to kokoro/release/ruby/macos/build_artifacts.sh
index 23135ca35419..c68b63cc43d7 100755
--- a/kokoro/release/macos/build_artifacts.sh
+++ b/kokoro/release/ruby/macos/build_artifacts.sh
@@ -3,17 +3,17 @@
 set -ex
 
 # change to repo root
-cd $(dirname $0)/../../..
+cd $(dirname $0)/../../../..
 
 # all artifacts come here
 mkdir artifacts
 export ARTIFACT_DIR=$(pwd)/artifacts
 
 # ruby environment
-bash kokoro/release/macos/ruby/ruby_build_environment.sh
+bash kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
 
 gem install rubygems-update
 update_rubygems
 
 # build artifacts
-bash kokoro/release/macos/ruby/ruby_build.sh
+bash kokoro/release/ruby/macos/ruby/ruby_build.sh
diff --git a/kokoro/release/macos/release.cfg b/kokoro/release/ruby/macos/release.cfg
similarity index 64%
rename from kokoro/release/macos/release.cfg
rename to kokoro/release/ruby/macos/release.cfg
index 35d36deed497..cb1c08bb8827 100644
--- a/kokoro/release/macos/release.cfg
+++ b/kokoro/release/ruby/macos/release.cfg
@@ -1,5 +1,5 @@
 # Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/macos/build_artifacts.sh"
+build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh"
 
 action {
   define_artifacts {
diff --git a/kokoro/release/macos/ruby/ruby_build.sh b/kokoro/release/ruby/macos/ruby/ruby_build.sh
similarity index 100%
rename from kokoro/release/macos/ruby/ruby_build.sh
rename to kokoro/release/ruby/macos/ruby/ruby_build.sh
diff --git a/kokoro/release/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
similarity index 100%
rename from kokoro/release/macos/ruby/ruby_build_environment.sh
rename to kokoro/release/ruby/macos/ruby/ruby_build_environment.sh