diff --git a/modules/server/containers/default.nix b/modules/server/containers/default.nix
index 390dfde..3e87a2c 100644
--- a/modules/server/containers/default.nix
+++ b/modules/server/containers/default.nix
@@ -51,10 +51,11 @@ in
         value = {
           description = "Run ${containerSet.name} setup";
           after = [ "podman-${containerSet.name}-${containerSet.setup.trigger}.service" ];
-          requires = [ "podman-${containerSet.name}-${containerSet.setup.trigger}.service" ];
+          wants = [ "podman-${containerSet.name}-${containerSet.setup.trigger}.service" ];
           wantedBy = [ "multi-user.target" ];
           serviceConfig = {
             Type = "oneshot";
+            TimeoutStartSec = "30s";
             ExecStart = "${containerSet.setup.script}";
             RemainAfterExit = true;
             User = "root";
diff --git a/modules/server/containers/defs/nextcloud.nix b/modules/server/containers/defs/nextcloud.nix
index 6390be2..f9f6c95 100644
--- a/modules/server/containers/defs/nextcloud.nix
+++ b/modules/server/containers/defs/nextcloud.nix
@@ -60,14 +60,14 @@ in {
     trigger="server";
     script = pkgs.writeShellScript "setup" ''
       # Define the command wrapper
-      OCC="${pkgs.podman}/bin/podman exec -u www-data nextcloud php occ"
+      OCC="${pkgs.podman}/bin/podman exec -u www-data nextcloud-server php occ"
 
       echo "Waiting for Nextcloud container to start..."
       until $OCC status > /dev/null 2>&1; do
         sleep 2
       done
 
-      echo "Maintenance ..."
+      echo "Maintenance..."
       $OCC maintenance:repair --include-expensive --non-interaction
       $OCC db:add-missing-indices --non-interaction
       
@@ -77,6 +77,8 @@ in {
       $OCC config:system:set phone_region --value="CH"
       $OCC config:app:set core backgroundjobs_mode --value="cron"
 
+
+      echo "Completed Setup"
     '';
   };
 }