diff --git a/flake/nixosConfigurations.nix b/flake/nixosConfigurations.nix
index be4df26..b00570c 100644
--- a/flake/nixosConfigurations.nix
+++ b/flake/nixosConfigurations.nix
@@ -52,6 +52,9 @@ let
             {};
         in
           secrets;
+
+        # Enable clerie common config
+        profiles.clerie.common.enable = true;
       })
 
       # Config to be applied to every host
diff --git a/profiles/common-dns/default.nix b/profiles/common-dns/default.nix
new file mode 100644
index 0000000..c3d4a15
--- /dev/null
+++ b/profiles/common-dns/default.nix
@@ -0,0 +1,22 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+
+  options.profiles.clerie.common-dns = {
+    enable = mkEnableOption "Common dns config";
+  };
+
+  config = mkIf config.profiles.clerie.common-dns.enable {
+
+    # Use systemd-resolved everywhere
+    services.resolved.enable = true;
+
+    # Do not use any DNS servers as fallback
+    services.resolved.fallbackDns = [];
+
+    networking.networkmanager.dns = "systemd-networkd";
+
+  };
+}
diff --git a/profiles/common/default.nix b/profiles/common/default.nix
new file mode 100644
index 0000000..7cf3a64
--- /dev/null
+++ b/profiles/common/default.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+
+  options.profiles.clerie.common = {
+    enable = mkEnableOption "Cleries common config";
+  };
+
+  config = mkIf config.profiles.clerie.common.enable {
+
+    profiles.clerie.common-dns.enable = true;
+
+    # Disabled while we are still in transition
+    #profiles.clerie.common-network.enable = true;
+
+  };
+}
diff --git a/profiles/default.nix b/profiles/default.nix
index 56cb944..841ac25 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -3,6 +3,8 @@
 {
 
   imports = [
+    ./common
+    ./common-dns
     ./common-networking
     ./cybercluster-vm
     ./fem-net