diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1eb0f2e05..b6f5d71fd 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -25,7 +25,7 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
-        flink: [1.19-SNAPSHOT, 1.20-SNAPSHOT]
+        flink: [ 1.20-SNAPSHOT ]
         java: [ '8, 11, 17']
     uses: ./.github/workflows/common.yml
     with:
@@ -38,7 +38,8 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [1.19-SNAPSHOT, 1.20-SNAPSHOT]
+        flink: [ 1.20-SNAPSHOT ]
+        java: [ '11, 17' ]
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index b47e29fd7..d06853ad1 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -26,8 +26,8 @@ jobs:
     uses: ./.github/workflows/common.yml
     strategy:
       matrix:
-        flink: [1.19.1, 1.20.0]
-        java: [ '8, 11, 17']
+        flink: [ 1.20.1, 2.0.0 ]
+        java: [ '11, 17, 21']
     with:
       flink_version: ${{ matrix.flink }}
       jdk_version: ${{ matrix.java }}
@@ -38,7 +38,8 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [1.19.0, 1.20.0]
+        flink: [ 1.20.1, 2.0.0 ]
+        java: [ '11, 17, 21']
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}