diff --git a/package/cla-sysrepo/cla-appliance.service.in b/package/cla-sysrepo/cla-appliance.service.in
index 82d01d2..8058606 100644
--- a/package/cla-sysrepo/cla-appliance.service.in
+++ b/package/cla-sysrepo/cla-appliance.service.in
@@ -1,14 +1,14 @@
 [Unit]
 Description=CzechLight __MODEL__ driver
-After=syslog.target network.target sysrepod.service
+After=syslog.target network.target czechlight-install-yang.service
 Before=rauc-mark-good.service
-Requires=sysrepod.service
-PartOf=sysrepod.service
+PartOf=netopeer2.service
+Requires=czechlight-install-yang.service
 StartLimitIntervalSec=0
 ConditionKernelCommandLine=czechlight=__MODEL__
 
 [Service]
-Type=simple
+Type=notify
 ExecStart=/usr/bin/cla-sysrepod --io-log-level=5 --properties-log-level=5 --sr-bridge-log-level=5 --sysrepo-log-level=3 --appliance=__MODEL__
 PrivateTmp=yes
 PrivateDevices=no
diff --git a/package/cla-sysrepo/cla-install-yang.service.in b/package/cla-sysrepo/cla-install-yang.service.in
deleted file mode 100644
index 34b67c8..0000000
--- a/package/cla-sysrepo/cla-install-yang.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Install YANG and initial data for __MODEL__
-Requires=sysrepod.service
-ConditionKernelCommandLine=czechlight=__MODEL__
-ConditionPathExistsGlob=!/etc/sysrepo/yang/__YANG__@*.yang
-Before=sysrepod.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sysrepoctl --install --yang /usr/share/cla-sysrepo/yang/__YANG__.yang
-ExecStart=/usr/bin/sysrepoctl --module __YANG__ --feature-enable __FEATURE__
-ExecStart=/usr/bin/sysrepocfg --datastore=startup --import=/usr/share/cla-sysrepo/yang/__MODEL__.json __YANG__
-ExecStart=/bin/cp -a /etc/sysrepo /cfg/etc/
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/cla-sysrepo/cla-sysrepo.mk b/package/cla-sysrepo/cla-sysrepo.mk
index f5e9239..cf3366c 100644
--- a/package/cla-sysrepo/cla-sysrepo.mk
+++ b/package/cla-sysrepo/cla-sysrepo.mk
@@ -6,47 +6,27 @@
 CLA_SYSREPO_CONF_OPTS = -DTHREADS_PTHREAD_ARG:STRING=-pthread
 CLA_SYSREPO_LICENSE_FILES = LICENSE.md
 
-define CLA_SYSREPO_ONE_MODEL_INSTALL_1
+define CLA_SYSREPO_PREPARE_SERVICE
 	sed \
 		-e "s/__MODEL__/$1/g" \
-		-e "s/__YANG__/$2/g" \
-		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/cla-sysrepo/cla-install-yang.service.in \
-		> $(TARGET_DIR)/usr/lib/systemd/system/cla-install-yang-$1.service
-endef
-
-define CLA_SYSREPO_ONE_MODEL_INSTALL_2
-	sed -i '/__FEATURE__/d' $(TARGET_DIR)/usr/lib/systemd/system/cla-install-yang-$1.service
-	sed \
-		-e "s/__MODEL__/$1/g" \
-		-e "s/__YANG__/$2/g" \
 		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/cla-sysrepo/cla-appliance.service.in \
 		> $(TARGET_DIR)/usr/lib/systemd/system/cla-$1.service
-	mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants
-	ln -sf ../cla-install-yang-$1.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
 	ln -sf ../cla-$1.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
 endef
 
-define CLA_SYSREPO_ONE_MODEL_W_FEATURE
-	$(call CLA_SYSREPO_ONE_MODEL_INSTALL_1,$1,$2)
-	# FIXME: multiple features...
-	sed -i 's|__FEATURE__|ExecStart=/usr/bin/sysrepoctl --module $2 --feature-enable $3\n__FEATURE__|' \
-		$(TARGET_DIR)/usr/lib/systemd/system/cla-install-yang-$1.service
-	$(call CLA_SYSREPO_ONE_MODEL_INSTALL_2,$1,$2)
-endef
-
-define CLA_SYSREPO_ONE_MODEL
-	$(call CLA_SYSREPO_ONE_MODEL_INSTALL_1,$1,$2)
-	$(call CLA_SYSREPO_ONE_MODEL_INSTALL_2,$1,$2)
-endef
-
 define CLA_SYSREPO_INSTALL_INIT_SYSTEMD
-	$(call CLA_SYSREPO_ONE_MODEL_W_FEATURE,sdn-roadm-add-drop,czechlight-roadm-device,hw-add-drop-20)
-	$(call CLA_SYSREPO_ONE_MODEL_W_FEATURE,sdn-roadm-line,czechlight-roadm-device,hw-line-9)
-	$(call CLA_SYSREPO_ONE_MODEL,sdn-roadm-coherent-a-d,czechlight-coherent-add-drop)
-	$(call CLA_SYSREPO_ONE_MODEL,sdn-inline,czechlight-inline-amp)
-	$(call CLA_SYSREPO_ONE_MODEL,calibration-box,czechlight-calibration-device)
+	$(INSTALL) -m 0755 -t $(TARGET_DIR)/usr/bin/ \
+		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/cla-sysrepo/czechlight-install-yang.sh
+	mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants
+	$(INSTALL) -D -m 0644 -t $(TARGET_DIR)/usr/lib/systemd/system/ \
+		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/cla-sysrepo/czechlight-install-yang.service
+
+	$(call CLA_SYSREPO_PREPARE_SERVICE,sdn-roadm-add-drop)
+	$(call CLA_SYSREPO_PREPARE_SERVICE,sdn-roadm-line)
+	$(call CLA_SYSREPO_PREPARE_SERVICE,sdn-roadm-coherent-a-d)
+	$(call CLA_SYSREPO_PREPARE_SERVICE,sdn-inline)
+	$(call CLA_SYSREPO_PREPARE_SERVICE,calibration-box)
 endef
 
 # FIXME: calibration-box really needs a drop-in file with increased timeout...
diff --git a/package/cla-sysrepo/czechlight-install-yang.service b/package/cla-sysrepo/czechlight-install-yang.service
new file mode 100644
index 0000000..21deb1a
--- /dev/null
+++ b/package/cla-sysrepo/czechlight-install-yang.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Install CzechLight YANG models
+After=netopeer2-setup.service cfg.mount
+Requires=netopeer2-setup.service cfg.mount
+Before=netopeer2.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash /usr/bin/czechlight-install-yang.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/package/cla-sysrepo/czechlight-install-yang.sh b/package/cla-sysrepo/czechlight-install-yang.sh
new file mode 100755
index 0000000..a528a0c
--- /dev/null
+++ b/package/cla-sysrepo/czechlight-install-yang.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+set -ex
+
+IETF_HW_STATE=0
+YANG_ROADM=0
+YANG_COHERENT=0
+YANG_INLINE=0
+YANG_CALIBRATION=0
+
+YANG_DIR=/usr/share/cla-sysrepo/yang
+REPO=/etc/sysrepo/yang
+
+for ARG in $(cat /proc/cmdline); do
+    case "${ARG}" in
+        czechlight=*)
+            CZECHLIGHT="${ARG:11}"
+            ;;
+    esac
+done
+
+case "${CZECHLIGHT}" in
+    sdn-roadm-line)
+        YANG_ROADM=1
+        WITH_FEATURE=hw-line-9
+        IETF_HW_STATE=1
+        ;;
+    sdn-roadm-add-drop)
+        YANG_ROADM=1
+        WITH_FEATURE=hw-add-drop-20
+        IETF_HW_STATE=1
+        ;;
+    sdn-roadm-coherent-a-d)
+        IETF_HW_STATE=1
+        YANG_COHERENT=1
+        ;;
+    sdn-inline)
+        IETF_HW_STATE=1
+        YANG_INLINE=1
+        ;;
+    calibration-box)
+        YANG_CALIBRATION=1
+        ;;
+esac
+
+if [[ ${IETF_HW_STATE} == 1 && ! -f ${REPO}/ietf-hardware-state@2018-03-13.yang ]]; then
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/iana-hardware@2018-03-13.yang
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/ietf-hardware-state@2018-03-13.yang
+    sysrepoctl --change ietf-hardware-state --permissions 0664 --enable-feature hardware-sensor --apply
+fi
+
+if [[ ${YANG_ROADM} == 1 && ! -f ${REPO}/czechlight-roadm-device@2019-09-30.yang ]]; then
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-roadm-device.yang
+    sysrepoctl --change czechlight-roadm-device --group optics --permissions 0664 --apply
+    if [[ ${WITH_FEATURE} ]]; then
+        sysrepoctl --change czechlight-roadm-device --enable-feature ${WITH_FEATURE}
+    fi
+    sysrepocfg --datastore=startup --format=json --module=czechlight-roadm-device --import="${YANG_DIR}/${CZECHLIGHT}.json"
+fi
+
+if [[ ${YANG_COHERENT} == 1 && ! -f ${REPO}/czechlight-coherent-add-drop@2019-09-30.yang ]]; then
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-coherent-add-drop.yang
+    sysrepoctl --change czechlight-coherent-add-drop --group optics --permissions 0664 --apply
+    sysrepocfg --datastore=startup --format=json --module=czechlight-coherent-add-drop --new-data="${YANG_DIR}/${CZECHLIGHT}.json"
+fi
+
+if [[ ${YANG_INLINE} == 1 && ! -f ${REPO}/czechlight-inline-amp@2019-09-30.yang ]]; then
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-inline-amp.yang
+    sysrepoctl --change czechlight-inline-amp --group optics --permissions 0664 --apply
+    sysrepocfg --datastore=startup --format=json --module=czechlight-inline-amp --import="${YANG_DIR}/${CZECHLIGHT}.json"
+fi
+
+if [[ ${YANG_CALIBRATION} == 1 && ! -f ${REPO}/czechlight-calibration-device@2019-06-25.yang ]]; then
+    sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-calibration-device.yang
+    sysrepoctl --change czechlight-calibration-device --group optics --permissions 0664 --apply
+    sysrepocfg --datastore=startup --format=json --module=czechlight-calibration-device --import="${YANG_DIR}/${CZECHLIGHT}.json"
+fi
+
+if [[ ! -f ${REPO}/czechlight-lldp@2020-08-25.yang ]]; then
+    sysrepoctl --search-dirs /usr/share/lldp-systemd-networkd-sysrepo/yang --install /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp.yang
+    sysrepoctl --change czechlight-lldp --permissions 0664 --apply
+fi
+
+mkdir -p /cfg/etc/sysrepo/
+cp -a /etc/sysrepo/data /etc/sysrepo/yang /cfg/etc/sysrepo/
diff --git a/package/czechlight-cfg-fs/Config.in b/package/czechlight-cfg-fs/Config.in
index 81fe19f..0a3dfa6 100644
--- a/package/czechlight-cfg-fs/Config.in
+++ b/package/czechlight-cfg-fs/Config.in
@@ -27,14 +27,14 @@
 
 endif # BR2_PACKAGE_SYSREPO
 
-if BR2_PACKAGE_NETOPEER2_KEYSTORED
+if BR2_PACKAGE_NETOPEER2
 
 config CZECHLIGHT_CFG_FS_PERSIST_KEYS
 	bool "Persist host keys for OpenSSH and Netopeer2"
 	default Y
 	help
-	  Save OpenSSH's key material and netopeer2-keystored's SSH keys into /cfg
+	  Save OpenSSH's key material and netopeer2's SSH keys into /cfg
 
-endif # BR2_PACKAGE_NETOPEER2_KEYSTORED
+endif # BR2_PACKAGE_NETOPEER2
 
 endif # BR2_PACKAGE_CZECHLIGHT_CFG_FS
diff --git a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
index 888dc34..c9d1c57 100644
--- a/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
+++ b/package/czechlight-cfg-fs/czechlight-cfg-fs.mk
@@ -35,10 +35,6 @@
 			$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/czechlight-cfg-fs/openssh-persistent-keys.service \
 			$(TARGET_DIR)/usr/lib/systemd/system/
 		ln -sf ../openssh-persistent-keys.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
-		$(INSTALL) -D -m 0644 \
-			$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/czechlight-cfg-fs/netopeer2-keystored-persistent-keys.service \
-			$(TARGET_DIR)/usr/lib/systemd/system/
-		ln -sf ../netopeer2-keystored-persistent-keys.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
 	$(endif)
 endef
 
diff --git a/package/czechlight-cfg-fs/netopeer2-keystored-persistent-keys.service b/package/czechlight-cfg-fs/netopeer2-keystored-persistent-keys.service
deleted file mode 100644
index 773f293..0000000
--- a/package/czechlight-cfg-fs/netopeer2-keystored-persistent-keys.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Store NETCONF SSH host keys into /cfg
-After=cfg.mount netopeer2-keystored-init-keys.service
-Requires=cfg.mount netopeer2-keystored-init-keys.service
-ConditionPathExists=!/cfg/etc/keystored/keys
-
-[Service]
-Type=oneshot
-ExecStartPre=/bin/mkdir -p /cfg/etc
-ExecStart=/bin/cp -a /etc/keystored /cfg/etc/
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/czechlight-cfg-fs/sysrepo-persistent-cfg.service b/package/czechlight-cfg-fs/sysrepo-persistent-cfg.service
index e965fdf..598d792 100644
--- a/package/czechlight-cfg-fs/sysrepo-persistent-cfg.service
+++ b/package/czechlight-cfg-fs/sysrepo-persistent-cfg.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Persisting persistent sysrepo datastores to /cfg
-After=sysrepod.service cfg.mount
-Requires=cfg.mount
+After=netopeer2.service cfg.mount
+Requires=netopeer2.service cfg.mount
 
 [Service]
 Type=simple
-ExecStart=/bin/sh -c 'while true; do inotifywait -e CLOSE_WRITE /etc/sysrepo/data/*.startup /etc/sysrepo/data/*.persist && mkdir -p /cfg/etc/sysrepo/data/ && cp -a /etc/sysrepo/data/*.startup /etc/sysrepo/data/*.persist /cfg/etc/sysrepo/data/; done'
+ExecStart=/bin/sh -c 'while true; do inotifywait -e CLOSE_WRITE /etc/sysrepo/data/*.startup && mkdir -p /cfg/etc/sysrepo/data/ && cp -a /etc/sysrepo/data/*.startup /cfg/etc/sysrepo/data/; done'
diff --git a/package/czechlight-rauc/rauc-hook.sh b/package/czechlight-rauc/rauc-hook.sh
index 64a536a..55d82b9 100755
--- a/package/czechlight-rauc/rauc-hook.sh
+++ b/package/czechlight-rauc/rauc-hook.sh
@@ -28,4 +28,12 @@
     ;;
 esac
 
+if [[ -f /lib/libsysrepo.so.0.7 ]]; then
+  # Updating from old sysrepo with incompatible repository layout
+  rm -rf ${RAUC_SLOT_MOUNT_POINT}/etc/sysrepo
+  # No more netopeer2-keystored, different config
+  rm -rf ${RAUC_SLOT_MOUNT_POINT}/etc/keystored
+  echo "sysrepo configuration not preserved"
+fi
+
 exit 0
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo-install-yang.service b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo-install-yang.service
deleted file mode 100644
index 003f7e2..0000000
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo-install-yang.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Install YANG and initial data for lldp-systemd-networkd-sysrepo
-Requires=sysrepod.service
-Before=sysrepod.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sysrepoctl --install --yang /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp.yang
-ExecStart=/usr/bin/sysrepoctl --install --yang /usr/share/lldp-systemd-networkd-sysrepo/yang/iana-afn-safi@2013-07-04.yang
-ExecStart=/usr/bin/sysrepoctl --install --yang /usr/share/lldp-systemd-networkd-sysrepo/yang/ietf-inet-types@2013-07-15.yang
-ExecStart=/bin/cp -a /etc/sysrepo /cfg/etc/
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk
index 84f6252..f6a17cb 100644
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk
+++ b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.mk
@@ -8,13 +8,9 @@
 LLDP_SYSTEMD_NETWORKD_SYSREPO_LICENSE_FILES = LICENSE.md
 
 define LLDP_SYSTEMD_NETWORKD_SYSREPO_INSTALL_INIT_SYSTEMD
-        mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
-        $(INSTALL) -D -m 0644 \
-                $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service \
-                $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo-install-yang.service \
-                $(TARGET_DIR)/usr/lib/systemd/system/
+        $(INSTALL) -D -m 0644 -t $(TARGET_DIR)/usr/lib/systemd/system/ \
+                $(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
         ln -sf ../lldp-systemd-networkd-sysrepo.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
-        ln -sf ../lldp-systemd-networkd-sysrepo-install-yang.service $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/
 endef
 
 $(eval $(cmake-package))
diff --git a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
index 94c7f62..aec9176 100644
--- a/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
+++ b/package/lldp-systemd-networkd-sysrepo/lldp-systemd-networkd-sysrepo.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=lldp-systemd-networkd-sysrepo is a sysrepo application announcing LLDP neighbours from systemd-networkd.
-After=syslog.target network.target sysrepod.service
-Requires=sysrepod.service
+After=syslog.target network.target czechlight-install-yang.service
+Requires=czechlight-install-yang.service
+PartOf=netopeer2.service
 
 [Service]
 Type=simple