diff --git a/buildcore.sh b/buildcore.sh
index a07099f23..2e8f3b822 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -359,7 +359,7 @@ if [ "$OSNAME" != "AIX" ]; then
 		echo '%_signature gpg' >> $MACROS
 	fi
 	if ! $GREP '%_gpg_name' $MACROS 2>/dev/null; then
-		echo '%_gpg_name Jarrod Johnson' >> $MACROS
+		echo '%_gpg_name xCAT Security Key' >> $MACROS
 	fi
 	echo "Signing RPMs..."
 	build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
diff --git a/builddep.sh b/builddep.sh
index 62c13467d..ab8839896 100755
--- a/builddep.sh
+++ b/builddep.sh
@@ -92,7 +92,7 @@ if [ "$OSNAME" != "AIX" ]; then
 		echo '%_signature gpg' >> $MACROS
 	fi
 	if ! $GREP -q '%_gpg_name' $MACROS 2>/dev/null; then
-		echo '%_gpg_name Jarrod Johnson' >> $MACROS
+		echo '%_gpg_name xCAT Security Key' >> $MACROS
 	fi
 
 	# Sign the rpms that are not already signed.  The "standard input reopened" warnings are normal.
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index d90cfa90b..2d30235e4 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -382,15 +382,11 @@ unless ($onlyinitrd) {
         # The section below is used to install kernel base and extra#
         #############################################################
         if ($kernelimage) {
-            my $kernelextraimage = undef;
             if ($kernelver) {
-                $kernelimage = "linux-image-".$kernelver;
-                $kernelextraimage = "linux-image-extra-".$kernelver;
+                $kernelimage = "linux-image-$kernelver linux-image-extra-$kernelver linux-firmware";
             }
             my $aptgetcmd_install = $aptgetcmd . "&&". $aptgetcmdby. " install --no-install-recommends ".$kernelimage;
             $rc = system("$aptgetcmd_install");
-            $aptgetcmd_install = $aptgetcmd . "&&". $aptgetcmdby. " install --no-install-recommends ". $kernelextraimage;
-            $rc = system("$aptgetcmd_install");
         }
 
     }