diff --git a/.zuul.yaml b/.zuul.yaml
index 8355f52..cb977cb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,7 +24,6 @@
       - github/CESNET/Netopeer2
       - github/onqtam/doctest
       - github/rollbear/trompeloeil
-      - github/tplgy/cppcodec
       - github/AmokHuginnsson/replxx
       - github/Kistler-Group/sdbus-cpp
 
diff --git a/ci/build.sh b/ci/build.sh
index 14b7055..3454392 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -76,7 +76,7 @@
     for PROJECT in \
             libyang sysrepo libnetconf2 netopeer2 \
             libyang-cpp sysrepo-cpp \
-            replxx cppcodec sdbus-cpp \
+            replxx sdbus-cpp \
             ; do
         rm -rf build/{,host-}${PROJECT}-custom/ per-package/{,host-}${PROJECT}/
     done
diff --git a/dev-setup-git.sh b/dev-setup-git.sh
index e1ff8dc..580dbda 100755
--- a/dev-setup-git.sh
+++ b/dev-setup-git.sh
@@ -9,7 +9,6 @@
 CZECHLIGHT_BR2_EXT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cat > local.mk <<EOF
 REPLXX_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/dependencies/replxx
-CPPCODEC_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/dependencies/cppcodec
 SDBUS_CPP_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/dependencies/sdbus-cpp
 
 LIBYANG_OVERRIDE_SRCDIR = ${CZECHLIGHT_BR2_EXT_LOC}/submodules/dependencies/libyang
diff --git a/package/cla-sysrepo/Config.in b/package/cla-sysrepo/Config.in
index 0a40ee3..bc9a8a3 100644
--- a/package/cla-sysrepo/Config.in
+++ b/package/cla-sysrepo/Config.in
@@ -7,7 +7,6 @@
 	select BR2_PACKAGE_SYSTEMD
 	select BR2_PACKAGE_LIBGPIOD
 	select BR2_PACKAGE_BOOST
-	select BR2_PACKAGE_CPPCODEC
 	select BR2_PACKAGE_LIBEV
 	select BR2_PACKAGE_CZECHLIGHT_CFG_FS
 	help
diff --git a/package/cla-sysrepo/cla-sysrepo.mk b/package/cla-sysrepo/cla-sysrepo.mk
index 9ef7eee..e10d297 100644
--- a/package/cla-sysrepo/cla-sysrepo.mk
+++ b/package/cla-sysrepo/cla-sysrepo.mk
@@ -2,7 +2,7 @@
 CLA_SYSREPO_SITE = ssh://kundrat@cesnet.cz@gerrit.cesnet.cz:29418/CzechLight/cla-sysrepo
 CLA_SYSREPO_SITE_METHOD = git
 CLA_SYSREPO_INSTALL_STAGING = NO
-CLA_SYSREPO_DEPENDENCIES = sysrepo-cpp docopt-cpp spdlog systemd libgpiod boost cppcodec libev
+CLA_SYSREPO_DEPENDENCIES = sysrepo-cpp docopt-cpp spdlog systemd libgpiod boost libev
 CLA_SYSREPO_CONF_OPTS = -DTHREADS_PTHREAD_ARG:STRING=-pthread
 CLA_SYSREPO_LICENSE_FILES = LICENSE.md
 
diff --git a/submodules/buildroot b/submodules/buildroot
index 6610e4d..c189d19 160000
--- a/submodules/buildroot
+++ b/submodules/buildroot
@@ -1 +1 @@
-Subproject commit 6610e4df3ca84d2ecee393e7025e5657801e08cc
+Subproject commit c189d19d56af5dca0a387ae78a40dc14698ef469
diff --git a/submodules/dependencies b/submodules/dependencies
index 813aa50..85e8e5e 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit 813aa508f85df76a44f389c6c63262d4b3fd065a
+Subproject commit 85e8e5e2e932e04b0167e279c9d7a3be977072b1