diff --git a/components/users.xml b/components/users.xml
index 39e8188..3a58e6a 100644
--- a/components/users.xml
+++ b/components/users.xml
@@ -2,4 +2,8 @@
   <users profiles="Cloud-Azure-Base,Cloud-Azure-LVM,Cloud-EC2-Base,Cloud-EC2-LVM,Cloud-GenericCloud-Base,Cloud-GenericCloud-LVM,Cloud-OCP-Base,Live-Base">
     <user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
   </users>
+  <!-- Only for SBC -->
+  <users profiles="Core-Pi">
+    <user password="$6$ggstAnji$tPNhSHa/OG4UrJ0P77ZHlCunu.pueMXtXgAER51mTJ7bpXl/onDplJXd0usMSlFP4gOn/A7BM7cGoVw/WcCKS." home="/home/rocky" name="rocky" groups="rocky,wheel"/>
+  </users>
 </image>
diff --git a/sbc/pi.xml b/sbc/pi.xml
index 2ebf2fb..e63173b 100644
--- a/sbc/pi.xml
+++ b/sbc/pi.xml
@@ -7,9 +7,6 @@
       <requires profile="Core-Pi"/>
     </profile>
   </profiles>
-  <users>
-    <user password="$6$ggstAnji$tPNhSHa/OG4UrJ0P77ZHlCunu.pueMXtXgAER51mTJ7bpXl/onDplJXd0usMSlFP4gOn/A7BM7cGoVw/WcCKS." home="/home/rocky" name="rocky" groups="rocky,wheel"/>
-  </users>
   <!-- RPI -->
   <preferences profiles="SBC-RaspberryPi" arch="aarch64">
     <type image="oem" format="raw"
@@ -29,6 +26,8 @@
   </preferences>
   <packages type="image" patternType="plusRecommended" profiles="Core-Pi">
     <namedCollection name="core"/>
+    <ignore name="kernel"/>
+    <ignore name="kernel-core"/>
     <package name="rocky-release"/>
     <package name="rocky-release-altarch"/>
     <package name="bash-completion"/>