diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0e245ad..df36350 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4323,3 +4323,49 @@ jobs:
         if: always()
         run: |
           bundle exec kitchen destroy latest-ubuntu-2110
+
+
+  py3-git-master-ubuntu-2204:
+    name: Ubuntu 22.04 Master Py3 Git
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    needs: lint
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+
+      - name: Install Bundler
+        run: |
+          gem install bundler
+
+      - name: Setup Bundle
+        run: |
+          bundle install --with docker --without opennebula ec2 windows vagrant
+
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+
+      - name: Install Python Dependencies
+        run: |
+          pip install -U pip
+          pip install -r tests/requirements.txt
+
+      - name: Create Test Container
+        run: |
+          bundle exec kitchen create py3-git-master-ubuntu-2204 || bundle exec kitchen create py3-git-master-ubuntu-2204
+
+      - name: Test Bootstrap In Test Container
+        run: |
+          bundle exec kitchen verify py3-git-master-ubuntu-2204
+
+      - name: Destroy Test Container
+        if: always()
+        run: |
+          bundle exec kitchen destroy py3-git-master-ubuntu-2204
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index ee1ad4a..ebfe2b1 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -28,6 +28,7 @@ LINUX_DISTROS = [
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 OSX = WINDOWS = []
 
@@ -53,6 +54,7 @@ STABLE_DISTROS = [
     "ubuntu-1804",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3002 = [
@@ -68,6 +70,7 @@ BLACKLIST_3002 = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "rockylinux-8",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_GIT_3002 = [
@@ -87,6 +90,7 @@ BLACKLIST_GIT_3002 = [
     "rockylinux-8",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3003 = [
@@ -101,6 +105,7 @@ BLACKLIST_3003 = [
     "opensuse-tumbleweed",
     "rockylinux-8",
     "ubuntu-1604",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_GIT_3003 = [
@@ -119,6 +124,7 @@ BLACKLIST_GIT_3003 = [
     "ubuntu-1604",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_3004 = [
@@ -131,6 +137,7 @@ BLACKLIST_3004 = [
     "opensuse-15",
     "opensuse-tumbleweed",
     "ubuntu-1604",
+    "ubuntu-2204",
 ]
 
 BLACKLIST_GIT_3004 = [
@@ -148,6 +155,7 @@ BLACKLIST_GIT_3004 = [
     "ubuntu-1604",
     "ubuntu-2004",
     "ubuntu-2110",
+    "ubuntu-2204",
 ]
 
 SALT_BRANCHES = [
@@ -195,6 +203,7 @@ DISTRO_DISPLAY_NAMES = {
     "ubuntu-1804": "Ubuntu 18.04",
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2110": "Ubuntu 21.10",
+    "ubuntu-2204": "Ubuntu 22.04",
 }
 
 TIMEOUT_DEFAULT = 20
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bd5336..2cdb73a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
 
   - repo: https://github.com/psf/black
-    rev: 19.10b0
+    rev: 22.3.0
     hooks:
       - id: black
 
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 934ad08..189b8b9 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1466,6 +1466,9 @@ __ubuntu_codename_translation() {
         "21")
             DISTRO_CODENAME="hirsute"
             ;;
+        "22")
+            DISTRO_CODENAME="jammy"
+            ;;
         *)
             DISTRO_CODENAME="trusty"
             ;;
diff --git a/kitchen.yml b/kitchen.yml
index 515b868..79035ab 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -100,6 +100,11 @@ platforms:
   - name: oraclelinux-8
   - name: oraclelinux-7
   - name: rockylinux-8
+  - name: ubuntu-22.04
+    driver:
+      run_command: /lib/systemd/systemd
+      provision_command:
+        - echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
   - name: ubuntu-21.10
     driver:
       run_command: /lib/systemd/systemd