diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index ea8eac4d..c2c45b99 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: "ci(kitchen+gitlab): update for new pre-salted images [skip ci]"
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/410'
+            title: "fix(libsaltcli+libmatchers): ensure Salt client API detection [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/411'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
diff --git a/ssf/files/default/formula/libmatchers.jinja b/ssf/files/default/formula/libmatchers.jinja
index 5b20a56f..b2f2c498 100644
--- a/ssf/files/default/formula/libmatchers.jinja
+++ b/ssf/files/default/formula/libmatchers.jinja
@@ -177,7 +177,7 @@
 {%-     endif %}
 
 {#-     Add `merge:` option to `salt["config.get"]` if configured #}
-{%-     if cli in ["minion", "local"] and parsed.query_method == "config.get" and config_get_strategy %}
+{%-     if cli not in ["ssh", "unknown"] and parsed.query_method == "config.get" and config_get_strategy %}
 {%-       set query_opts = {
             "merge": config_get_strategy,
             "delimiter": parsed.query_delimiter,
@@ -190,8 +190,8 @@
             ~ "'"
           ) %}
 {%-     else %}
-{%-       if cli not in ["minion", "local"] %}
-{%-         do salt["log.error"](
+{%-       if cli in ["ssh", "unknown"] %}
+{%-         do salt["log.warning"](
               log_prefix
               ~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
               ~ cli
diff --git a/ssf/files/default/formula/libsaltcli.jinja b/ssf/files/default/formula/libsaltcli.jinja
index 5c3593ef..c6a5b25c 100644
--- a/ssf/files/default/formula/libsaltcli.jinja
+++ b/ssf/files/default/formula/libsaltcli.jinja
@@ -10,6 +10,8 @@
 {%-   set cli = 'minion' %}
 {%- elif opts_cli == 'salt-call' %}
 {%-   set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %}
+{%- elif opts_cli %}
+{%-   set cli = 'api' %}
 {%- else %}
 {%-   set cli = 'unknown' %}
 {%- endif %}