diff --git a/prometheus/defaults.yaml b/prometheus/defaults.yaml
index d132f92..4164795 100644
--- a/prometheus/defaults.yaml
+++ b/prometheus/defaults.yaml
@@ -25,28 +25,32 @@ prometheus:
       install_dir: /opt
       source: https://github.com/prometheus/node_exporter/releases/download/v0.17.0/node_exporter-0.17.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/node_exporter/releases/download/v0.17.0/sha256sums.txt
-      url: https://github.com/prometheus/node_exporter
-      args: []
+      args:
+        url: https://github.com/prometheus/node_exporter
+        service_args: []
     blackbox:
       version: 0.14.0.linux-amd64
       install_dir: /opt
       source: https://github.com/prometheus/blackbox_exporter/releases/download/v0.14.0/blackbox_exporter-0.14.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/blackbox_exporter/releases/download/v0.14.0/sha256sums.txt
-      url: ""
       args:
+        url: https://github.com/prometheus/blackbox_exporter
         config_file: /etc/prometheus/blackbox_exporter.yml
+        service_args: []
     haproxy:
       version: 0.10.0.linux-amd64
       install_dir: /opt
       source: https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
       source_hash: https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/sha256sums.txt
-      url: ""
       args:
+        url: https://github.com/prometheus/haproxy_exporter
         scrape_uri: 'unix:/run/haproxy/admin.sock'
+        service_args: []
     rabbitmq:
       version: 0.24.0.linux-amd64
       install_dir: /opt
       source: https://github.com/kbudde/rabbitmq_exporter/releases/download/v0.24.0/rabbitmq_exporter-0.24.0.linux-amd64.tar.gz
       source_hash: sha256=dbbd44a5a4b4a22ba338b9732c014587bc11513a5d6d2e3e519fc313b1cc46d4
-      url: ""
-      args: []
+      args:
+        url: https://github.com/kbudde/rabbitmq_exporter
+        service_args: []
diff --git a/prometheus/exporter/blackbox.sls b/prometheus/exporter/blackbox.sls
index 047bae7..a6dcbbc 100644
--- a/prometheus/exporter/blackbox.sls
+++ b/prometheus/exporter/blackbox.sls
@@ -44,8 +44,9 @@ blackbox_exporter_service_unit:
         svc: node_exporter
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
-        bin_path: {{ prometheus.exporter.node.version_path }}
-        args: {{ prometheus.exporter.get('args', []) }}
+        bin_path: {{ prometheus.exporter.blackbox.version_path }}
+        args: {{ prometheus.exporter.blackbox.args.service_args }}
+        url: {{ prometheus.exporter.blackbox.args.url }}
     - require_in:
       - file: blackbox_exporter_service
 
diff --git a/prometheus/exporter/haproxy.sls b/prometheus/exporter/haproxy.sls
index 3f67eac..196fa64 100644
--- a/prometheus/exporter/haproxy.sls
+++ b/prometheus/exporter/haproxy.sls
@@ -45,8 +45,8 @@ haproxy_exporter_service_unit:
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
         bin_path: {{ prometheus.exporter.haproxy.version_path }}
-        args: {{ prometheus.exporter.haproxy.args }}
-        url: {{ prometheus.exporter.haproxy.url }}
+        args: {{ prometheus.exporter.haproxy.args.service_args }}
+        url: {{ prometheus.exporter.haproxy.args.url }}
     - require_in:
       - file: haproxy_exporter_service
 
diff --git a/prometheus/exporter/node.sls b/prometheus/exporter/node.sls
index 6b8f623..51f6094 100644
--- a/prometheus/exporter/node.sls
+++ b/prometheus/exporter/node.sls
@@ -43,8 +43,8 @@ node_exporter_service_unit:
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
         bin_path: {{ prometheus.exporter.node.version_path }}
-        args: {{ prometheus.exporter.node.args }}
-        url: {{ prometheus.exporter.node.url }}
+        args: {{ prometheus.exporter.node.args.service_args }}
+        url: {{ prometheus.exporter.node.args.url }}
     - require_in:
       - file: node_exporter_service
 
diff --git a/prometheus/exporter/rabbitmq.sls b/prometheus/exporter/rabbitmq.sls
index 2dc5c02..4c7adbd 100644
--- a/prometheus/exporter/rabbitmq.sls
+++ b/prometheus/exporter/rabbitmq.sls
@@ -43,8 +43,8 @@ rabbitmq_exporter_service_unit:
         user: {{ prometheus.user }}
         group: {{ prometheus.group }}
         bin_path: {{ prometheus.exporter.rabbitmq.version_path }}
-        args: {{ prometheus.exporter.rabbitmq.args }}
-        url: {{ prometheus.exporter.rabbitmq.url }}
+        args: {{ prometheus.exporter.rabbitmq.args.service_args }}
+        url: {{ prometheus.exporter.rabbitmq.args.url }}
     - require_in:
       - file: rabbitmq_exporter_service