diff --git a/kas/base.yml b/kas/base.yml
index e5cdedb..136bd63 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -8,7 +8,6 @@ target: nao-image
 local_conf_header:
   meta-nao: |
     CONF_VERSION = "2"
-    PACKAGE_CLASSES ?= "package_ipk"
     EXTRA_IMAGE_FEATURES += "allow-empty-password"
     CLANGSDK = "1"
 
diff --git a/meta-hulks/conf/distro/HULKs-OS.conf b/meta-hulks/conf/distro/HULKs-OS.conf
index 866f386..b6fac0a 100644
--- a/meta-hulks/conf/distro/HULKs-OS.conf
+++ b/meta-hulks/conf/distro/HULKs-OS.conf
@@ -1,6 +1,6 @@
 require conf/distro/nao-core-minimal.conf
 
-SUMMARY = "HULKs flavoured Poky"
+SUMMARY = "HULKs flavoured Nao"
 
 DISTRO = "HULKs-OS"
 DISTRO_NAME = "HULKs-OS"
diff --git a/meta/conf/distro/nao-core-minimal.conf b/meta/conf/distro/nao-core-minimal.conf
index be60e9e..86b8701 100644
--- a/meta/conf/distro/nao-core-minimal.conf
+++ b/meta/conf/distro/nao-core-minimal.conf
@@ -1,31 +1,34 @@
-require conf/distro/poky.conf
-
 SUMMARY = "A small image just capable of allowing a device to boot."
 
 DISTRO = "nao-core-minimal"
 DISTRO_NAME = "nao-core-minimal"
-DISTRO_VERSION = "2.0"
-SDK_NAME = "${DISTRO}-${SDKMACHINE}"
+DISTRO_VERSION = "3.0"
 TARGET_VENDOR = "-aldebaran"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}${IMAGE_VERSION_SUFFIX}"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}"
+SDK_NAME = "${DISTRO}-${SDKMACHINE}"
 SDK_VENDOR = "-naosdk"
 SDK_ARCHIVE_TYPE = "tar.zst"
 MAINTAINER = "Team HULKs <hulks@tuhh.de>"
 
-hostname:pn-base-files = "nao"
+# TODO: maybe: ipv6
+DISTRO_FEATURES ?= "alsa ext2 ipv4 usbgadget usbhost wifi xattr pci vfat pam polkit pulseaudio ldconfig"
+
+DISTRO_EXTRA_RDEPENDS += "packagegroup-core-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-intel-rt"
+
 PREFERRED_PROVIDER_cgos-mod = "linux-intel-rt"
+KERNEL_MODULE_AUTOLOAD:append = " cgosdrv"
 
-IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}${IMAGE_VERSION_SUFFIX}"
-IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${DISTRO}-${DISTRO_VERSION}"
+PACKAGE_CLASSES ?= "package_ipk"
 
-DISTRO_FEATURES:remove = "x11 wayland 3g nfs nfc opengl vulkan bluetooth pcmcia"
+require conf/distro/include/no-static-libs.inc
+require conf/distro/include/yocto-space-optimize.inc
 
-DISTRO_FEATURES:append = " pam polkit"
+BB_SIGNATURE_HANDLER ?= "OEEquivHash"
+BB_HASHSERVE ??= "auto"
 
-KERNEL_MODULE_AUTOLOAD:append = " cgosdrv"
+INIT_MANAGER = "systemd"
 
-DISTRO_FEATURES:append = " systemd usrmerge"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-VIRTUAL-RUNTIME_initscripts = ""
+hostname:pn-base-files = "nao"