diff --git a/nginx/map.jinja b/nginx/map.jinja
index 1fe81c8..ef3e27a 100644
--- a/nginx/map.jinja
+++ b/nginx/map.jinja
@@ -72,7 +72,8 @@
             'server_use_symlink': False,
             'pid_file': '/run/nginx.pid',
             'gpg_check': True,
-            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/openSUSE_{{ grains.osrelease }}/repodata/repomd.xml.key',
+            'gpg_key': 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/repodata/repomd.xml.key',
+            'gpg_autoimport': True,
             'openssl_package': 'openssl',
         },
         'Arch': {
diff --git a/nginx/pkg.sls b/nginx/pkg.sls
index b2742f6..ce40a3f 100644
--- a/nginx/pkg.sls
+++ b/nginx/pkg.sls
@@ -143,11 +143,12 @@ nginx_zypp_repo:
     {%- endif %}
     - name: server_http
     - humanname: server_http
-    - baseurl: 'http://download.opensuse.org/repositories/server:/http/openSUSE_13.2/'
+    - baseurl: 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/'
     - enabled: True
     - autorefresh: True
     - gpgcheck: {{ nginx.lookup.gpg_check }}
     - gpgkey: {{ nginx.lookup.gpg_key }}
+    - gpgautoimport: {{ nginx.lookup.gpg_autoimport }}
     - require_in:
       - pkg: nginx_install
     - watch_in: