diff --git a/.github/actions/gradle-command-action b/.github/actions/gradle-command-action
deleted file mode 160000
index 90ccf054e6b9..000000000000
--- a/.github/actions/gradle-command-action
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90ccf054e6b9905f30f98c938bce4c6acd323b6b
diff --git a/.github/actions/gradle-command-self-hosted-action/action.yml b/.github/actions/gradle-command-self-hosted-action/action.yml
index 906b35169d9d..e2fd768220a3 100644
--- a/.github/actions/gradle-command-self-hosted-action/action.yml
+++ b/.github/actions/gradle-command-self-hosted-action/action.yml
@@ -35,9 +35,9 @@ runs:
     - name: Run Gradle Command
       shell: bash
       run: |
-        # Removing settings.xml is a workaround to avoid a decryption issue
-        # of Beam's gradle-command-action plugin and github's provided
-        # maven settings.xml file
+        # This step is a workaround to avoid a decryption issue of Beam's
+        # net.linguica.gradle.maven.settings plugin and github's provided maven
+        # settings.xml file
         if [ -f ~/.m2/settings.xml ]; then
           rm ~/.m2/settings.xml
         fi
diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
index 1132ba1c196b..e5864c4ad934 100644
--- a/.github/workflows/java_tests.yml
+++ b/.github/workflows/java_tests.yml
@@ -82,16 +82,12 @@ jobs:
         with:
           java-version: 8
           go-version: 1.21
-      - name: Remove default github maven configuration
-        # This step is a workaround to avoid a decryption issue of Beam's
-        # net.linguica.gradle.maven.settings plugin and github's provided maven
-        # settings.xml file
-        run: rm ~/.m2/settings.xml
         # :sdks:java:core:test
       - name: Run :sdks:java:core:test
-        uses: ./.github/actions/gradle-command-action
+        uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          arguments: -p sdks/java/core/ test
+          gradle-command: test
+          arguments: -p sdks/java/core/
       - name: Upload test logs for :sdks:java:core:test
         uses: actions/upload-artifact@v3
         if: always()
@@ -100,9 +96,10 @@ jobs:
           path: sdks/java/core/build/reports/tests/test
       # :sdks:java:harness:test
       - name: Run :sdks:java:harness:test
-        uses: ./.github/actions/gradle-command-action
+        uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          arguments: -p sdks/java/harness/ test
+          gradle-command: test
+          arguments: -p sdks/java/harness/
         if: always()
       - name: Upload test logs for :sdks:java:harness:test
         uses: actions/upload-artifact@v3
@@ -112,9 +109,10 @@ jobs:
           path: sdks/java/harness/build/reports/tests/test
       # :runners:core-java:test
       - name: Run :runners:core-java:test
-        uses: ./.github/actions/gradle-command-action
+        uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          arguments: -p runners/core-java/ test
+          gradle-command: test
+          arguments: -p runners/core-java/
         if: always()
       - name: Upload test logs for :runners:core-java:test
         uses: actions/upload-artifact@v3
@@ -141,15 +139,11 @@ jobs:
         with:
           java-version: 8
           go-version: 1.21
-      - name: Remove default github maven configuration
-        # This step is a workaround to avoid a decryption issue of Beam's
-        # net.linguica.gradle.maven.settings plugin and github's provided maven
-        # settings.xml file
-        run: rm ~/.m2/settings.xml
       - name: Run WordCount Unix
-        uses: ./.github/actions/gradle-command-action
+        uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          arguments: -p examples/ integrationTest --tests org.apache.beam.examples.WordCountIT
+          gradle-command: integrationTest
+          arguments: -p examples/ --tests org.apache.beam.examples.WordCountIT
             -DintegrationTestRunner=direct
             -DintegrationTestPipelineOptions=["--runner=DirectRunner","--tempRoot=./tmp"]
       - name: Upload test logs
@@ -191,15 +185,11 @@ jobs:
           service_account_key: ${{ secrets.GCP_SA_KEY }}
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           export_default_credentials: true
-      - name: Remove default github maven configuration
-        # This step is a workaround to avoid a decryption issue of Beam's
-        # gradle-command-action plugin and github's provided maven
-        # settings.xml file
-        run: rm ~/.m2/settings.xml
       - name: Run WordCount
-        uses: ./.github/actions/gradle-command-action
+        uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          arguments: -p examples/ integrationTest --tests org.apache.beam.examples.WordCountIT
+          gradle-command: integrationTest
+          arguments: -p examples/ --tests org.apache.beam.examples.WordCountIT
             -DintegrationTestPipelineOptions=["--runner=DataflowRunner","--project=${{ secrets.GCP_PROJECT_ID }}","--tempRoot=gs://${{ secrets.GCP_TESTING_BUCKET }}/tmp/"]
             -DintegrationTestRunner=dataflow
       - name: Upload test logs
diff --git a/.gitmodules b/.gitmodules
index fa6e30a8850a..3a6406c405f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule ".github/actions/github-push-action"]
 	path = .github/actions/github-push-action
 	url = https://github.com/ad-m/github-push-action
-[submodule ".github/actions/gradle-command-action"]
-	path = .github/actions/gradle-command-action
-	url = https://github.com/eskatos/gradle-command-action