diff --git a/.github/workflows/build-grpc-smoke-dist.yaml b/.github/workflows/build-grpc-smoke-dist.yaml
index e5f792c532..6105bf76ba 100644
--- a/.github/workflows/build-grpc-smoke-dist.yaml
+++ b/.github/workflows/build-grpc-smoke-dist.yaml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
diff --git a/.github/workflows/build-play-smoke-dist.yaml b/.github/workflows/build-play-smoke-dist.yaml
index 62a98075ea..1262e66b85 100644
--- a/.github/workflows/build-play-smoke-dist.yaml
+++ b/.github/workflows/build-play-smoke-dist.yaml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
diff --git a/.github/workflows/build-smoke-dist-fakebackend.yaml b/.github/workflows/build-smoke-dist-fakebackend.yaml
index e9b6826f95..5e8b1f07e5 100644
--- a/.github/workflows/build-smoke-dist-fakebackend.yaml
+++ b/.github/workflows/build-smoke-dist-fakebackend.yaml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
@@ -49,8 +50,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
diff --git a/.github/workflows/build-springboot-smoke-dist.yaml b/.github/workflows/build-springboot-smoke-dist.yaml
index 88ec79f138..4b179567e0 100644
--- a/.github/workflows/build-springboot-smoke-dist.yaml
+++ b/.github/workflows/build-springboot-smoke-dist.yaml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
diff --git a/.github/workflows/build-test-matrix.yaml b/.github/workflows/build-test-matrix.yaml
index 4009df66e6..2ac566b574 100644
--- a/.github/workflows/build-test-matrix.yaml
+++ b/.github/workflows/build-test-matrix.yaml
@@ -14,8 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
@@ -49,8 +50,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Cache gradle dependencies
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6ecfb044e4..53fc42ae47 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,8 +15,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -38,8 +39,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -68,8 +70,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -95,13 +98,15 @@ jobs:
           fetch-depth: 0
       - id: setup-test-java
         name: Set up JDK ${{ matrix.java }} for running tests
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: ${{ matrix.java }}
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 288100e3c2..346fc7a549 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -19,8 +19,9 @@ jobs:
           languages: java
 
       - name: Setup Java 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Autobuild
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 13b297900c..66121b999b 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -15,8 +15,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -38,8 +39,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -68,8 +70,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -95,13 +98,15 @@ jobs:
           fetch-depth: 0
       - id: setup-test-java
         name: Set up JDK ${{ matrix.java }} for running tests
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: ${{ matrix.java }}
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -122,8 +127,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -146,8 +152,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml
index 890c834ee3..0e85710c5d 100644
--- a/.github/workflows/patch-release-build.yml
+++ b/.github/workflows/patch-release-build.yml
@@ -48,8 +48,9 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ needs.prepare-release-branch.outputs.release-branch-name }}
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
       - name: Setup git name
         run: |
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c9966ef4d8..480b9913ce 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -11,8 +11,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -42,8 +43,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running checks
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -67,13 +69,15 @@ jobs:
           fetch-depth: 0
       - id: setup-test-java
         name: Set up JDK ${{ matrix.java }} for running tests
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: ${{ matrix.java }}
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -112,8 +116,9 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
 
       - name: Restore cache
@@ -134,8 +139,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
       - id: set-matrix
         run: echo "::set-output name=matrix::{\"module\":[\"$(./gradlew -q instrumentation:listInstrumentations | xargs echo | sed 's/ /","/g')\"]}"
@@ -150,8 +156,9 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
       - name: Set up JDK 11 for running Gradle
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
       - name: Run muzzle
         run: ./gradlew ${{ matrix.module }}:muzzle
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index d2762f43e5..572cbecd0e 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -13,8 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: adopt
           java-version: 11
       - name: Build and publish artifacts
         uses: burrunan/gradle-cache-action@v1.10