diff --git a/meta-cassini-distro/classes/cassini-distro-features.bbclass b/meta-cassini-distro/classes/cassini-distro-features.bbclass
index 89f1e12cc1a15388f65c53c850a58a05c1864988..392aab9020f1573451ef7c974c74c64cfbba6a07 100644
--- a/meta-cassini-distro/classes/cassini-distro-features.bbclass
+++ b/meta-cassini-distro/classes/cassini-distro-features.bbclass
@@ -1,4 +1,5 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited and/or its affiliates.
+# <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: MIT
 
@@ -7,7 +8,7 @@
 
 # Require inc file for development DISTRO_FEATURE
 require ${@bb.utils.contains(\
-'DISTRO_FEATURES','cassini-devel','conf/distro/include/cassini-devel.inc', '', d)}
+'DISTRO_FEATURES','cassini-dev','conf/distro/include/cassini-dev.inc', '', d)}
 
 # Require inc file for testing DISTRO_FEATURE
 require ${@bb.utils.contains(\
diff --git a/meta-cassini-distro/conf/distro/include/cassini-dev.inc b/meta-cassini-distro/conf/distro/include/cassini-dev.inc
new file mode 100644
index 0000000000000000000000000000000000000000..4902cfcb3d13f54f5f1e3345b6d1e76056a650aa
--- /dev/null
+++ b/meta-cassini-distro/conf/distro/include/cassini-dev.inc
@@ -0,0 +1,6 @@
+# Copyright (c) 2023 Arm Limited and/or its affiliates.
+# <open-source-office@arm.com>
+#
+# SPDX-License-Identifier: MIT
+
+IMAGE_FEATURES:append = " debug-tweaks"
diff --git a/meta-cassini-distro/conf/distro/include/cassini-devel.inc b/meta-cassini-distro/conf/distro/include/cassini-devel.inc
deleted file mode 100644
index 0abfd2d2bb486da8b0caf0c54dc9764f06a17433..0000000000000000000000000000000000000000
--- a/meta-cassini-distro/conf/distro/include/cassini-devel.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
-#
-# SPDX-License-Identifier: MIT
-
-# config specifc to the cassini-devel distro feature, enabled using
-# DISTRO_FEATURES
-
-EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
diff --git a/meta-cassini-distro/conf/distro/include/cassini-sdk.inc b/meta-cassini-distro/conf/distro/include/cassini-sdk.inc
index f47db56f4cbd27de89f6f9a665d423bb4129aed5..5fd666f1032d96ae296dfbc1942b6ff139e44ff7 100644
--- a/meta-cassini-distro/conf/distro/include/cassini-sdk.inc
+++ b/meta-cassini-distro/conf/distro/include/cassini-sdk.inc
@@ -3,16 +3,17 @@
 #
 # SPDX-License-Identifier: MIT
 
-# Config specifc to the cassini-sdk distro feature, enabled using
+# Config specific to the cassini-sdk distro feature, enabled using
 # DISTRO_FEATURES
 
+include cassini-dev.inc
+
 IMAGE_FEATURES:append:libc-glibc = " \
  package-management \
  dev-pkgs \
  tools-sdk \
  tools-debug \
  tools-profile \
- debug-tweaks \
  ssh-server-openssh"
 
 IMAGE_INSTALL:append:libc-glibc = " kernel-base kernel-devsrc kernel-modules"
diff --git a/meta-cassini-distro/conf/distro/include/cassini-test.inc b/meta-cassini-distro/conf/distro/include/cassini-test.inc
index 801c3062d6c76782ac28308d84f165101caf0ad3..98e2fcb022defbd9a5972abbd570502213510089 100644
--- a/meta-cassini-distro/conf/distro/include/cassini-test.inc
+++ b/meta-cassini-distro/conf/distro/include/cassini-test.inc
@@ -3,12 +3,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-# Config specifc to the cassini-test distro feature, enabled using
+# Config specific to the cassini-test distro feature, enabled using
 # DISTRO_FEATURES
 
-DISTRO_FEATURES:append:libc-glibc = " ptest"
+include cassini-dev.inc
 
-EXTRA_IMAGE_FEATURES:append:libc-glibc = " debug-tweaks"
+DISTRO_FEATURES:append:libc-glibc = " ptest"
 
 IMAGE_INSTALL:append:libc-glibc = " jfrog-cli \
                                 packagegroup-ts-tests-psa \