diff --git a/lmp-base.xml b/lmp-base.xml
index c9d16c9a..fde70ff3 100644
--- a/lmp-base.xml
+++ b/lmp-base.xml
@@ -9,7 +9,7 @@
   <project name="lmp-tools" path="tools/lmp-tools" remote="fio">
     <linkfile dest="setup-environment" src="setup-environment"/>
   </project>
-  <project name="meta-lmp" path="layers/meta-lmp" remote="fio" revision="49c2b20a0e8d37239ee0410d5cbcc39e041e4c77"/>
+  <project name="meta-lmp" path="layers/meta-lmp" remote="fio" revision="649cfaa47f454741333bc9f0533a72f0771310c0"/>
   <project name="meta-clang" path="layers/meta-clang" revision="312ff1c39b1bf5d35c0321e873417eb013cea477"/>
   <project name="meta-openembedded" path="layers/meta-openembedded" revision="730e44900a0a86265bad93a16b5a5ff344a07266"/>
   <project name="meta-lts-mixins" path="layers/meta-lts-mixins-go" revision="a0384aea22a3ddfc70202a26ee1372c91b1fcfc9"/>
@@ -17,5 +17,5 @@
   <project name="meta-security" path="layers/meta-security" revision="1a3e42cedbd94ca73be45800d0e902fec35d0f0f"/>
   <project name="meta-updater" path="layers/meta-updater" revision="3473dc7c88a16cea2e9a6365e22c2331464078f1"/>
   <project name="meta-virtualization" path="layers/meta-virtualization" revision="88327090d26955a678c6f8bd2585aad4d802f6c4"/>
-  <project name="openembedded-core" path="layers/openembedded-core" revision="8e27f96c0befbbb5cf8a2f7076b7a1ffd79addb6"/>
+  <project name="openembedded-core" path="layers/openembedded-core" revision="ebd61290a644a6d9f2b3701e0e7ea050636da76c"/>
 </manifest>
diff --git a/setup-environment-internal b/setup-environment-internal
index 6b6bffe0..209ab334 100644
--- a/setup-environment-internal
+++ b/setup-environment-internal
@@ -277,6 +277,9 @@ INHERIT += "buildhistory"
 BUILDHISTORY_COMMIT = "1"
 EOF
 
+# we don't need this anymore
+unset LMP_VERSION_CACHE
+
 if [ ! -e conf/site.conf ]; then
     cat > conf/site.conf <<_EOF
 SCONF_VERSION = "1"