diff --git a/gbl.spec b/gbl.spec
index 44b90318bb7..70784f3367a 100644
--- a/gbl.spec
+++ b/gbl.spec
@@ -1,17 +1,18 @@
-### RPM external gbl V03-01-01
+### RPM external gbl V04-00-00
 ## INCLUDE cpp-standard
 ## INCLUDE microarch_flags
-%define tag 59c2d99ea96bc739321fd251096504c91467be24
-Source: git+https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git?obj=main/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+%define tag 6e60cdf1f1a296ce0a4e08833ebbfa58e9ad2787
+Source: git+https://gitlab.desy.de/millepede/general-broken-lines.git?obj=main/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 Source99: scram-tools.file/tools/eigen/env
 
 BuildRequires: cmake
 Requires: eigen
+Requires: mille
 
 %prep
 %setup -q -n %{n}-%{realversion}
-grep -q 'CMAKE_CXX_STANDARD  *11' cpp/CMakeLists.txt
-sed -i -e 's|CMAKE_CXX_STANDARD  *11|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' cpp/CMakeLists.txt
+grep -q 'CMAKE_CXX_STANDARD  *17' cpp/CMakeLists.txt
+sed -i -e 's|CMAKE_CXX_STANDARD  *17|CMAKE_CXX_STANDARD %{cms_cxx_standard}|' cpp/CMakeLists.txt
 
 %build
 rm -rf build
@@ -25,6 +26,7 @@ cmake ../cpp \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DEIGEN3_INCLUDE_DIR=${EIGEN_ROOT}/include/eigen3 \
   -DSUPPORT_ROOT=False \
+  -DCMAKE_PREFIX_PATH="%{cmake_prefix_path}" \
   -DCMAKE_CXX_FLAGS="$CMS_EIGEN_CXX_FLAGS %{selected_microarch}"
 
 make %{makeprocesses}
diff --git a/mille.spec b/mille.spec
new file mode 100644
index 00000000000..1b72c7d2f53
--- /dev/null
+++ b/mille.spec
@@ -0,0 +1,30 @@
+### RPM external mille V01-00-00
+## INCLUDE cpp-standard
+## INITENV +PATH PYTHON3PATH %{i}/python
+
+Source: https://gitlab.desy.de/millepede/Mille/-/archive/%{realversion}/%{n}-%{realversion}.tar.gz
+BuildRequires: cmake
+Requires: zlib
+Requires: root
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+rm -rf ../build
+mkdir ../build
+cd ../build
+cmake \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=%{i} \
+  -DCMAKE_PREFIX_PATH="%{cmake_prefix_path}" \
+  -DCMAKE_CXX_STANDARD=%{cms_cxx_standard} \
+  ../%{n}-%{realversion}
+make  %{makeprocesses} VERBOSE=1
+%install
+cd ../build
+make install PREFIX=%{i}
+
+%post
+%{relocateConfig}milleStandaloneSetup.sh
+%{relocateConfig}cmake/MilleConfig.cmake
diff --git a/millepede.spec b/millepede.spec
index 5d12e7d4c25..14cefc04784 100644
--- a/millepede.spec
+++ b/millepede.spec
@@ -1,14 +1,29 @@
-### RPM external millepede V04-16-00
+### RPM external millepede V05-00-00 
+## INCLUDE cpp-standard
 Source: https://gitlab.desy.de/millepede/millepede-ii/-/archive/%{realversion}/%{n}-ii-%{realversion}.tar.gz
-Requires: zlib
+BuildRequires: cmake
+Requires: root
+Requires: mille
 
 %prep
 %setup -n %{n}-ii-%{realversion}
 
 %build
-make \
-  ZLIB_INCLUDES_DIR="${ZLIB_ROOT}/include" \
-  ZLIB_LIBS_DIR="${ZLIB_ROOT}/lib"
+rm -rf ../build
+mkdir ../build
+cd ../build
+cmake \
+  -DCMAKE_INSTALL_PREFIX=%{i} \
+  -DCMAKE_PREFIX_PATH="%{cmake_prefix_path}" \
+  -DCMAKE_CXX_STANDARD=%{cms_cxx_standard} \
+  -DLAPACK_OPENBLAS=off \
+  ../%{n}-ii-%{realversion}
+make %{makeprocesses} VERBOSE=1
 
 %install
+cd ../build
 make install PREFIX=%{i}
+
+%post
+%{relocateConfig}mp2setup.sh
+%{relocateConfig}millepedeIIConfig.cmake
diff --git a/python_tools.spec b/python_tools.spec
index 933a2b27af2..2241ea28286 100644
--- a/python_tools.spec
+++ b/python_tools.spec
@@ -4,7 +4,7 @@ Source: none
 
 Requires: root curl python3 xrootd llvm hdf5 yoda opencv triton-inference-client
 Requires: professor2 rivet frontier_client onnxruntime openldap pacparser
-
+Requires: mille 
 Requires: py3-multidict
 Requires: py3-anyio
 Requires: py3-sniffio
diff --git a/scram-tools.file/tools/gbl/gbl.xml b/scram-tools.file/tools/gbl/gbl.xml
index 7208a105df1..c17a37cf257 100644
--- a/scram-tools.file/tools/gbl/gbl.xml
+++ b/scram-tools.file/tools/gbl/gbl.xml
@@ -7,4 +7,5 @@
     <environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
   </client>
   <use name="eigen"/>
+  <use name="mille"/>
 </tool>
diff --git a/scram-tools.file/tools/mille/mille.xml b/scram-tools.file/tools/mille/mille.xml
new file mode 100644
index 00000000000..88badd77fc2
--- /dev/null
+++ b/scram-tools.file/tools/mille/mille.xml
@@ -0,0 +1,15 @@
+<tool name="@TOOL@" version="@TOOL_VERSION@" revision="1">
+  <info url="https://millepede.pages.desy.de/Mille/"/>
+  <client>
+    <environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$@TOOL_BASE@/lib"/>
+    <environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
+  </client>
+  <runtime name="PATH" value="$@TOOL_BASE@/bin" type="path"/>
+  <lib name="Mille2"/>
+  <lib name="MilleC"/>
+  <use name="sockets"/>
+  <use name="pcre"/>
+  <use name="root"/>
+  <use name="zlib"/>
+</tool>
diff --git a/scram-tools.file/tools/millepede/millepede.xml b/scram-tools.file/tools/millepede/millepede.xml
index 5f866aef8ac..716f343ddb3 100644
--- a/scram-tools.file/tools/millepede/millepede.xml
+++ b/scram-tools.file/tools/millepede/millepede.xml
@@ -1,10 +1,11 @@
 <tool name="@TOOL@" version="@TOOL_VERSION@" revision="2">
-  <info url="http://www.wiki.terascale.de/index.php/Millepede_II"/>
+  <info url="https://millepede.pages.desy.de/millepede-ii/"/>
   <client>
     <environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
   </client>
   <runtime name="PATH" value="$@TOOL_BASE@/bin" type="path"/>
   <use name="sockets"/>
   <use name="pcre"/>
-  <use name="zlib"/>
+  <use name="root"/>
+  <use name="mille"/>
 </tool>