diff --git a/conf/distro/seconorth-wayland-no-gplv3.conf b/conf/distro/seconorth-wayland-no-gplv3.conf
index 9cbc256e953bb4284c622e940f4ce38da7bd699e..af6a852a48620738f6a434f9d5b366e9b3e8d321 100644
--- a/conf/distro/seconorth-wayland-no-gplv3.conf
+++ b/conf/distro/seconorth-wayland-no-gplv3.conf
@@ -8,7 +8,7 @@ require conf/distro/seconorth-wayland.conf
 DISTROOVERRIDES:append = ":nogplv3"
 # Remove support for GPLv3
 DISTRO_FEATURES:remove = "gplv3 acl seccomp ptest package-management"
-IMAGE_FEATURES:remove = "package-management"
+IMAGE_FEATURES:remove = "package-management tools-debug"
 
 # Remove all GPLv3 related licenses
 INCOMPATIBLE_LICENSE = " \
@@ -33,13 +33,12 @@ INCOMPATIBLE_LICENSE = " \
 INCOMPATIBLE_LICENSE_EXCEPTIONS = " \
     bash:GPL-3.0-or-later \
     m4:GPL-3.0-only \
-    \
     "
 
 PACKAGE_EXCLUDE += " \
     bash \
     m4 \
-"
+    "
 
 # Adapt for Kirkstone to INCOMPATIBLE_LICENSE_EXCEPTIONS ?
 # WHITELIST_LGPL-3.0 = " \