diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 42469f23..382e7a81 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -32,6 +32,10 @@ on:
         required: false
         default: 11, 17
         type: string
+      connector_branch:
+        description: "Branch that need to be checked out."
+        required: false
+        type: string
       cache_flink_binary:
         description: "Whether to cache the Flink binary. Should be false for SNAPSHOT URLs, true otherwise."
         required: true
@@ -67,10 +71,12 @@ jobs:
       - run: echo "Running CI pipeline for JDK version ${{ matrix.jdk }}"
 
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          ref: "${{ inputs.connector_branch }}"
 
       - name: Set JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ea49368c..33f476d7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -25,12 +25,24 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
-        flink: [2.0-SNAPSHOT]
-        java: ['11, 17, 21']
+        flink_branches: &flink_branches_matrix [ {
+          flink: 2.0-SNAPSHOT,
+          branch: main
+        }, {
+          flink: 2.0.1,
+          branch: main
+        }, {
+          flink: 2.0.1,
+          branch: v6.0
+        }, {
+          flink: 1.20.3,
+          branch: v5.1
+        } ]
     uses: ./.github/workflows/common.yml
     with:
-      flink_version: ${{ matrix.flink }}
-      jdk_version: ${{ matrix.java }}
+      flink_version: ${{ matrix.flink_branches.flink }}
+      jdk_version: ${{ matrix.flink_branches.jdk || '11, 17, 21' }}
+      connector_branch: ${{ matrix.flink_branches.branch }}
       flink_url: https://s3.amazonaws.com/flink-nightly/flink-${{ matrix.flink }}-bin-scala_2.12.tgz
       cache_flink_binary: false
     secrets: inherit
@@ -38,7 +50,8 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [2.0-SNAPSHOT]
+        flink_branches: *flink_branches_matrix
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
-      flink_version: ${{ matrix.flink }}
+      flink_version: ${{ matrix.flink_branches.flink }}
+      connector_branch: ${{ matrix.flink_branches.branch }}
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 8e20e864..488d8662 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,12 +25,12 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [2.0.0]
-        java: ['11, 17, 21']
+        flink: &flink_versions [ 2.0.1 ]
+        jdk: [ '11, 17, 21' ]
     uses: ./.github/workflows/common.yml
     with:
       flink_version: ${{ matrix.flink }}
-      jdk_version: ${{ matrix.java }}
+      jdk_version: ${{ matrix.jdk }}
       flink_url: https://archive.apache.org/dist/flink/flink-${{ matrix.flink }}/flink-${{ matrix.flink }}-bin-scala_2.12.tgz
       cache_flink_binary: true
     secrets: inherit
@@ -38,7 +38,7 @@ jobs:
   python_test:
     strategy:
       matrix:
-        flink: [2.0.0]
+        flink: *flink_versions
     uses: apache/flink-connector-shared-utils/.github/workflows/python_ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}
diff --git a/pom.xml b/pom.xml
index fe59a298..51b34ee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
         <junit5.version>5.8.1</junit5.version>
         <assertj.version>3.21.0</assertj.version>
         <archunit.version>0.22.0</archunit.version>
-        <testcontainers.version>1.17.2</testcontainers.version>
+        <testcontainers.version>1.21.4</testcontainers.version>
         <mockito.version>3.12.4</mockito.version>
         <powermock.version>2.0.9</powermock.version>
         <kotlin.version>1.7.10</kotlin.version>