diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
index 79d3863..3fcb723 100644
--- a/salt/osfamilymap.yaml
+++ b/salt/osfamilymap.yaml
@@ -5,7 +5,7 @@
 # {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
 # yamllint disable rule:line-length
 # {%- set osrelease = salt['grains.get']('osrelease', '') %}
-# {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
+# {%- set opensuse_repo = osrelease if salt['grains.get']('osfinger', '').startswith('Leap-') else 'openSUSE_Tumbleweed' %}
 # {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
 # {%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
 # yamllint enable rule:line-length
@@ -57,11 +57,11 @@ RedHat:
 
 Suse:
   pkgrepo_humanname:
-    'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
+    'Salt releases for SLE-based SUSE products ({{ opensuse_repo }})'
   pkgrepo: "https://download.opensuse.org/repositories/systemsmanagement:\
-              /saltstack/openSUSE_{{ opensuse_repo_suffix }}/"
+              /saltstack/{{ opensuse_repo }}/"
   key_url: "https://download.opensuse.org/repositories/systemsmanagement:\
-              /saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key"
+              /saltstack/{{ opensuse_repo }}/repodata/repomd.xml.key"
   pygit2: python3-pygit2
   pyinotify: python-pyinotify
   gitfs:
diff --git a/test/integration/default/files/_mapdata/opensuse-16.yaml b/test/integration/default/files/_mapdata/opensuse-16.yaml
index 3ef5de9..5f128b0 100644
--- a/test/integration/default/files/_mapdata/opensuse-16.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-16.yaml
@@ -41,7 +41,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.6/repodata/repomd.xml.key
+    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/16.0/repodata/repomd.xml.key
     master:
       ext_pillar:
       - cmd_yaml: cat /etc/salt/yaml
@@ -86,8 +86,8 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.6/
-    pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.6)
+    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/16.0/
+    pkgrepo_humanname: Salt releases for SLE-based SUSE products (16.0)
     py_ver: py3
     pygit2: python3-pygit2
     pyinotify: python-pyinotify