diff --git a/flink/v1.12/build.gradle b/flink/v1.12/build.gradle
index 810f85d0f381..eb737d24fbd5 100644
--- a/flink/v1.12/build.gradle
+++ b/flink/v1.12/build.gradle
@@ -21,7 +21,7 @@ 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-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -111,7 +111,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
   }
 }
 
-project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -131,7 +131,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
   }
 
   dependencies {
-    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
     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 d8dda782ffa8..ba62ec58c360 100644
--- a/flink/v1.13/build.gradle
+++ b/flink/v1.13/build.gradle
@@ -21,7 +21,7 @@ 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-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -111,7 +111,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
   }
 }
 
-project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -131,7 +131,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
   }
 
   dependencies {
-    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
     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 04f2a5cd70ce..a0e01c8a4cf4 100644
--- a/flink/v1.14/build.gradle
+++ b/flink/v1.14/build.gradle
@@ -21,7 +21,7 @@ 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-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") {
 
   dependencies {
     implementation project(path: ':iceberg-bundled-guava', configuration: 'shadow')
@@ -109,7 +109,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}") {
   }
 }
 
-project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersion}") {
+project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
   apply plugin: 'com.github.johnrengelman.shadow'
 
   tasks.jar.dependsOn tasks.shadowJar
@@ -129,7 +129,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}_${scalaVersio
   }
 
   dependencies {
-    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}_${scalaVersion}")
+    implementation project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}")
     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 82e126f46ea9..582edf357859 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -89,30 +89,30 @@ if (!flinkVersions.isEmpty()) {
 }
 
 if (flinkVersions.contains("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}"
+  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"
 }
 
 if (flinkVersions.contains("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}"
+  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"
 }
 
 if (flinkVersions.contains("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}"
+  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"
 }
 
 if (sparkVersions.contains("3.0")) {