diff --git a/package/cla-sysrepo/cla-appliance.service.in b/package/cla-sysrepo/cla-appliance.service.in
index 8058606..0d5e8f3 100644
--- a/package/cla-sysrepo/cla-appliance.service.in
+++ b/package/cla-sysrepo/cla-appliance.service.in
@@ -1,9 +1,9 @@
 [Unit]
 Description=CzechLight __MODEL__ driver
-After=syslog.target network.target czechlight-install-yang.service
+After=syslog.target network.target czechlight-install-yang.service cfg-restore-sysrepo.service
 Before=rauc-mark-good.service
 PartOf=netopeer2.service
-Requires=czechlight-install-yang.service
+Requires=czechlight-install-yang.service cfg-restore-sysrepo.service
 StartLimitIntervalSec=0
 ConditionKernelCommandLine=czechlight=__MODEL__
 
diff --git a/package/cla-sysrepo/czechlight-install-yang.service b/package/cla-sysrepo/czechlight-install-yang.service
index 21deb1a..83cdf0d 100644
--- a/package/cla-sysrepo/czechlight-install-yang.service
+++ b/package/cla-sysrepo/czechlight-install-yang.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Install CzechLight YANG models
-After=netopeer2-setup.service cfg.mount
-Requires=netopeer2-setup.service cfg.mount
-Before=netopeer2.service
+After=netopeer2-install-yang.service cfg.mount
+Requires=netopeer2-install-yang.service cfg.mount
+Before=netopeer2.service cfg-restore-sysrepo.service
 
 [Service]
 Type=oneshot
diff --git a/package/cla-sysrepo/czechlight-install-yang.sh b/package/cla-sysrepo/czechlight-install-yang.sh
index 38e4c95..46191db 100755
--- a/package/cla-sysrepo/czechlight-install-yang.sh
+++ b/package/cla-sysrepo/czechlight-install-yang.sh
@@ -99,5 +99,5 @@
     sysrepoctl --change czechlight-lldp --permissions 0664 --apply
 fi
 
-mkdir -p /cfg/etc/sysrepo/
-cp -a /etc/sysrepo/data /etc/sysrepo/yang /cfg/etc/sysrepo/
+# If not do not copy here from startup -> running, running might be stale.
+sysrepocfg -C startup