diff --git a/recipes-core/everest-devtools/evcli_0.7.2.bb b/recipes-core/everest-devtools/evcli_0.7.3.bb
similarity index 68%
rename from recipes-core/everest-devtools/evcli_0.7.2.bb
rename to recipes-core/everest-devtools/evcli_0.7.3.bb
index 2bb3408..6940ef3 100644
--- a/recipes-core/everest-devtools/evcli_0.7.2.bb
+++ b/recipes-core/everest-devtools/evcli_0.7.3.bb
@@ -1,13 +1,9 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRC_URI = "git://github.com/EVerest/everest-utils.git;branch=main;protocol=https"
+require ../everest/everest-core_git.inc
 
-SRCREV = "0b917bfea879549fd7b793d172c06f99625f0788"
-
-S = "${WORKDIR}/git"
-
-SETUPTOOLS_SETUP_PATH = "${S}/ev-dev-tools"
+SETUPTOOLS_SETUP_PATH = "${S}/applications/utils/ev-dev-tools"
 
 inherit setuptools3
 
diff --git a/recipes-core/everest/everest-core_2025.10.0.bb b/recipes-core/everest/everest-core_git.bb
similarity index 66%
rename from recipes-core/everest/everest-core_2025.10.0.bb
rename to recipes-core/everest/everest-core_git.bb
index 9559ade..3711284 100644
--- a/recipes-core/everest/everest-core_2025.10.0.bb
+++ b/recipes-core/everest/everest-core_git.bb
@@ -1,35 +1,25 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRC_URI = "git://github.com/EVerest/everest-core.git;branch=main;protocol=https \
-           file://everest.service \
-           "
+require everest-core_git.inc
 
-S = "${WORKDIR}/git"
-
-SRCREV = "c86cd9c0ada60b5797f574fd484eae4d8330017d"
+SRC_URI:append = " file://everest.service"
 
 do_compile[network] = "0"
 
-inherit cmake pkgconfig systemd python3native
+inherit cmake pkgconfig systemd python3native python3targetconfig
 
 DEPENDS = " \
     boost \
     curl \
     evcli-native \
     everest-cmake \
-    everest-framework \
     everest-sqlite \
-    libcbv2g \
+    ftxui \
     libevent \
-    libevse-security \
-    libfsm \
-    libiso15118 \
     liblog \
     libnfc-nci \
-    libocpp \
     libpcap \
-    libslac \
     libtimer \
     mqttc \
     nodejs-native \
@@ -39,13 +29,24 @@ DEPENDS = " \
     sdbus-c++ \
     sigslot \
     ftxui \
+    mosquitto \
+    nlohmann-json \
+    json-schema-validator \
+    fmt \
+    date \
+    catch2 \
+    rapidyaml \
+    libwebsockets \
+    python3-pybind11 \
+    python3-pybind11-json \
+    libcap \
 "
 
 RDEPENDS:${PN} += "libevent openssl"
 
 INSANE_SKIP:${PN} = "already-stripped useless-rpaths arch file-rdeps"
 
-FILES:${PN} += "${datadir}/everest/*"
+FILES:${PN} += "${libdir}/everest/* ${datadir}/everest/*"
 
 EXTRA_OECMAKE += " \
     -DDISABLE_EDM=ON \
@@ -54,6 +55,9 @@ EXTRA_OECMAKE += " \
     -Deverest-core_INSTALL_EV_CLI_IN_PYTHON_VENV=OFF \
     -Deverest-core_USE_PYTHON_VENV=OFF \
     -DEV_SETUP_PYTHON_EXECUTABLE_USE_PYTHON_VENV=OFF \
+    -DPYTHON_MODULE_EXTENSION=.so \
+    -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF \
+    -DEVEREST_INSTALL_ADMIN_PANEL=OFF \
 "
 
 SYSTEMD_SERVICE:${PN} = "everest.service"
@@ -69,3 +73,7 @@ do_install:append() {
         install -m 0644 ${WORKDIR}/everest.service ${D}${systemd_system_unitdir}/
     fi
 }
+
+OECMAKE_CXX_FLAGS += "-Wno-narrowing"
+
+EXTRA_OECMAKE:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' -DUSING_TPM2=ON', '', d)}"
diff --git a/recipes-core/everest/everest-core_git.inc b/recipes-core/everest/everest-core_git.inc
new file mode 100644
index 0000000..4cd0e29
--- /dev/null
+++ b/recipes-core/everest/everest-core_git.inc
@@ -0,0 +1,9 @@
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/EVerest/everest-core.git;branch=main;protocol=https \
+           "
+
+S = "${WORKDIR}/git"
+
+SRCREV = "3c59e911a242ad5b42081391866c5a915daaab83"
diff --git a/recipes-core/everest/everest-framework_0.24.0.bb b/recipes-core/everest/everest-framework_0.24.0.bb
index 4f0083f..2838c8b 100644
--- a/recipes-core/everest/everest-framework_0.24.0.bb
+++ b/recipes-core/everest/everest-framework_0.24.0.bb
@@ -1,49 +1 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/everest-framework.git;branch=main;protocol=https \
-           "
-
-# ensures the everestpy python bindings build properly
-inherit python3targetconfig
-
-inherit cmake
-inherit pkgconfig
-
-S = "${WORKDIR}/git"
-
-SRCREV = "059e95ca6cdd23f318259a87480c0b1f48d0cf72"
-
-# FIXME (aw): due to nodejs dependency
-do_configure[network] = "1"
-
-DEPENDS = "\
-    everest-cmake \
-    everest-sqlite \
-    boost \
-    websocketpp \
-    nlohmann-json \
-    json-schema-validator \
-    mqttc \
-    liblog \
-    fmt \
-    date \
-    catch2 \
-    nodejs-native \
-    rapidyaml \
-    libwebsockets \
-    python3-pybind11 \
-    python3-pybind11-json \
-    libcap \
-"
-
-FILES:${PN} += "${libdir}/everest/* ${datadir}/everest/*"
-
-EXTRA_OECMAKE += "\
-    -DDISABLE_EDM=ON \
-    -DNO_FETCH_CONTENT=ON \
-    -DPYTHON_MODULE_EXTENSION=.so \
-    -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF \
-    -DEVEREST_INSTALL_ADMIN_PANEL=OFF \
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-"
diff --git a/recipes-core/everest/libcbv2g_0.3.1.bb b/recipes-core/everest/libcbv2g_0.3.1.bb
index b1bc68f..2838c8b 100644
--- a/recipes-core/everest/libcbv2g_0.3.1.bb
+++ b/recipes-core/everest/libcbv2g_0.3.1.bb
@@ -1,19 +1 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libcbv2g.git;branch=main;protocol=https \
-           "
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-SRCREV = "54fed4de61d54aef497e1e3d5863bd8d4ea7d168"
-
-DEPENDS = "\
-    everest-cmake \
-"
-
-# FILES:${PN} += "${datadir}/everest/*"
-
-EXTRA_OECMAKE += "-DDISABLE_EDM=ON -DCB_V2G_INSTALL=ON -DCB_V2G_BUILD_TESTS=OFF"
diff --git a/recipes-core/everest/libevse-security_0.10.0.bb b/recipes-core/everest/libevse-security_0.10.0.bb
index 6f204d3..2838c8b 100644
--- a/recipes-core/everest/libevse-security_0.10.0.bb
+++ b/recipes-core/everest/libevse-security_0.10.0.bb
@@ -1,27 +1 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libevse-security.git;branch=main;protocol=https \
-           "
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-SRCREV = "06db4b29e0a4ea4c6c40d77b6ecae7c153f4d9d7"
-
-DEPENDS = "\
-    date \
-    everest-cmake \
-    liblog \
-    libtimer \
-    openssl \
-"
-
-FILES:${PN} += "${datadir}/everest/*"
-
-EXTRA_OECMAKE += "-DDISABLE_EDM=ON -DEVSE_SECURITY_INSTALL=ON -DLIBEVSE_SECURITY_BUILD_TESTING=OFF"
-OECMAKE_CXX_FLAGS += "-Wno-narrowing"
-
-# Add TPM2 support
-EXTRA_OECMAKE:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' -DUSING_TPM2=ON', '', d)}"
diff --git a/recipes-core/everest/libfsm_0.2.0.bb b/recipes-core/everest/libfsm_0.2.0.bb
index 93be21b..2838c8b 100644
--- a/recipes-core/everest/libfsm_0.2.0.bb
+++ b/recipes-core/everest/libfsm_0.2.0.bb
@@ -1,12 +1 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libfsm.git;branch=main;protocol=https"
-
-SRCREV = "b31d5f97cc3e09186e21eddf8cb3bcb133d7bc3c"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "everest-cmake"
-
-inherit cmake
diff --git a/recipes-core/everest/libiso15118_0.9.0.bb b/recipes-core/everest/libiso15118_0.9.0.bb
deleted file mode 100644
index d71e13d..0000000
--- a/recipes-core/everest/libiso15118_0.9.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libiso15118.git;branch=main;protocol=https \
-           "
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-SRCREV = "a792d07039475375faf56813ce46f52728032d80"
-
-DEPENDS = "\
-    everest-cmake \
-    libcbv2g \
-    libfsm \
-"
-
-FILES:${PN} += "${datadir}/everest/*"
-
-EXTRA_OECMAKE += "-DDISABLE_EDM=ON"
diff --git a/recipes-core/everest/libiso15118_git.bb b/recipes-core/everest/libiso15118_git.bb
new file mode 100644
index 0000000..2838c8b
--- /dev/null
+++ b/recipes-core/everest/libiso15118_git.bb
@@ -0,0 +1 @@
+LICENSE = "Apache-2.0"
diff --git a/recipes-core/everest/libocpp_0.30.3.bb b/recipes-core/everest/libocpp_0.30.3.bb
deleted file mode 100644
index 46d0f6b..0000000
--- a/recipes-core/everest/libocpp_0.30.3.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libocpp.git;branch=main;protocol=https \
-           "
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-SRCREV = "1c6fb7c5fd92b4651648bcf3a6c8f32b58b935dc"
-
-DEPENDS = "\
-    everest-cmake \
-    boost \
-    sqlite3 \
-    openssl \
-    libwebsockets \
-    nlohmann-json \
-    json-schema-validator \
-    libfsm \
-    liblog \
-    libtimer \
-    libevse-security \
-    everest-sqlite \
-"
-
-FILES:${PN} += "${datadir}/everest/*"
-
-EXTRA_OECMAKE += "-DDISABLE_EDM=ON"
diff --git a/recipes-core/everest/libocpp_git.bb b/recipes-core/everest/libocpp_git.bb
new file mode 100644
index 0000000..2838c8b
--- /dev/null
+++ b/recipes-core/everest/libocpp_git.bb
@@ -0,0 +1 @@
+LICENSE = "Apache-2.0"
diff --git a/recipes-core/everest/libslac_0.3.1.bb b/recipes-core/everest/libslac_0.3.1.bb
index 0b95048..2838c8b 100644
--- a/recipes-core/everest/libslac_0.3.1.bb
+++ b/recipes-core/everest/libslac_0.3.1.bb
@@ -1,14 +1 @@
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-SRC_URI = "git://github.com/EVerest/libslac.git;branch=main;protocol=https"
-
-inherit cmake
-
-SRCREV = "913412d0209f074b3df092f343bf0f9ac00edfce"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "everest-cmake"
-
-EXTRA_OECMAKE += "-DDISABLE_EDM=ON"
diff --git a/recipes-core/josev/python3-iso15118_2025.9.0.bb b/recipes-core/josev/python3-iso15118_git.bb
similarity index 93%
rename from recipes-core/josev/python3-iso15118_2025.9.0.bb
rename to recipes-core/josev/python3-iso15118_git.bb
index b34b295..27f86e1 100644
--- a/recipes-core/josev/python3-iso15118_2025.9.0.bb
+++ b/recipes-core/josev/python3-iso15118_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRC_URI = "git://github.com/EVerest/ext-switchev-iso15118.git;protocol=https;branch=everest"
 
-SRCREV = "36dd3ec79a106d5f29631aac85f5decdb417498e"
+SRCREV = "c31c4e7f8004dc63cec28ad113bd059cbabbe321"
 
 S = "${WORKDIR}/git"