diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index ace6dab..50ec3fe 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -121,9 +121,6 @@
   {%- if repo.key_server is defined %}
   - keyserver: {{ repo.key_server }}
   {%- endif %}
-  {%- if repo.key_url is defined %}
-  - key_url: {{ repo.key_url }}
-  {%- endif %}
   - consolidate: {{ repo.get('consolidate', False) }}
   - clean_file: {{ repo.get('clean_file', False) }}
   - refresh_db: {{ repo.get('refresh_db', True) }}
@@ -140,6 +137,24 @@
   {%- endif %}
   {%- endif %}
 
+{%- if repo.get('key') %}
+
+linux_repo_{{ name }}_key:
+  cmd.run:
+    - name: "echo '{{ repo.key }}' | apt-key add -"
+    - onchange:
+      - pkgrepo: linux_repo_{{ name }}
+
+{%- elif repo.key_url|default(False) %}
+
+linux_repo_{{ name }}_key:
+  cmd.run:
+    - name: "curl -s {{ repo.key_url }} | apt-key add -"
+    - onchange:
+      - pkgrepo: linux_repo_{{ name }}
+
+{%- endif %}
+
 {%- else %}
 
 linux_repo_{{ name }}_absent: