diff --git a/flink/v1.12/build.gradle b/flink/v1.12/build.gradle
index d6ce6e1c31ef..810f85d0f381 100644
--- a/flink/v1.12/build.gradle
+++ b/flink/v1.12/build.gradle
@@ -17,18 +17,11 @@
  * under the License.
  */
 
-def flinkProjects = [
-    project(':iceberg-flink:iceberg-flink-1.12'),
-    project(':iceberg-flink:iceberg-flink-runtime-1.12')
-]
-
-configure(flinkProjects) {
-  project.ext {
-    flinkVersion = '1.12.5'
-  }
-}
+String flinkVersion = '1.12.5'
+String flinkMajorVersion = '1.12'
+String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")
 
-project(':iceberg-flink:iceberg-flink-1.12') {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -40,11 +33,11 @@ project(':iceberg-flink:iceberg-flink-1.12') {
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-hive-metastore')
 
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}:tests"
-    compileOnly "org.apache.flink:flink-table-api-java-bridge_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-table-planner-blink_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-table-planner_2.12:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}:tests"
+    compileOnly "org.apache.flink:flink-table-api-java-bridge_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-table-planner-blink_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-table-planner_${scalaVersion}:${flinkVersion}"
     compileOnly "org.apache.hadoop:hadoop-hdfs"
     compileOnly "org.apache.hadoop:hadoop-common"
     compileOnly("org.apache.hadoop:hadoop-minicluster") {
@@ -69,12 +62,12 @@ project(':iceberg-flink:iceberg-flink-1.12') {
     }
 
     testImplementation "org.apache.flink:flink-core:${flinkVersion}"
-    testImplementation "org.apache.flink:flink-runtime_2.12:${flinkVersion}"
-    testImplementation "org.apache.flink:flink-table-planner-blink_2.12:${flinkVersion}"
+    testImplementation "org.apache.flink:flink-runtime_${scalaVersion}:${flinkVersion}"
+    testImplementation "org.apache.flink:flink-table-planner-blink_${scalaVersion}:${flinkVersion}"
     testImplementation("org.apache.flink:flink-test-utils-junit:${flinkVersion}") {
       exclude group: 'junit'
     }
-    testImplementation("org.apache.flink:flink-test-utils_2.12:${flinkVersion}") {
+    testImplementation("org.apache.flink:flink-test-utils_${scalaVersion}:${flinkVersion}") {
       exclude group: "org.apache.curator", module: 'curator-test'
       exclude group: 'junit'
     }
@@ -118,7 +111,7 @@ project(':iceberg-flink:iceberg-flink-1.12') {
   }
 }
 
-project(':iceberg-flink:iceberg-flink-runtime-1.12') {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -138,7 +131,7 @@ project(':iceberg-flink:iceberg-flink-runtime-1.12') {
   }
 
   dependencies {
-    implementation project(':iceberg-flink:iceberg-flink-1.12')
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
     implementation project(':iceberg-aws')
     implementation(project(':iceberg-aliyun')) {
       exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
diff --git a/flink/v1.13/build.gradle b/flink/v1.13/build.gradle
index afad453d7740..d8dda782ffa8 100644
--- a/flink/v1.13/build.gradle
+++ b/flink/v1.13/build.gradle
@@ -17,18 +17,11 @@
  * under the License.
  */
 
-def flinkProjects = [
-  project(':iceberg-flink:iceberg-flink-1.13'),
-  project(':iceberg-flink:iceberg-flink-runtime-1.13')
-]
-
-configure(flinkProjects) {
-  project.ext {
-    flinkVersion = '1.13.2'
-  }
-}
+String flinkVersion = '1.13.2'
+String flinkMajorVersion = '1.13'
+String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")
 
-project(':iceberg-flink:iceberg-flink-1.13') {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -40,11 +33,11 @@ project(':iceberg-flink:iceberg-flink-1.13') {
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-hive-metastore')
 
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}:tests"
-    compileOnly "org.apache.flink:flink-table-api-java-bridge_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-table-planner-blink_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-table-planner_2.12:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}:tests"
+    compileOnly "org.apache.flink:flink-table-api-java-bridge_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-table-planner-blink_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-table-planner_${scalaVersion}:${flinkVersion}"
     compileOnly "org.apache.hadoop:hadoop-hdfs"
     compileOnly "org.apache.hadoop:hadoop-common"
     compileOnly("org.apache.hadoop:hadoop-minicluster") {
@@ -69,12 +62,12 @@ project(':iceberg-flink:iceberg-flink-1.13') {
     }
 
     testImplementation "org.apache.flink:flink-core:${flinkVersion}"
-    testImplementation "org.apache.flink:flink-runtime_2.12:${flinkVersion}"
-    testImplementation "org.apache.flink:flink-table-planner-blink_2.12:${flinkVersion}"
+    testImplementation "org.apache.flink:flink-runtime_${scalaVersion}:${flinkVersion}"
+    testImplementation "org.apache.flink:flink-table-planner-blink_${scalaVersion}:${flinkVersion}"
     testImplementation ("org.apache.flink:flink-test-utils-junit:${flinkVersion}") {
       exclude group: 'junit'
     }
-    testImplementation("org.apache.flink:flink-test-utils_2.12:${flinkVersion}") {
+    testImplementation("org.apache.flink:flink-test-utils_${scalaVersion}:${flinkVersion}") {
       exclude group: "org.apache.curator", module: 'curator-test'
       exclude group: 'junit'
     }
@@ -118,7 +111,7 @@ project(':iceberg-flink:iceberg-flink-1.13') {
   }
 }
 
-project(':iceberg-flink:iceberg-flink-runtime-1.13') {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -138,7 +131,7 @@ project(':iceberg-flink:iceberg-flink-runtime-1.13') {
   }
 
   dependencies {
-    implementation project(':iceberg-flink:iceberg-flink-1.13')
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
     implementation project(':iceberg-aws')
     implementation(project(':iceberg-aliyun')) {
       exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
diff --git a/flink/v1.14/build.gradle b/flink/v1.14/build.gradle
index 64e89cfb629c..04f2a5cd70ce 100644
--- a/flink/v1.14/build.gradle
+++ b/flink/v1.14/build.gradle
@@ -17,18 +17,11 @@
  * under the License.
  */
 
-def flinkProjects = [
-  project(':iceberg-flink:iceberg-flink-1.14'),
-  project(':iceberg-flink:iceberg-flink-runtime-1.14')
-]
-
-configure(flinkProjects) {
-  project.ext {
-    flinkVersion = '1.14.0'
-  }
-}
+String flinkVersion = '1.14.0'
+String flinkMajorVersion = '1.14'
+String scalaVersion = System.getProperty("scalaVersion") != null ? System.getProperty("scalaVersion") : System.getProperty("defaultScalaVersion")
 
-project(':iceberg-flink:iceberg-flink-1.14') {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -40,10 +33,10 @@ project(':iceberg-flink:iceberg-flink-1.14') {
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-hive-metastore')
 
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-streaming-java_2.12:${flinkVersion}:tests"
-    compileOnly "org.apache.flink:flink-table-api-java-bridge_2.12:${flinkVersion}"
-    compileOnly "org.apache.flink:flink-table-planner_2.12:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-streaming-java_${scalaVersion}:${flinkVersion}:tests"
+    compileOnly "org.apache.flink:flink-table-api-java-bridge_${scalaVersion}:${flinkVersion}"
+    compileOnly "org.apache.flink:flink-table-planner_${scalaVersion}:${flinkVersion}"
     compileOnly "org.apache.hadoop:hadoop-hdfs"
     compileOnly "org.apache.hadoop:hadoop-common"
     compileOnly("org.apache.hadoop:hadoop-minicluster") {
@@ -72,7 +65,7 @@ project(':iceberg-flink:iceberg-flink-1.14') {
     testImplementation ("org.apache.flink:flink-test-utils-junit:${flinkVersion}") {
       exclude group: 'junit'
     }
-    testImplementation("org.apache.flink:flink-test-utils_2.12:${flinkVersion}") {
+    testImplementation("org.apache.flink:flink-test-utils_${scalaVersion}:${flinkVersion}") {
       exclude group: "org.apache.curator", module: 'curator-test'
       exclude group: 'junit'
     }
@@ -116,7 +109,7 @@ project(':iceberg-flink:iceberg-flink-1.14') {
   }
 }
 
-project(':iceberg-flink:iceberg-flink-runtime-1.14') {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -136,7 +129,7 @@ project(':iceberg-flink:iceberg-flink-runtime-1.14') {
   }
 
   dependencies {
-    implementation project(':iceberg-flink:iceberg-flink-1.14')
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
     implementation project(':iceberg-aws')
     implementation(project(':iceberg-aliyun')) {
       exclude group: 'edu.umd.cs.findbugs', module: 'findbugs'
diff --git a/settings.gradle b/settings.gradle
index 09d38c66892b..21718fdbc4cc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -87,30 +87,30 @@ if (!flinkVersions.isEmpty()) {
 }
 
 if (flinkVersions.contains("1.12")) {
-  include ':iceberg-flink:flink-1.12'
-  include ':iceberg-flink:flink-runtime-1.12'
-  project(':iceberg-flink:flink-1.12').projectDir = file('flink/v1.12/flink')
-  project(':iceberg-flink:flink-1.12').name = 'iceberg-flink-1.12'
-  project(':iceberg-flink:flink-runtime-1.12').projectDir = file('flink/v1.12/flink-runtime')
-  project(':iceberg-flink:flink-runtime-1.12').name = 'iceberg-flink-runtime-1.12'
+  include ":iceberg-flink:flink-1.12_${scalaVersion}"
+  include ":iceberg-flink:flink-runtime-1.12_${scalaVersion}"
+  project(":iceberg-flink:flink-1.12_${scalaVersion}").projectDir = file('flink/v1.12/flink')
+  project(":iceberg-flink:flink-1.12_${scalaVersion}").name = "iceberg-flink-1.12_${scalaVersion}"
+  project(":iceberg-flink:flink-runtime-1.12_${scalaVersion}").projectDir = file('flink/v1.12/flink-runtime')
+  project(":iceberg-flink:flink-runtime-1.12_${scalaVersion}").name = "iceberg-flink-runtime-1.12_${scalaVersion}"
 }
 
 if (flinkVersions.contains("1.13")) {
-  include ':iceberg-flink:flink-1.13'
-  include ':iceberg-flink:flink-runtime-1.13'
-  project(':iceberg-flink:flink-1.13').projectDir = file('flink/v1.13/flink')
-  project(':iceberg-flink:flink-1.13').name = 'iceberg-flink-1.13'
-  project(':iceberg-flink:flink-runtime-1.13').projectDir = file('flink/v1.13/flink-runtime')
-  project(':iceberg-flink:flink-runtime-1.13').name = 'iceberg-flink-runtime-1.13'
+  include ":iceberg-flink:flink-1.13_${scalaVersion}"
+  include ":iceberg-flink:flink-runtime-1.13_${scalaVersion}"
+  project(":iceberg-flink:flink-1.13_${scalaVersion}").projectDir = file('flink/v1.13/flink')
+  project(":iceberg-flink:flink-1.13_${scalaVersion}").name = "iceberg-flink-1.13_${scalaVersion}"
+  project(":iceberg-flink:flink-runtime-1.13_${scalaVersion}").projectDir = file('flink/v1.13/flink-runtime')
+  project(":iceberg-flink:flink-runtime-1.13_${scalaVersion}").name = "iceberg-flink-runtime-1.13_${scalaVersion}"
 }
 
 if (flinkVersions.contains("1.14")) {
-  include ':iceberg-flink:flink-1.14'
-  include ':iceberg-flink:flink-runtime-1.14'
-  project(':iceberg-flink:flink-1.14').projectDir = file('flink/v1.14/flink')
-  project(':iceberg-flink:flink-1.14').name = 'iceberg-flink-1.14'
-  project(':iceberg-flink:flink-runtime-1.14').projectDir = file('flink/v1.14/flink-runtime')
-  project(':iceberg-flink:flink-runtime-1.14').name = 'iceberg-flink-runtime-1.14'
+  include ":iceberg-flink:flink-1.14_${scalaVersion}"
+  include ":iceberg-flink:flink-runtime-1.14_${scalaVersion}"
+  project(":iceberg-flink:flink-1.14_${scalaVersion}").projectDir = file('flink/v1.14/flink')
+  project(":iceberg-flink:flink-1.14_${scalaVersion}").name = "iceberg-flink-1.14_${scalaVersion}"
+  project(":iceberg-flink:flink-runtime-1.14_${scalaVersion}").projectDir = file('flink/v1.14/flink-runtime')
+  project(":iceberg-flink:flink-runtime-1.14_${scalaVersion}").name = "iceberg-flink-runtime-1.14_${scalaVersion}"
 }
 
 if (sparkVersions.contains("3.0")) {