diff --git a/board/czechlight/common/users b/board/czechlight/common/users
index f5baa8d..14fbfab 100644
--- a/board/czechlight/common/users
+++ b/board/czechlight/common/users
@@ -1 +1 @@
-dwdm -1 optics -1 =dwdm /home/dwdm /bin/netconf-cli - Optical management
+dwdm -1 optics -1 =dwdm /home/dwdm /bin/sysrepo-cli - Optical management
diff --git a/configs/czechlight_beaglebone_defconfig b/configs/czechlight_beaglebone_defconfig
index 51549c0..66b4eb6 100644
--- a/configs/czechlight_beaglebone_defconfig
+++ b/configs/czechlight_beaglebone_defconfig
@@ -2,7 +2,7 @@
 BR2_cortex_a8=y
 BR2_ARM_FPU_VFPV3=y
 BR2_ENABLE_DEBUG=y
-BR2_STRIP_EXCLUDE_FILES="cla-* netopeer2* sysrepo* libsysrepo* libSysrepo* libnetconf2* libyang* netconf-cli"
+BR2_STRIP_EXCLUDE_FILES="cla-* netopeer2* sysrepo* libsysrepo* libSysrepo* libnetconf2* libyang* sysrepo-cli"
 BR2_STRIP_EXCLUDE_DIRS="/usr/lib/libyang /usr/lib/sysrepo"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/patches"
 BR2_REPRODUCIBLE=y
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 7d31df7..56741f3 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* netconf-cli"
+BR2_STRIP_EXCLUDE_FILES="cla-* netopeer2* sysrepo* libsysrepo* libSysrepo* libnetconf2* libyang* sysrepo-cli"
 BR2_STRIP_EXCLUDE_DIRS="/usr/lib/libyang /usr/lib/sysrepo"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/patches"
 BR2_REPRODUCIBLE=y
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 7528f92..c7040a0 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 7528f925127d90906a64136cb87d3c7dc04f7525
+Subproject commit c7040a009a4f1f41424df64604aa079f19121ee0
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index bd3169c..b79f3ca 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit bd3169ca871534658d14d6a0cd64396f511f0263
+Subproject commit b79f3cadefd8da5c041eb829fe14e15acfb133ca