diff --git a/roles/fastd/defaults/main.yml b/roles/fastd/defaults/main.yml
index 9179c53..122a312 100644
--- a/roles/fastd/defaults/main.yml
+++ b/roles/fastd/defaults/main.yml
@@ -6,4 +6,4 @@ fastd_instance: "{{ site_code }}"
 fastd_interface: vpn-{{ site_code }}
 fastd_mtu: 1280
 fastd_peers_limit: -1
-fastd_port: 50000
+fastd_port: 10000
diff --git a/roles/fastd/tasks/main.yml b/roles/fastd/tasks/main.yml
index fb1e676..13e67ab 100644
--- a/roles/fastd/tasks/main.yml
+++ b/roles/fastd/tasks/main.yml
@@ -22,6 +22,9 @@
   - Reload systemd
   - Restart fastd
 
+- name: Disable fastd default instance
+  service: name=fastd enabled=no
+
 - name: Create directories
   file: path=/etc/fastd/{{ fastd_instance }}/peers state=directory
 
@@ -32,3 +35,6 @@
 - name: Generate fastd secret
   fastd_key: path=/etc/fastd/{{ site_code }}/secret.conf
   notify: Restart fastd
+
+- name: Enable fastd {{ site_code }}
+  service: name=fastd@{{ site_code }} enabled=yes