diff --git a/.github/workflows/generate-alpha-tag.yaml b/.github/workflows/generate-alpha-tag.yaml
index 3a383942d35..cd649e80e8e 100644
--- a/.github/workflows/generate-alpha-tag.yaml
+++ b/.github/workflows/generate-alpha-tag.yaml
@@ -3,7 +3,7 @@ name: generate-alpha-tag
 on:
   push:
     branches:
-      - rr-js-add-versioning-plugin
+      - main
 
 env:
   JAVA_OPTS: -Xms2g -Xmx4g
@@ -73,12 +73,8 @@ jobs:
       - name: Generate Tag
         run: ./gradlew createSemverTag "-Psemver.stage=alpha"
 
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          branch: 'main'
-          tags: true
-          github_token: '${{ secrets.GITHUB_TOKEN }}'
+      - name: Push
+        run: git push --follow-tags
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml
index ae7d1c61ca1..655289fa478 100644
--- a/.github/workflows/generate-tag.yaml
+++ b/.github/workflows/generate-tag.yaml
@@ -94,12 +94,8 @@ jobs:
       - name: Generate Tag
         run: ./gradlew createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
 
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          branch: 'main'
-          tags: true
-          github_token: '${{ secrets.GITHUB_TOKEN }}'
+      - name: Push
+        run: git push --follow-tags
 
       - name: Stop Gradle daemons
         run: ./gradlew --stop
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4417780af0c..5f9ceb07292 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -93,11 +93,11 @@ jobs:
             mac-step-gradle-
 
       - name: Publish alpha version
-        if: ${{ github.ref == 'refs/heads/main' && contains(env.lib_version, "alpha") }}
+        if: ${{ github.ref == 'refs/heads/main' && contains(env.lib_version, 'alpha') }}
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
 
       - name: Publish final version
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.lib_version, "alpha") && !contains(env.lib_version, "beta") && !contains(env.lib_version, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.lib_version, 'alpha') && !contains(env.lib_version, 'beta') && !contains(env.lib_version, 'rc') }}
         run: ./gradlew publishToSonatype closeSonatypeStagingRepository
 
       - name: Stop Gradle daemons
@@ -162,28 +162,28 @@ jobs:
 
       - name: Build release directory (/docs)
         working-directory: arrow-site
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, "alpha") && !contains(env.LIB_VERSION, "beta") && !contains(env.LIB_VERSION, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, 'alpha') && !contains(env.LIB_VERSION, 'beta') && !contains(env.LIB_VERSION, 'rc') }}
         run: |
           bundle exec jekyll build -b docs -s docs
           tree _site > $BASEDIR/logs/content_docs-${{ env.LIB_VERSION }}.log
 
       - name: Publish documentation (/docs)
         working-directory: arrow-site
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, "alpha") && !contains(env.LIB_VERSION, "beta") && !contains(env.LIB_VERSION, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, 'alpha') && !contains(env.LIB_VERSION, 'beta') && !contains(env.LIB_VERSION, 'rc') }}
         run: |
           echo ">>> Latest release" >> $BASEDIR/logs/aws_sync.log
           ${GITHUB_WORKSPACE}/.github/scripts/sync-docs-with-aws.sh
 
       - name: Build release directory (/docs/<major.minor>)
         working-directory: arrow-site
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, "alpha") && !contains(env.LIB_VERSION, "beta") && !contains(env.LIB_VERSION, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, 'alpha') && !contains(env.LIB_VERSION, 'beta') && !contains(env.LIB_VERSION, 'rc') }}
         run: |
           bundle exec jekyll build -b docs/${{ env.LIB_VERSION }} -s docs
           tree _site > $BASEDIR/logs/content_docs-${{ env.LIB_VERSION }}.log
 
       - name: Publish release directory (/docs/<major.minor>)
         working-directory: arrow-site
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, "alpha") && !contains(env.LIB_VERSION, "beta") && !contains(env.LIB_VERSION, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, 'alpha') && !contains(env.LIB_VERSION, 'beta') && !contains(env.LIB_VERSION, 'rc') }}
         run: |
           aws s3 sync _site s3://$S3_BUCKET/docs/${{ env.LIB_VERSION }} --delete --exclude "/CNAME" --exclude "/code/*" --exclude "/index.html" --exclude "/redirects.json" >> $BASEDIR/logs/aws_sync.log
 
@@ -201,7 +201,7 @@ jobs:
           aws s3 sync _site s3://$S3_BUCKET/docs/next --delete --exclude "/CNAME" --exclude "/code/*" --exclude "/index.html" --exclude "/redirects.json" >> $BASEDIR/logs/aws_sync.log
 
       - name: Publish sitemap.xml
-        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, "alpha") && !contains(env.LIB_VERSION, "beta") && !contains(env.LIB_VERSION, "rc") }}
+        if: ${{ github.ref == 'refs/heads/main' && !contains(env.LIB_VERSION, 'alpha') && !contains(env.LIB_VERSION, 'beta') && !contains(env.LIB_VERSION, 'rc') }}
         run: |
           ${GITHUB_WORKSPACE}/.github/scripts/create-sitemap.sh > sitemap.xml
           aws s3 cp sitemap.xml s3://$S3_BUCKET/sitemap.xml >> $BASEDIR/logs/aws_sync.log
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 6efdf2e1d2c..6c6b4fa2f1c 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -64,10 +64,11 @@ jobs:
           restore-keys: |
             misc-step-gradle-
 
-      - name: "Set env"
-        run: |
-          echo "$JAVA_HOME_8_X64/bin" >> $GITHUB_PATH
-          echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
+      - name: Set up Java
+        uses: actions/setup-java@v2.4.0
+        with:
+          distribution: 'zulu'
+          java-version: 11
 
       - name: "Dump new API files"
         run: ./gradlew apiDump