diff --git a/roles/service-prometheus/defaults/main.yml b/roles/service-prometheus/defaults/main.yml
index 225d96d..5028d8f 100644
--- a/roles/service-prometheus/defaults/main.yml
+++ b/roles/service-prometheus/defaults/main.yml
@@ -28,4 +28,4 @@ prometheus_goroot: "{{ prometheus_workdir }}/go"
 prometheus_gopath: "{{ prometheus_workdir }}/gopath"
 
 prometheus_default_opts: "--config.file={{ prometheus_config_path }}/prometheus.yml --storage.tsdb.path={{ prometheus_db_path }}"
-alertmanager_default_opts: "-config.file={{ prometheus_config_path }}/alertmanager.yml -storage.path={{ alertmanager_db_path }}"
+alertmanager_default_opts: "--config.file={{ prometheus_config_path }}/alertmanager.yml --storage.path={{ alertmanager_db_path }}"
diff --git a/roles/service-prometheus/templates/alertmanager.service.j2 b/roles/service-prometheus/templates/alertmanager.service.j2
index 155f88e..594fd3a 100644
--- a/roles/service-prometheus/templates/alertmanager.service.j2
+++ b/roles/service-prometheus/templates/alertmanager.service.j2
@@ -8,7 +8,7 @@ Type=simple
 User={{ prometheus_user }}
 Group={{ prometheus_group }}
 
-{% if prometheus_opts is defined %}
+{% if alertmanager_opts is defined %}
 ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }} {{ alertmanager_opts }}
 {% else %}
 ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }}
diff --git a/roles/service-prometheus/templates/prometheus.service.j2 b/roles/service-prometheus/templates/prometheus.service.j2
index f7cb88b..d244dce 100644
--- a/roles/service-prometheus/templates/prometheus.service.j2
+++ b/roles/service-prometheus/templates/prometheus.service.j2
@@ -9,7 +9,7 @@ User={{ prometheus_user }}
 Group={{ prometheus_group }}
 
 {% if prometheus_opts is defined %}
-ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} {{ prometheus_node_exporter_opts }}
+ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} {{ prometheus_opts }}
 {% else %}
 ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }}
 {% endif %}