diff --git a/src/apps/personal/git.nix b/src/apps/personal/git.nix
index 6333d87..c729a87 100644
--- a/src/apps/personal/git.nix
+++ b/src/apps/personal/git.nix
@@ -18,7 +18,7 @@
             init.defaultBranch = "development";
             color.ui = "auto";
             core.autocrlf = "input";
-            pull.rebase = "preserve";
+            pull.rebase = "merges";
             credential.helper = "store";
             commit.signOff = true;
         };
diff --git a/src/nix/system/oss-labs.eu.nix b/src/nix/system/oss-labs.eu.nix
index 4bea371..50a076d 100644
--- a/src/nix/system/oss-labs.eu.nix
+++ b/src/nix/system/oss-labs.eu.nix
@@ -1,17 +1,42 @@
-{ pkgs, ... }: {
+{ pkgs, ... }: let
+  config = { configFile, instanceName }: { pkgs, ... }: {
+    imports = [
+      configFile
+    ];
+
+    _module.args = { instance = instanceName; inputs = {}; };
+  };
+
+in {
   containers.caddy = {
     autoStart = false;
     privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.11";
-    config = import /home/minion/Code/nix/oss-labs.eu/hosts/caddy/default.nix;
+    localAddress = "10.0.108.2";
+    hostAddress = "10.0.108.1";
+    config = config {
+      configFile = /home/minion/Code/nix/oss-labs.eu/hosts/caddy/default.nix;
+      instanceName = "caddy";
+    };
   };
 
   containers.collabora = {
     autoStart = false;
     privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.12";
-    config = import /home/minion/Code/nix/oss-labs.eu/hosts/collabora/default.nix;
+    localAddress = "10.0.108.3";
+    hostAddress = "10.0.108.1";
+    config = config {
+      configFile = /home/minion/Code/nix/oss-labs.eu/hosts/collabora/default.nix;
+      instanceName = "collabora";
+    };
+  };
+
+  networking.nat = {
+    enable = true;
+    internalInterfaces = [ "ve-+" ];
+    externalInterface = "wlan0";
+  };
+
+  networking.hosts = {
+    "10.0.108.2" = [ "collabora.oss-labs.eu" "meet.oss-labs.eu" "notes.oss-labs.eu" ];
   };
 }