diff --git a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
index dc459c9..bc33805 100644
--- a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
+++ b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
@@ -48,4 +48,8 @@
 endef
 OPENSSH_POST_INSTALL_TARGET_HOOKS += CZECHLIGHT_CFG_FS_OPENSSH_AUTH_PATH_PATCH
 
+NETOPEER2_CONF_OPTS += \
+		      -DNP2SRV_SSH_AUTHORIZED_KEYS_PATTERN="/cfg/ssh-user-auth/%s" \
+		      -DNP2SRV_SSH_AUTHORIZED_KEYS_ARG_IS_USERNAME=ON
+
 $(eval $(generic-package))
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index db2f96c..1fb9138 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit db2f96c8cf270f1a94b0c8ec36bce7da50f7dd12
+Subproject commit 1fb9138c10aee6c6f67d30522c14696d3d01b8be
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index 603dc16..32423ef 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit 603dc16d9aa04d3aaaec806c36438404a82c87ff
+Subproject commit 32423efe9804e6475a3231cc83ea5dda6c06fae8