diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 76d90dc75..f4b8c05a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: ${{github.ref == 'refs/heads/main' && github.event_name == 'push'}} || github.event_name == 'workflow_dispatch'
+    if: ${{github.ref_name == 'main' && github.event_name == 'push'}} || github.event_name == 'workflow_dispatch'
     name: Build ${{ matrix.platform }} ${{ matrix.variant }}
     runs-on: ubuntu-latest
     strategy:
@@ -72,7 +72,7 @@ jobs:
         with:
           path: output/${{ steps.vars.outputs.tgz }}
   release:
-    if: ${{github.repository == 'kernelkit/infix' && github.ref == 'refs/heads/main'}}
+    if: ${{github.repository_owner == 'kernelkit' && github.ref_name == 'main'}}
     name: Upload Latest Build
     needs: build
     runs-on: ubuntu-latest
diff --git a/board/common/rootfs/etc/finit.d/enabled/sshd.conf b/board/common/rootfs/etc/finit.d/enabled/sshd.conf
deleted file mode 120000
index a4e465f27..000000000
--- a/board/common/rootfs/etc/finit.d/enabled/sshd.conf
+++ /dev/null
@@ -1 +0,0 @@
-../available/sshd.conf
\ No newline at end of file
diff --git a/package/confd/clean-etc b/package/confd/clean-etc
deleted file mode 100755
index ef8504b28..000000000
--- a/package/confd/clean-etc
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-reserved()
-{
-    for svc in avahi dnsmasq getty klish lldpd nginx rauc ssdpd sshd sysklogd sysrepo; do
-	[ "$1" = "${svc}.conf" ] && return 0
-    done
-
-    return 1
-}
-
-for file in /etc/finit.d/enabled/*.conf; do
-    reserved "$(basename "$file")" && continue
-    rm "$file"
-done
diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index aa6992df8..cb379b82a 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -8,6 +8,8 @@ CONFD_VERSION = 1.0
 CONFD_LICENSE = BSD-3-Clause
 CONFD_SITE_METHOD = local
 CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd
+CONFD_LICENSE = BSD-3
+CONFD_LICENSE_FILES = LICENSE
 CONFD_DEPENDENCIES = augeas jansson libite sysrepo
 CONFD_AUTORECONF = YES
 
@@ -21,10 +23,6 @@ define CONFD_INSTALL_EXTRA
 	cp $(CONFD_PKGDIR)/sysrepo.conf  $(FINIT_D)/available/
 	ln -sf ../available/sysrepo.conf $(FINIT_D)/enabled/sysrepo.conf
 	cp $(CONFD_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/confd.conf
-	mkdir -p $(TARGET_DIR)/usr/share/factory/cfg
-	cp $(CONFD_PKGDIR)/factory-config.cfg $(TARGET_DIR)/usr/share/factory/cfg/startup-config.cfg
-	mkdir -p $(TARGET_DIR)/lib/infix
-	cp $(CONFD_PKGDIR)/clean-etc     $(TARGET_DIR)/lib/infix/
 endef
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
 
diff --git a/package/confd/factory-config.cfg b/package/confd/factory-config.cfg
deleted file mode 100644
index 4c5e9fcfe..000000000
--- a/package/confd/factory-config.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "ietf-interfaces:interfaces": {
-    "interface": [
-      {
-        "name": "eth0",
-        "type": "iana-if-type:ethernetCsmacd",
-        "ietf-ip:ipv4": {
-          "infix-ip:autoconf": {
-            "enabled": true
-          }
-        },
-        "ietf-ip:ipv6": {
-          "enabled": true,
-          "autoconf": {
-            "create-global-addresses": true
-          }
-        }
-      }
-    ]
-  },
-  "ietf-system:system": {
-    "hostname": "infix"
-  }
-}
diff --git a/package/factory/factory.mk b/package/factory/factory.mk
index 7c0928b85..194f03a80 100644
--- a/package/factory/factory.mk
+++ b/package/factory/factory.mk
@@ -5,6 +5,7 @@
 ################################################################################
 FACTORY_VERSION = 1.0
 FACTORY_LICENSE = MIT
+FACTORY_LICENSE_FILES = LICENSE
 FACTORY_SITE_METHOD = local
 FACTORY_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/factory
 
diff --git a/package/faux/faux.mk b/package/faux/faux.mk
index ff1e3cd62..235dddb47 100644
--- a/package/faux/faux.mk
+++ b/package/faux/faux.mk
@@ -8,7 +8,7 @@ FAUX_VERSION = tags/2.1.0
 FAUX_SITE = https://src.libcode.org/pkun/faux.git
 FAUX_SITE_METHOD = git
 FAUX_LICENSE = BSD-3
-FAUX_LICENSE_FILES = LICENSE
+FAUX_LICENSE_FILES = LICENCE
 FAUX_INSTALL_STAGING = YES
 FAUX_AUTORECONF = YES
 
diff --git a/package/klinfix/klinfix.hash b/package/klinfix/klinfix.hash
new file mode 100644
index 000000000..8de984b0b
--- /dev/null
+++ b/package/klinfix/klinfix.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b  LICENSE
diff --git a/package/klinfix/klinfix.mk b/package/klinfix/klinfix.mk
index d2f885393..7f445be6d 100644
--- a/package/klinfix/klinfix.mk
+++ b/package/klinfix/klinfix.mk
@@ -6,6 +6,7 @@
 
 KLINFIX_VERSION = 1.0
 KLINFIX_LICENSE = BSD-3-Clause
+KLINFIX_LICENSE_FILES = LICENSE
 KLINFIX_SITE_METHOD = local
 KLINFIX_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/klinfix
 KLINFIX_DEPENDENCIES = klish-plugin-sysrepo
diff --git a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk
index 3f695c232..c8882bc08 100644
--- a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk
+++ b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk
@@ -8,7 +8,7 @@ KLISH_PLUGIN_SYSREPO_VERSION = cdd3eb51a7f7ee0ed5bd925fa636061d3b1b85fb
 KLISH_PLUGIN_SYSREPO_SITE = https://src.libcode.org/pkun/klish-plugin-sysrepo.git
 KLISH_PLUGIN_SYSREPO_SITE_METHOD = git
 KLISH_PLUGIN_SYSREPO_LICENSE = BSD-3
-KLISH_PLUGIN_SYSREPO_LICENSE_FILES = LICENSE
+KLISH_PLUGIN_SYSREPO_LICENSE_FILES = LICENCE
 KLISH_PLUGIN_SYSREPO_DEPENDENCIES = klish sysrepo
 KLISH_PLUGIN_SYSREPO_INSTALL_STAGING = YES
 KLISH_PLUGIN_SYSREPO_AUTORECONF = YES
diff --git a/package/klish/klish.mk b/package/klish/klish.mk
index 99e2d6a29..517565b5a 100644
--- a/package/klish/klish.mk
+++ b/package/klish/klish.mk
@@ -8,7 +8,7 @@ KLISH_VERSION = tags/3.0.0
 KLISH_SITE = https://src.libcode.org/pkun/klish.git
 KLISH_SITE_METHOD = git
 KLISH_LICENSE = BSD-3
-KLISH_LICENSE_FILES = LICENSE
+KLISH_LICENSE_FILES = LICENCE
 KLISH_DEPENDENCIES = libxml2
 KLISH_INSTALL_STAGING = YES
 KLISH_AUTORECONF = YES
diff --git a/package/net/net.mk b/package/net/net.mk
index 35f19549c..d8bf2bdc1 100644
--- a/package/net/net.mk
+++ b/package/net/net.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 NET_VERSION = 1.0
-NET_LICENSE = ISC
+NET_LICENSE = MIT
+NET_LICENSE_FILES = LICENSE
 NET_SITE_METHOD = local
 NET_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/net
 NET_DEPENDENCIES = libite
diff --git a/package/querierd/querierd.mk b/package/querierd/querierd.mk
index 5cf226ff6..61b6b22e8 100644
--- a/package/querierd/querierd.mk
+++ b/package/querierd/querierd.mk
@@ -12,16 +12,14 @@ QUERIERD_LICENSE_FILES = LICENSE
 QUERIERD_INSTALL_STAGING = YES
 
 define QUERIERD_INSTALL_CONFIG
-	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_INFIX_PATH)/package/querierd/querierd.conf \
+	$(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.conf \
 		$(TARGET_DIR)/etc/
 endef
 QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_CONFIG
 
 define QUERIERD_INSTALL_FINIT_SVC
-	$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_INFIX_PATH)/package/querierd/querierd.svc \
+	$(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.svc \
 		$(FINIT_D)/available/querierd.conf
-	$(INSTALL) -d -m 0755 $(FINIT_D)/enabled
-	ln -sf ../available/querierd.conf $(FINIT_D)/enabled/querierd.conf
 endef
 
 QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_FINIT_SVC
diff --git a/package/skeleton-init-finit/skeleton-init-finit.mk b/package/skeleton-init-finit/skeleton-init-finit.mk
index f1229ca87..2640cf89d 100644
--- a/package/skeleton-init-finit/skeleton-init-finit.mk
+++ b/package/skeleton-init-finit/skeleton-init-finit.mk
@@ -208,7 +208,6 @@ endif # BR2_PACKAGE_QUAGGA
 ifeq ($(BR2_PACKAGE_SMCROUTE),y)
 define SKELETON_INIT_FINIT_SET_SMCROUTE
 	cp $(SKELETON_INIT_FINIT_AVAILABLE)/smcroute.conf $(FINIT_D)/available/
-	ln -sf ../available/smcroute.conf $(FINIT_D)/enabled/smcroute.conf
 endef
 SKELETON_INIT_FINIT_POST_INSTALL_TARGET_HOOKS += SKELETON_INIT_FINIT_SET_SMCROUTE
 endif
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf
index b06aaf769..792262b21 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/smcroute.conf
@@ -1 +1,2 @@
-service [2345] smcrouted -ns -- Static multicast routing daemon
+service [2345789] env:-/etc/default/smcrouted \
+	smcrouted -ns $SMCROUTE_OPTS $SMCROUTE_ARGS -- Static multicast routing daemon