diff --git a/old/mariadb_repo_setup b/new/mariadb_repo_setup
index acba4d2..668e0f1 100644
--- a/old/mariadb_repo_setup
+++ b/new/mariadb_repo_setup
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 # shellcheck disable=2016 disable=1091 disable=2059
 
-version="2022-02-08"
+version="2022-06-12"
 
 # Notes:
+#   2022-06-12 - add Ubuntu 22.04 "jammy"
 #   2022-02-08 - Adjust repo pinning for Ubuntu/Debian, update MariaDB to 10.7
 #   2022-01-31 - Verify that server version is valid
 #   2022-01-18 - Add aarch64 RHEL/SLES repositories
@@ -53,7 +54,7 @@ version="2022-02-08"
 
 supported="# The MariaDB Repository only supports these distributions:
 #    * RHEL/CentOS 7 & 8 (rhel)
-#    * Ubuntu 18.04 LTS (bionic), & 20.04 LTS (focal)
+#    * Ubuntu 18.04 LTS (bionic), 20.04 LTS (focal), and 22.04 LTS (jammy)
 #    * Debian 9 (stretch), 10 (buster), & 11 (bullseye)
 #    * SLES 12 & 15 (sles)"
 
@@ -398,15 +399,17 @@ identify_os(){
                     xenial ) error 'Ubuntu version 16.04 LTS has reached End of Life and is no longer supported.' ;;
                     bionic ) extra_options=" lang=none target-=CNF" ;;
                     focal ) ;;
+                    jammy ) ;;
                     *) error "Detected Ubuntu but version ($os_version) is not supported." "Only Ubuntu LTS releases are supported."  "$otherplatforms" ;;
                 esac
                 if [[ $arch == aarch64 ]]
                 then
                     case $os_version in
-                        xenial ) ;;
+			xenial ) error 'Ubuntu version 16.04 LTS has reached End of Life and is no longer supported.' ;;
                         bionic ) extra_options=" lang=none target-=CNF" ;;
                         focal ) ;;
-                        *) error "Only Ubuntu 16/xenial, 18/bionic, and 20/focal are supported for ARM64. Detected version: '$os_version'" ;;
+			jammy ) ;;
+                        *) error "Only 18/bionic, 20/focal and 22/focal are supported for ARM64. Detected version: '$os_version'" ;;
                     esac
                 fi
                 ;;
@@ -583,7 +586,7 @@ then
           error "--os-version='$os_version' is only valid if --os-type='sles', you gave '$os_type'" "$supported"
         fi
         ;;
-      xenial|bionic|focal)
+      bionic|focal|jammy)
         if [ $os_type != 'ubuntu' ] ; then
           error "--os-version='$os_version' is only valid if --os-type='ubuntu', you gave '$os_type'" "$supported"
         fi