diff --git a/machines/metis/default.nix b/machines/metis/default.nix
index 2d2a24f..784f49f 100644
--- a/machines/metis/default.nix
+++ b/machines/metis/default.nix
@@ -36,6 +36,7 @@
     server = {
       enable = true;
       nextcloud.enable = true;
+      acme.staging = true;
     };
     
     
diff --git a/modules/server/acme.nix b/modules/server/acme.nix
new file mode 100644
index 0000000..9d29f5c
--- /dev/null
+++ b/modules/server/acme.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+with lib;{
+  options.elss.server.acme.staging = mkEnableOption "Whether to use the staging or the default server for acme";
+  config =
+    let
+      cfg = config.elss.server;
+      staging = config.elss.server.acme.staging;
+    in
+    mkIf cfg.enable {
+      security.acme = {
+        defaults = {
+
+
+          server = mkIf staging "https://acme-staging-v02.api.letsencrypt.org/directory";
+          email = "stefan.ellmauthaler@gmail.com"; # Do not use ellmauthaler.net as the mail server will be covered by acme
+        };
+        acceptTerms = true;
+      };
+    };
+}
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 0e0f401..7861e37 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -7,10 +7,11 @@ with lib; {
   options.elss.server.smailserver.enable = mkEnableOption "Set up simple mail server";
 
   imports = [
+    ./acme.nix
+    ./nextcloud.nix
     ./nginx.nix
     ./smailserver.nix
     ./sql.nix
-    ./nextcloud.nix
   ];
 
   config =
@@ -21,7 +22,8 @@ with lib; {
         elss.server = {
           nginx.enable = mkDefault true;
           sql.enable = mkDefault true;
-          smailserver.enable = mkDefault false; # TODO fix simple mail server 
+          smailserver.enable = mkDefault false; # TODO fix simple mail server
+          nextcloud.enable = mkDefault true;
         };
       };
 }