diff --git a/.yamllint b/.yamllint
index a633b83..1b8096b 100644
--- a/.yamllint
+++ b/.yamllint
@@ -14,6 +14,7 @@ ignore: |
   test/**/states/**/*.sls
   .kitchen/
   prometheus/osfamilymap.yaml
+  test/salt/pillar/repo.sls
 
 yaml-files:
   # Default settings
diff --git a/test/salt/pillar/repo.sls b/test/salt/pillar/repo.sls
index 57067b3..4bd9f60 100644
--- a/test/salt/pillar/repo.sls
+++ b/test/salt/pillar/repo.sls
@@ -49,10 +49,12 @@ prometheus:
             smtp_from: 'alertmanager@example.org'
             smtp_auth_username: 'alertmanager'
             smtp_auth_password: "multiline\nmysecret"
-            smtp_hello: "host.example.org"
             slack_api_url: "http://mysecret.example.com/"
+            {%- if grains.get('oscodename', '') not in ['stretch', 'bionic'] %}
+            smtp_hello: "host.example.org"
             http_config:
               proxy_url: 'http://127.0.0.1:1025'
+            {%- endif %}
           route:
             group_by: ['alertname', 'cluster', 'service']
             group_wait: 30s