diff --git a/board/czechlight/common/overlay/usr/bin/netconf-cli-local b/board/czechlight/common/overlay/usr/bin/netconf-cli-local
new file mode 100755
index 0000000..9fd260e
--- /dev/null
+++ b/board/czechlight/common/overlay/usr/bin/netconf-cli-local
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/netconf-cli --socket /var/run/netopeer2-server.sock
diff --git a/board/czechlight/common/users b/board/czechlight/common/users
index 14fbfab..a4c13ad 100644
--- a/board/czechlight/common/users
+++ b/board/czechlight/common/users
@@ -1 +1 @@
-dwdm -1 optics -1 =dwdm /home/dwdm /bin/sysrepo-cli - Optical management
+dwdm -1 optics -1 =dwdm /home/dwdm /bin/netconf-cli-local - Optical management
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 121d256..62cba2d 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -4,7 +4,7 @@
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_NEON=y
 BR2_ENABLE_DEBUG=y
-BR2_STRIP_EXCLUDE_FILES="cla-* netopeer2* sysrepo* libsysrepo* libSysrepo* libnetconf2* libyang* sysrepo-cli veliad-* lldp-systemd-networkd-sysrepod"
+BR2_STRIP_EXCLUDE_FILES="cla-* netopeer* *sysrepo* libSysrepo* *netconf* *yang* velia* lldp-systemd-networkd-sysrepod"
 BR2_STRIP_EXCLUDE_DIRS="/usr/lib/libyang /usr/lib/sysrepo"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/patches"
 BR2_PER_PACKAGE_DIRECTORIES=y
diff --git a/submodules/buildroot b/submodules/buildroot
index 4e796f7..4aaa013 160000
--- a/submodules/buildroot
+++ b/submodules/buildroot
@@ -1 +1 @@
-Subproject commit 4e796f74df78a0abbd219b86dcfab2e8da940bdb
+Subproject commit 4aaa013f87e968c14e9cde8d24199c6015432237
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 75f5aaa..3bebd49 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 75f5aaa713260ac9afa8e91be32a201a2eb8223a
+Subproject commit 3bebd4933895f0af85fc08c31648e624c725e484
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index 86840ec..2dbf670 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit 86840eca40f0e0cc564a426b6158152480fd27d8
+Subproject commit 2dbf6702a138597315616511a2395bce8d0977c3
diff --git a/submodules/velia b/submodules/velia
index 9d3a795..9aa0192 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit 9d3a795c4f454163016c2d0ed62d485cb65bc85f
+Subproject commit 9aa019293112b06f84a55105851d1ad9006b8ec6