diff --git a/.github/actions/gradle-command-action b/.github/actions/gradle-command-action
new file mode 160000
index 000000000000..90ccf054e6b9
--- /dev/null
+++ b/.github/actions/gradle-command-action
@@ -0,0 +1 @@
+Subproject commit 90ccf054e6b9905f30f98c938bce4c6acd323b6b
diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
index 62c51fbf721a..0b8cf2fa7066 100644
--- a/.github/workflows/java_tests.yml
+++ b/.github/workflows/java_tests.yml
@@ -67,9 +67,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
       # :sdks:java:core:test
       - name: Run :sdks:java:core:test
-        uses: eskatos/gradle-command-action@v1
+        uses: ./.github/actions/gradle-command-action
         with:
           arguments: :sdks:java:core:test
       - name: Upload test logs for :sdks:java:core:test
@@ -80,7 +83,7 @@ jobs:
           path: sdks/java/core/build/reports/tests/test
       # :sdks:java:harness:test
       - name: Run :sdks:java:harness:test
-        uses: eskatos/gradle-command-action@v1
+        uses: ./.github/actions/gradle-command-action
         with:
           arguments: :sdks:java:harness:test
         if: always()
@@ -92,7 +95,7 @@ jobs:
           path: sdks/java/harness/build/reports/tests/test
       # :runners:core-java:test
       - name: Run :runners:core-java:test
-        uses: eskatos/gradle-command-action@v1
+        uses: ./.github/actions/gradle-command-action
         with:
           arguments: :runners:core-java:test
         if: always()
@@ -113,8 +116,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
       - name: Run WordCount Unix
-        uses: eskatos/gradle-command-action@v1
+        uses: ./.github/actions/gradle-command-action
         with:
           arguments: -p examples/ integrationTest --tests org.apache.beam.examples.WordCountIT
             -DintegrationTestRunner=direct
@@ -143,6 +149,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          submodules: recursive
       - name: Authenticate on GCP
         uses: google-github-actions/setup-gcloud@master
         with:
@@ -151,7 +160,7 @@ jobs:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           export_default_credentials: true
       - name: Run WordCount
-        uses: eskatos/gradle-command-action@v1
+        uses: ./.github/actions/gradle-command-action
         with:
           arguments: -p examples/ integrationTest --tests org.apache.beam.examples.WordCountIT
             -DintegrationTestPipelineOptions=["--runner=DataflowRunner","--project=${{ secrets.GCP_PROJECT_ID }}","--tempRoot=gs://${{ secrets.GCP_TESTING_BUCKET }}/tmp/"]
diff --git a/.gitmodules b/.gitmodules
index 3a6406c405f3..fa6e30a8850a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [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