diff --git a/.gitmodules b/.gitmodules
index 2f6cb0566..836c53349 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,5 @@
 [submodule "repos/builtin"]
   path = repos/builtin
   url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-dev
+  #branch = spack-stack-dev
+  branch = feature/cherrypick_ecmwflibs
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index bf329f21d..c8388a4d1 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -109,19 +109,19 @@ packages:
       - +ui
     eckit:
       require:
-      - '@1.32.3'
+      - '@2.0.7'
       - linalg=eigen,lapack
       - compression=lz4,bzip2
     ecmwf-atlas:
       require:
-      - '@0.44.1'
+      - '@0.46.0'
       - +fckit
       - +trans
       - +tesselation
       - +fftw
     ectrans:
       require:
-      - '@1.7.0'
+      - '@1.8.0'
     eigen:
       require:
       - '@3.4.0'
@@ -148,14 +148,14 @@ packages:
       - ~libbsd
     fckit:
       require:
-      - '@0.14.1'
+      - '@0.14.3'
       - +eckit
     fftw:
       require:
       - '@3.3.10'
     fiat:
       require:
-      - '@1.6.1'
+      - '@2.0.0'
     flex:
       require:
       - '@2.6.4'
diff --git a/repos/builtin b/repos/builtin
index bbbf37da7..2244e6b55 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit bbbf37da72cc057a4b7077d87de89415a7656851
+Subproject commit 2244e6b55ec419dde056737edd39c91001d669c4