diff --git a/config/nomad.d/host-thingvellir.hcl b/config/nomad.d/host-thingvellir.hcl
index 8b0e116..c88f9ba 100644
--- a/config/nomad.d/host-thingvellir.hcl
+++ b/config/nomad.d/host-thingvellir.hcl
@@ -27,8 +27,8 @@ client {
   }
 
   # Gitea
-  # host_volume "gitea" {
-  #   path = "/mnt/vatnajokull/nomad_volumes/gitea/data"
-  #   read_only = false
-  # }
+  host_volume "gitea" {
+    path = "/mnt/vatnajokull/nomad_volumes/gitea/data"
+    read_only = false
+  }
 }
diff --git a/hosts/thingvellir/hardware.nix b/hosts/thingvellir/hardware.nix
index f928552..c10e2ac 100644
--- a/hosts/thingvellir/hardware.nix
+++ b/hosts/thingvellir/hardware.nix
@@ -19,7 +19,8 @@
     };
 
     "/mnt/vatnajokull" = {
-      device = "vatnajokull:/mnt/raid1";
+      # device = "vatnajokull:/mnt/raid1";
+      device = "100.89.248.65:/mnt/raid1";
       fsType = "nfs";
       options = [ "x-systemd.automount" "noauto" "noatime" "x-systemd.idle-timeout=600"];
     };
diff --git a/modules/server/consul.nix b/modules/server/consul.nix
index b4f3233..d588e6e 100644
--- a/modules/server/consul.nix
+++ b/modules/server/consul.nix
@@ -40,6 +40,13 @@ in
       };
     };
 
+    # --- Systemd patch --------------------------------
+
+    systemd.services.consul = {
+      after = [ "sys-subsystem-net-devices-tailscale0.device" "tailscaled.service" ];
+      requires = [ "tailscaled.service" ];
+    };
+
     # --- Config files ---------------------------------
 
     environment.etc = {
diff --git a/modules/server/nomad.nix b/modules/server/nomad.nix
index 2e5581c..ed11ad4 100644
--- a/modules/server/nomad.nix
+++ b/modules/server/nomad.nix
@@ -28,6 +28,13 @@ in
       extraSettingsPaths = [ "/etc/nomad.d" ];
     };
 
+    # --- Systemd patch --------------------------------
+
+    systemd.services.nomad = {
+      after = [ "sys-subsystem-net-devices-tailscale0.device" "tailscaled.service" ];
+      requires = [ "tailscaled.service" "consul.service" ];
+    };
+
     # --- Config files ---------------------------------
 
     environment.etc = {