diff --git a/recipes/fdb/5.21/environments.yaml b/recipes/fdb/5.21/environments.yaml
index e715db34..3bb82e3b 100644
--- a/recipes/fdb/5.21/environments.yaml
+++ b/recipes/fdb/5.21/environments.yaml
@@ -3,9 +3,9 @@ fdb:
   unify: when_possible
   packages: []
   specs:
-  - fdb@=5.21.4 backends=lustre
+  - fdb@=5.22.2-meteoswiss backends=lustre
   - gribjump@=0.12.0
-  - eckit@=2.1.0 linalg=none compression=lz4 +curl +ssl
+  - eckit@=2.2.0 linalg=none compression=lz4 +curl +ssl
   - metkit@=1.18.3-levelist
   - eccodes@=2.47.3 jp2k=none ~fortran +pthreads +aec +geo
   - ecbuild@=3.13.1
diff --git a/recipes/fdb/5.21/repo/packages/eckit/package.py b/recipes/fdb/5.21/repo/packages/eckit/package.py
index 05e3248f..12662c36 100644
--- a/recipes/fdb/5.21/repo/packages/eckit/package.py
+++ b/recipes/fdb/5.21/repo/packages/eckit/package.py
@@ -22,6 +22,7 @@ class Eckit(CMakePackage):
 
     license("Apache-2.0")
 
+    version("2.2.0", sha256="8973a330b907f3328039c495e7874a6760e354361f07f287f1d14513b22023a2")
     version("2.1.0", sha256="bb7e888498b39925d724019f02c14b981761e7c94de899b5322cffe025d1e3d6")
     version("2.0.8", sha256="b85120d4d9f8440d763f5ed34ccb92b24663a5c72988f7ef9a107ba7a5439cc5")
     version("2.0.2", sha256="46b9c1f90e0b565698c5c79c54676401d33738ec82995c025d5d5aabeb13ad2b")
@@ -185,6 +186,10 @@ def cmake_args(self):
             self.define("ENABLE_RSYNC", False),
             # Disable "prototyping code that may never see the light of day":
             self.define("ENABLE_SANDBOX", False),
+            # OpenFAM defaults to ON when libuuid is available, andf alls back to a mock implementation.
+            # The mock also forces eckit_HAVE_OPENFAM on, so disable too:
+            self.define("ENABLE_OPENFAM_MOCK", False),
+            self.define("ENABLE_OPENFAM", False),
         ]
 
         # Static build of eckit not working, many places in eckit's build
diff --git a/recipes/fdb/5.21/repo/packages/fdb/package.py b/recipes/fdb/5.21/repo/packages/fdb/package.py
index 875e78cb..d5d46572 100644
--- a/recipes/fdb/5.21/repo/packages/fdb/package.py
+++ b/recipes/fdb/5.21/repo/packages/fdb/package.py
@@ -22,6 +22,7 @@ class Fdb(CMakePackage):
 
     version("master", branch="master")
 
+    version("5.22.2-meteoswiss", branch="meteoswiss")
     version("5.21.4", sha256="9751a5a9a3e1b29a8237fc1ae716b11e7e12f70fe73a8e343587e54247caf251")
     version("5.19.2", sha256="7dfffd7279a53431fe11a82b5c6dcc94f42bc5100a0ff925fe0b54de94d1cfe2")
     version("5.19.1", sha256="de5edddd4c17cb4ddfe61bfed60a6b37408d5ed92a2d19a493592e1abfe65a8d")
@@ -61,6 +62,8 @@ class Fdb(CMakePackage):
 
     depends_on("eckit@1.16:")
     depends_on("eckit@1.24.4:", when="@5.11.22:")
+    depends_on("eckit@1.32.5:", when="@5.20.1:")
+    depends_on("eckit@2.2.0:", when="@5.22.2:") # FamFieldLocation.cc always needs eckit/io/fam/FamTypes.h
     depends_on("eckit+admin", when="+tools")
 
     depends_on("eccodes@2.10:")