diff --git a/devices/ellaca/options.nix b/devices/ellaca/options.nix
index 20e2f3b..e03f5ad 100644
--- a/devices/ellaca/options.nix
+++ b/devices/ellaca/options.nix
@@ -1,7 +1,7 @@
 { ... }: {
   conf = {
     ssh.enable = true;
-
+    nginx.enable = true;
 
     stateVersion = "25.05";
     hmStateVersion = "25.05";
diff --git a/options.nix b/options.nix
index 57511f4..c2b6a1c 100644
--- a/options.nix
+++ b/options.nix
@@ -4,7 +4,7 @@
 in {
   options = {
     conf = {
-      ssh.enable = mkEnableOption "Install my public key to allow accessing this machine via ssh.";
+      # Generally client options
       apps.enable = mkEnableOption "Enable complete configuration for end-user machine.";
       niri.enable = mkEnableOption "Enable niri compositor.";
       vm.enable = mkEnableOption "Enable VM related configuration.";
@@ -15,6 +15,11 @@ in {
       fonts.enable = mkEnableOption "Install and set preferred fonts";
       networkmanager.enable = mkEnableOption "Enable network manager and some related configuration";
 
+      # Generally server options
+      ssh.enable = mkEnableOption "Install my public key to allow accessing this machine via ssh.";
+      nginx.enable = mkEnableOption "Enable nginx.";
+
+      # Mixed and more complex options
       username = mkOption {
         type = str;
         description = "Username of the default user (single user setup).";