diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index f566f82b..ddee2e54 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'ci(travis): apply changes from build config validation [skip ci]'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/98'
+            title: 'ci(travis): opt-in to `dpl v2` to complete build config validation [skip ci]'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/99'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'
diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml
index 97ce8fd4..0b9fa9e1 100644
--- a/ssf/files/default/.travis.yml
+++ b/ssf/files/default/.travis.yml
@@ -199,8 +199,9 @@ jobs:
                    @semantic-release/git@7
       deploy:
         provider: 'script'
-        # Using deprecated `skip_cleanup` until `cleanup: false` works reliably
-        # cleanup: false
-        skip_cleanup: true
+        # Opt-in to `dpl v2` to complete the Travis build config validation (beta)
+        # * https://docs.travis-ci.com/user/build-config-validation
+        # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
+        edge: true
         # Run `semantic-release`
         script: 'npx semantic-release@15'