diff --git a/package/cla-sysrepo/czechlight-install-yang.sh b/package/cla-sysrepo/czechlight-install-yang.sh
index c346fbc..ccd0e3d 100755
--- a/package/cla-sysrepo/czechlight-install-yang.sh
+++ b/package/cla-sysrepo/czechlight-install-yang.sh
@@ -32,7 +32,7 @@
         ;;
     sdn-roadm-hires-add-drop*)
         YANG_ROADM=1
-        WITH_FEATURE=hw-add-drop-20
+        WITH_FEATURE="hw-add-drop-20 pre-wss-ocm"
         INITIAL_DATA=sdn-roadm-add-drop
         ;;
     sdn-roadm-coherent-a-d*)
@@ -54,7 +54,9 @@
     sysrepoctl --search-dirs ${CLA_YANG} --install ${CLA_YANG}/czechlight-roadm-device@2021-03-05.yang
     sysrepoctl --change czechlight-roadm-device --group optics --permissions 0664 --apply
     if [[ ${WITH_FEATURE} ]]; then
-        sysrepoctl --change czechlight-roadm-device --enable-feature ${WITH_FEATURE}
+        for FEATURE in ${WITH_FEATURE}; do
+            sysrepoctl --change czechlight-roadm-device --enable-feature ${FEATURE}
+        done
     fi
     sysrepocfg --datastore=startup --format=json --module=czechlight-roadm-device --import="${CLA_YANG}/${INITIAL_DATA}.json"
 fi
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 29957cf..07396e8 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 29957cfb4cc7944f7a2d25d897546fe5bdd16cae
+Subproject commit 07396e84498af0d4c2194a35d20ef413e7e54068
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index b0d8539..a1b52a0 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit b0d85398246234ed68704abce1cde960888099c4
+Subproject commit a1b52a032703e57e7fe9204573efc65be3488ac8
diff --git a/submodules/velia b/submodules/velia
index eeda4d5..13b1359 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit eeda4d587ffa0a726733ae12787e7745210287be
+Subproject commit 13b1359077ec13641bc610e6798a532f17d42a31