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...