diff --git a/config/consul.d/common.json b/config/consul.d/common.json
index c6a87f6..189875b 100644
--- a/config/consul.d/common.json
+++ b/config/consul.d/common.json
@@ -1,10 +1,9 @@
 {
   "datacenter": "samfelag",
-  "data_dir": "/opt/consul",
 
   "bind_addr": "{{ GetInterfaceIP \"tailscale0\" }}",
   "advertise_addr": "{{ GetInterfaceIP \"tailscale0\" }}",
-  "client_addr": "{{ GetInterfaceIP \"tailscale0\" }}",
+  "client_addr": "{{ GetInterfaceIP \"tailscale0\" }} 127.0.0.1",
 
   "ports": {
     "grpc_tls": 8502
diff --git a/config/consul.d/server-list.json b/config/consul.d/server-list.json
index de2bbef..a0dde8e 100644
--- a/config/consul.d/server-list.json
+++ b/config/consul.d/server-list.json
@@ -1,5 +1,5 @@
 {
   "retry_join": [
-      "100.80.195.56"
+      "100.99.167.21"
   ]
 }
diff --git a/hosts/thingvellir/default.nix b/hosts/thingvellir/default.nix
index 2c950b0..5128f04 100644
--- a/hosts/thingvellir/default.nix
+++ b/hosts/thingvellir/default.nix
@@ -52,6 +52,7 @@ with lib;
     };
     server.nomad = {
       enable = true;
+      server = true;
     };
 
     # - Editors and development ------------------