diff --git a/hosts/common/optional/services/vpn.nix b/hosts/common/optional/services/vpn.nix
new file mode 100644
index 0000000..0c98c15
--- /dev/null
+++ b/hosts/common/optional/services/vpn.nix
@@ -0,0 +1,5 @@
+{ pkgs, ...}: {
+  services.netbird.enable = true;
+
+  environment.systemPackages = with pkgs; [ netbird-ui ];
+}
diff --git a/hosts/nixos/rihla/default.nix b/hosts/nixos/rihla/default.nix
index 229e75e..7ccd786 100644
--- a/hosts/nixos/rihla/default.nix
+++ b/hosts/nixos/rihla/default.nix
@@ -66,6 +66,7 @@
         "openssh"
         "printing"
         "smart-card"
+        "vpn"
       ])
 
     #