diff --git a/.github/workflows/build-bionic.yml b/.github/workflows/build-bionic.yml
index 4e557662..592f98c1 100644
--- a/.github/workflows/build-bionic.yml
+++ b/.github/workflows/build-bionic.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest 
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/build-focal.yml b/.github/workflows/build-focal.yml
index 6de719be..ea3a38e7 100644
--- a/.github/workflows/build-focal.yml
+++ b/.github/workflows/build-focal.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/build-jammy.yml b/.github/workflows/build-jammy.yml
index 12467880..d451b2d0 100644
--- a/.github/workflows/build-jammy.yml
+++ b/.github/workflows/build-jammy.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.gitignore b/.gitignore
index f0d19b18..f13c26b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 scripts/chroot
 scripts/image
+scripts/certificates
 *.iso
diff --git a/README.md b/README.md
index 152842e0..30c421a7 100644
--- a/README.md
+++ b/README.md
@@ -631,9 +631,14 @@ remove packages specified in `filesystem.manifest` that are *not* listed in `fil
 2. Create [SBAT](https://github.com/rhboot/shim/blob/main/SBAT.md) file
 
    ```shell
+   GRUB_VERSION=`grub-mkstandalone -V | tr -s ' ' | cut -d' ' -f3 | cut -d'-' -f1`
+   GRUB_RELEASE=`grub-mkstandalone -V | tr -s ' ' | cut -d' ' -f3`
+    
+   # create SBAT file
    cat <<EOF > isolinux/sbat.csv
    sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-   grub,1,Free Software Foundation,grub,2.04,https://www.gnu.org/software/grub/
+   grub,1,Free Software Foundation,grub,$GRUB_VERSION,https://www.gnu.org/software/grub/
+   grub.ubuntu,1,Ubuntu,grub2,$GRUB_RELEASE,https://www.ubuntu.com/
    EOF
    ```
 
diff --git a/scripts/chroot_build.sh b/scripts/chroot_build.sh
index 6789f84d..7104a9a5 100755
--- a/scripts/chroot_build.sh
+++ b/scripts/chroot_build.sh
@@ -349,10 +349,15 @@ EOF
 
     popd # return to image directory
 
+    # grub version/release
+    GRUB_VERSION=`grub-mkstandalone -V | tr -s ' ' | cut -d' ' -f3 | cut -d'-' -f1`
+    GRUB_RELEASE=`grub-mkstandalone -V | tr -s ' ' | cut -d' ' -f3`
+    
     # create SBAT file
     cat <<EOF > isolinux/sbat.csv
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,1,Free Software Foundation,grub,2.04,https://www.gnu.org/software/grub/
+grub,1,Free Software Foundation,grub,$GRUB_VERSION,https://www.gnu.org/software/grub/
+grub.ubuntu,1,Ubuntu,grub2,$GRUB_RELEASE,https://www.ubuntu.com/
 EOF
 
     # create a grub UEFI image