diff --git a/.latest-commit b/.latest-commit
index b708217f..9924e8d0 100644
--- a/.latest-commit
+++ b/.latest-commit
@@ -1 +1 @@
-18051dbb6278a18705d6f1a48d97650f701967fe
\ No newline at end of file
+12963c894f59bf03f2f8ab94536019d9f82d3527
\ No newline at end of file
diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml
index 49c2b7b4..052bf358 100644
--- a/environments/key4hep-common/packages.yaml
+++ b/environments/key4hep-common/packages.yaml
@@ -4,11 +4,13 @@ packages:
   boost:
     require: +python
     buildable: true
+  curl:
+    require: +gssapi
   dd4hep:
     require: +edm4hep+lcio+xercesc+hepmc3
   gaudi:
     # +examples seems not be compatible with newer versions of python
-    require: +aida+cppunit+examples+gperftools+heppdt+jemalloc+unwind+xercesc
+    require: +aida+cppunit+examples+gaudialg+gperftools+heppdt+jemalloc+unwind+xercesc
   gdb:
     require: +python+tui+source-highlight~debuginfod
   # https://github.com/key4hep/key4hep-spack/pull/501
@@ -33,6 +35,8 @@ packages:
   # Requested by Thomas Madlener for DESY, without CUDA and before v2
   py-torch:
     require: ~cuda
+  texlive:
+    require: scheme=basic
   xrootd:
     require: +krb5
 
@@ -64,10 +68,18 @@ packages:
     externals:
     - spec: krb5@99
       prefix: /usr
+  # Use the system ssh, otherwise the configuration for the provided ssh will likely be
+  # different and things like ssh using kerberos won't work (by extension authentication
+  # for git with ssh with kerberos)
+  openssh:
+    buildable: False
+    externals:
+    - spec: openssh@99
+      prefix: /usr
 
 
   root:
-    require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20 build_type=RelWithDebInfo
+    require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20
   py-tensorflow:
     require: ~cuda~nccl
   whizard:
diff --git a/environments/key4hep-nightly/packages.yaml b/environments/key4hep-nightly/packages.yaml
index fcc22fa5..fc854497 100644
--- a/environments/key4hep-nightly/packages.yaml
+++ b/environments/key4hep-nightly/packages.yaml
@@ -114,7 +114,7 @@ packages:
   raida:
     variants: build_type=RelWithDebInfo cxxstd=20
   root:
-    variants: build_type=RelWithDebInfo cxxstd=20
+    variants: build_type=Release cxxstd=20
     require: cxxstd=20
   sio:
     variants: build_type=RelWithDebInfo cxxstd=20
diff --git a/environments/key4hep-nightly/spack.yaml b/environments/key4hep-nightly/spack.yaml
index 7d43d35c..20452762 100644
--- a/environments/key4hep-nightly/spack.yaml
+++ b/environments/key4hep-nightly/spack.yaml
@@ -9,5 +9,4 @@ spack:
   repos:
   - ../..
   specs:
-  - lhapdf~python
   - key4hep-stack+devtools
diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py
index d841b906..c2c5cc73 100644
--- a/packages/key4hep-stack/package.py
+++ b/packages/key4hep-stack/package.py
@@ -102,6 +102,8 @@ class Key4hepStack(BundlePackage, Key4hepPackage):
     # depends_on('prmon', when='+devtools')
     depends_on("py-awkward", when="+devtools")
     depends_on("py-black", when="+devtools")
+    depends_on("py-flake8", when="+devtools")
+    depends_on("py-pylint", when="+devtools")
     depends_on("py-boto3", when="+devtools")
     depends_on("py-gcovr", when="+devtools")
     depends_on("py-h5py", when="+devtools")