diff --git a/tasks/api.yaml b/tasks/api.yaml
index fde6849..6690592 100644
--- a/tasks/api.yaml
+++ b/tasks/api.yaml
@@ -1,11 +1,18 @@
 ---
 
-- name: Create Sensu API config
+- name: Create Sensu API specific config
   template:
     src: config.json.j2
-    dest: /etc/sensu/config.json
+    dest: /etc/sensu/config_api.json
   notify: Restart sensu-api
 
+- name: Create symlink to the main config for sensu-api
+  file:
+    src: /etc/sensu/config_api.json
+    dest: /etc/sensu/config.json
+    state: link
+  when: sensu_install_api and not sensu_install_server
+
 - name: Make sure sensu-api is enabled and started
   service:
     name: sensu-api
diff --git a/tasks/server.yaml b/tasks/server.yaml
index d24a99e..2fbbd4d 100644
--- a/tasks/server.yaml
+++ b/tasks/server.yaml
@@ -1,11 +1,19 @@
 ---
 
-- name: Create Sensu server config
+- name: Create Sensu server specific config
   template:
     src: config.json.j2
-    dest: /etc/sensu/config.json
+    dest: /etc/sensu/config_server.json
   notify: Restart sensu-server
 
+- name: Create symlink to the main config for sensu-server
+  file:
+    src: /etc/sensu/config_server.json
+    dest: /etc/sensu/config.json
+    state: link
+    force: yes
+  when: sensu_install_server
+
 - name: Make sure Sensu server services are enabled and started
   service:
     name: sensu-server