diff --git a/.gitlab/ci/configure_fedora39_java.cmake b/.gitlab/ci/configure_fedora39_java.cmake
index b0c65056f4d7e8edf05f551df8f19c8566a6ad55..396e019ee4417ac1808743db56b9dd4f61f8e030 100644
--- a/.gitlab/ci/configure_fedora39_java.cmake
+++ b/.gitlab/ci/configure_fedora39_java.cmake
@@ -3,7 +3,8 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39.cmake")
 
-set(MAVEN_LOCAL_NATIVE_NAME "linux-amd" CACHE STRING "" FORCE)
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
+set(MAVEN_LOCAL_NATIVE_NAME "linux-amd-${cmake_build_type}" CACHE STRING "" FORCE)
 set(VTK_GENERATE_SPDX OFF CACHE BOOL "" FORCE)
 
 set(VTK_MODULE_ENABLE_VTK_fides NO CACHE STRING "")
diff --git a/.gitlab/ci/configure_macos_arm64_java.cmake b/.gitlab/ci/configure_macos_arm64_java.cmake
index f590c264b30a25a876ed7e8bde1e4eb2232cb846..191edd75419b5c71594dbaeec7308190361b28bb 100644
--- a/.gitlab/ci/configure_macos_arm64_java.cmake
+++ b/.gitlab/ci/configure_macos_arm64_java.cmake
@@ -3,7 +3,9 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake")
 
-set(MAVEN_LOCAL_NATIVE_NAME "darwin-arm" CACHE STRING "" FORCE)
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
+set(MAVEN_LOCAL_NATIVE_NAME "darwin-arm-${cmake_build_type}" CACHE STRING "" FORCE)
+unset(cmake_build_type)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
 
diff --git a/.gitlab/ci/configure_macos_x86_64_java.cmake b/.gitlab/ci/configure_macos_x86_64_java.cmake
index ff5e7ca4f30112a137c95ce316a0d8ffa5e6e444..14e72b10d63d3a97205cef28bbabd0340eb1aa9c 100644
--- a/.gitlab/ci/configure_macos_x86_64_java.cmake
+++ b/.gitlab/ci/configure_macos_x86_64_java.cmake
@@ -3,7 +3,9 @@ set(VTK_JAVA_TARGET_VERSION $ENV{VTK_JAVA_VERSION} CACHE STRING "" FORCE)
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_macos.cmake")
 
-set(MAVEN_LOCAL_NATIVE_NAME "darwin-amd" CACHE STRING "" FORCE)
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
+set(MAVEN_LOCAL_NATIVE_NAME "darwin-amd-${cmake_build_type}" CACHE STRING "" FORCE)
+unset(cmake_build_type)
 
 # Ensure that we're targeting 11.0.
 set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
diff --git a/.gitlab/ci/configure_windows_vs2022_java.cmake b/.gitlab/ci/configure_windows_vs2022_java.cmake
index f68bfb2126d6ffaf998936c6cd20e1edfeb86e11..d6c6d9d41a0bc7e2d23ee4430e297361ff54e9bd 100644
--- a/.gitlab/ci/configure_windows_vs2022_java.cmake
+++ b/.gitlab/ci/configure_windows_vs2022_java.cmake
@@ -5,6 +5,8 @@ set(VTK_MODULE_ENABLE_VTK_vtkvtkm NO CACHE STRING "") # Java Wrap errors in wind
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_windows.cmake")
 
-set(MAVEN_LOCAL_NATIVE_NAME "windows-amd" CACHE STRING "" FORCE)
+string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type)
+set(MAVEN_LOCAL_NATIVE_NAME "windows-amd-${cmake_build_type}" CACHE STRING "" FORCE)
+unset(cmake_build_type)
 set(JOGL_GLUE "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/gluegen/gluegen-rt/2.3.2/gluegen-rt-2.3.2.jar" CACHE FILEPATH "")
 set(JOGL_LIB  "$ENV{GIT_CLONE_PATH}/.gitlab/m2/org/jogamp/jogl/jogl-all/2.3.2/jogl-all-2.3.2.jar" CACHE FILEPATH "")
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index ac4e83dd5b051bc730962668c2baedc77674c12d..4e95d27f6890371204a6f4e99f024913cd9a6170 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -312,7 +312,6 @@
         - .fedora_mpich_addon
 
     variables:
-        CMAKE_BUILD_TYPE: Release
         CMAKE_CONFIGURATION: fedora39_java
         VTK_INSTALL: 1
 
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 3520c47d356a50499c39e4559186abd4fd8913b3..0a00605386a92026ce75fb70979bb39a9b378209 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -148,14 +148,12 @@
 .macos_x86_64_java:
     extends: .macos_build
     variables:
-        CMAKE_BUILD_TYPE: Release
         CMAKE_CONFIGURATION: macos_x86_64_java
         VTK_INSTALL: 1
 
 .macos_arm64_java:
     extends: .macos_build
     variables:
-        CMAKE_BUILD_TYPE: Release
         CMAKE_CONFIGURATION: macos_arm64_java
         VTK_INSTALL: 1
 
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index af54785d394d1eeca880d51df34f8aa20b935a13..47ead1ab738874bd1300b6e480eb7acc3fdfae89 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -192,7 +192,6 @@
 .windows_vs2022_java:
     extends: .windows_vs2022
     variables:
-        CMAKE_BUILD_TYPE: Release
         CMAKE_CONFIGURATION: windows_vs2022_java
         VTK_INSTALL: 1