diff --git a/.github/workflows/staleness_check.yml b/.github/workflows/staleness_check.yml
index de40b0d4aed56..8e54da370b17b 100644
--- a/.github/workflows/staleness_check.yml
+++ b/.github/workflows/staleness_check.yml
@@ -59,12 +59,11 @@ jobs:
         # In branches where automatic updates work as post-submits, we don't want to run staleness
         # tests along with user changes.  Any stale files will be automatically fixed in a follow-up
         # commit.
-        uses: protocolbuffers/protobuf-ci/bazel@v3
+        uses: deannagarcia/protobuf-ci/bazel@set-ex-test
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           bazel-cache: staleness
           bash: >
-            set -ex;
             echo "Please run ./regenerate_stale_files.sh to regenerate stale files";
             if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then
             bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS;
diff --git a/.github/workflows/test_csharp.yml b/.github/workflows/test_csharp.yml
index ae0b76d40bd4a..a1aa5174b1d2b 100644
--- a/.github/workflows/test_csharp.yml
+++ b/.github/workflows/test_csharp.yml
@@ -72,7 +72,7 @@ jobs:
         shell: bash
 
       - name: Run tests
-        uses: protocolbuffers/protobuf-ci/bash@v3
+        uses: deannagarcia/protobuf-ci/bash@set-ex-test
         with:
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: |
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
index 2c8461d07c1e3..defba22013973 100644
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@@ -104,13 +104,12 @@ jobs:
       with:
         ref: ${{ inputs.safe-checkout }}
     - name: Generate maven artifacts with bazel and install using maven
-      uses: protocolbuffers/protobuf-ci/bazel-docker@v3
+      uses: deannagarcia/protobuf-ci/bazel-docker@set-ex-test
       with:
         image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
         credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
         bazel-cache: java_linux/11
         bash: |
-          set -ex
           bazel build //java:release
           mvn install:install-file -Dfile=java/bom/pom.xml -DpomFile=java/bom/pom.xml
           mvn install:install-file -Dfile=java/pom.xml -DpomFile=java/pom.xml
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index f20325ebb1c22..f66a405099d0b 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>4.29.0</version>
+  <version>4.23.3</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom_template.xml b/java/core/pom_template.xml
index 11bd41964f8d1..36dcee0b9f687 100644
--- a/java/core/pom_template.xml
+++ b/java/core/pom_template.xml
@@ -2,7 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>{groupId}</groupId>
     <artifactId>protobuf-parent</artifactId>
     <version>{version}</version>
   </parent>