diff --git a/pillar.example b/pillar.example
index 37825018..a7c4acff 100644
--- a/pillar.example
+++ b/pillar.example
@@ -84,6 +84,7 @@ ssf:
       - backupninja
       - bareos
       - bind
+      - caddy
       - cert
       - charles
       - chrony
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index 5359252d..1d283058 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -64,8 +64,8 @@ ssf_node_anchors:
             upstream: 'upstream'
           commit:
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/444'
+            title: "chore: standardise '`'semantic-release'`' implementation"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/445'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -1009,6 +1009,7 @@ ssf:
     backupninja: *formula_default
     bareos: *formula_default
     bind: *formula_default
+    caddy: *formula_default
     cert: *formula_default
     charles: *formula_default
     chrony: *formula_default
diff --git a/ssf/files/default/docs/CONTRIBUTING.rst b/ssf/files/default/docs/CONTRIBUTING.rst
index 408be31d..6252e1a2 100644
--- a/ssf/files/default/docs/CONTRIBUTING.rst
+++ b/ssf/files/default/docs/CONTRIBUTING.rst
@@ -182,6 +182,7 @@ These formulas are already compatible with semantic-release *and* have global ``
 #. `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
 #. `apt-formula <https://github.com/saltstack-formulas/apt-formula>`_
 #. `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
+#. `caddy-formula <https://github.com/saltstack-formulas/caddy-formula>`_
 #. `deepsea-formula <https://github.com/saltstack-formulas/deepsea-formula>`_
 #. `devstack-formula <https://github.com/saltstack-formulas/devstack-formula>`_
 #. `dhcpd-formula <https://github.com/saltstack-formulas/dhcpd-formula>`_
@@ -236,7 +237,7 @@ These formulas are already compatible with semantic-release *and* have global ``
 
 These formulas are also compatible with semantic-release:
 
-55. `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
+56. `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
 #. `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
 #. `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_
 #. `collectd-formula <https://github.com/saltstack-formulas/collectd-formula>`_
diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
index 80b22cde..8231e80d 100644
--- a/ssf/formulas.yaml
+++ b/ssf/formulas.yaml
@@ -694,6 +694,48 @@ ssf:
             line-length:
               ignore: *ignore_pillar_example_and_with_views_example
       semrel_files: *semrel_files_default
+    caddy:
+      context:
+        codeowners:
+          entries:
+            global:
+              - '*': '@javierbertoli'
+        git:
+          github:
+            repo: 'caddy-formula'
+        kitchen:
+          provisioner:
+            pillars_from_directories:
+              - test/salt/pillar
+            top_sls:
+              - '*':
+                  - default
+        inspec_suites_kitchen:
+          0:
+            inspec_yml:
+              summary: >-
+                Verify that the caddy formula is setup and configured correctly
+        map_jinja:
+          verification:
+            import: ['mapdata']
+          version: 5
+        platforms_matrix:
+          # [os           ,  os_ver, salt_ver, py_ver,    inspec_suite]
+          - [debian       ,    0   ,   master,      0,         default]
+          - [ubuntu       ,    0   ,   master,      0,         default]
+          # # - [centos       ,    0   ,   master,      0,         default]
+          # # - [fedora       ,    0   ,   master,      0,         default]
+          # # - [opensuse/leap,    0   ,   master,      0,         default]
+          # # - [opensuse/tmbl,    0   ,   master,      0,         default]
+          # # - [amazonlinux  ,    0   ,   master,      0,         default]
+          # # - [oraclelinux  ,    0   ,   master,      0,         default]
+          # # - [arch-base    ,    0   ,   master,      0,         default]
+          # # - [gentoo/stage3,    0   ,   master,      0,         default]
+          # # - [almalinux    ,    0   ,   master,      0,         default]
+          # # - [rockylinux   ,    0   ,   master,      0,         default]
+        use_libsaltcli: true
+        use_tofs: true
+      semrel_files: *semrel_files_inc_map_jinja_verifier
     cert:
       context:
         git: