diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix
index 4e5d86f..0488973 100644
--- a/modules/services/gitea.nix
+++ b/modules/services/gitea.nix
@@ -16,7 +16,6 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Gitea, your own self-hosted git platform";
-  pod = "gitea";
   defaultPort = "3000";
   dataDirEnabled = false;
   generatedSecrets = {
diff --git a/modules/services/home-assistant.nix b/modules/services/home-assistant.nix
index 4a01905..9e05d56 100644
--- a/modules/services/home-assistant.nix
+++ b/modules/services/home-assistant.nix
@@ -16,7 +16,6 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Home Assistant, libre house control and much more";
-  pod = "home-assistant";
   defaultPort = "8123";
   dataDirEnabled = false;
   generatedSecrets = {
diff --git a/modules/services/immich.nix b/modules/services/immich.nix
index dd727b5..6540f7e 100644
--- a/modules/services/immich.nix
+++ b/modules/services/immich.nix
@@ -17,7 +17,6 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Immich, Google Photos but better";
-  pod = "immich";
   defaultPort = "2283";
   generatedSecrets = {
     DB_NAME = "xkcdpass -n 2 -d -";
diff --git a/modules/services/it-tools.nix b/modules/services/it-tools.nix
index 5ee74d2..eeeee21 100644
--- a/modules/services/it-tools.nix
+++ b/modules/services/it-tools.nix
@@ -15,7 +15,7 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "IT-tools, useful tools when doing IT";
-  pod = "false";
+  pod = false;
   defaultPort = "8880";
   configDir = false;
   dataDir = false;
diff --git a/modules/services/lib.nix b/modules/services/lib.nix
index fca2a3b..405da34 100644
--- a/modules/services/lib.nix
+++ b/modules/services/lib.nix
@@ -110,6 +110,7 @@ ${concatStringsSep "\n" (map (m: "                  - ${m}") middlewares)}
           path = [ pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ];
           serviceConfig = {
             Type = "exec";
+            TimeoutStartSec = "1000";
             ExecStartPre = [
               "${pkgs.bash}/bin/bash -c 'sleep $((RANDOM % ${toString startDelay}))'"
               "${pkgs.sudo}/bin/sudo -u numbus-admin podman-compose ${envFileArg} -f /etc/podman/${name}/compose.yaml pull"
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index 20e83bd..90b1032 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -19,7 +19,6 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Nextcloud, your own online office suite";
-  pod = "nextcloud";
   defaultPort = "1100";
   generatedSecrets = {
     DB_NAME = "xkcdpass -n 2 -d -";
diff --git a/modules/services/passbolt.nix b/modules/services/passbolt.nix
index 11c3386..62c523f 100644
--- a/modules/services/passbolt.nix
+++ b/modules/services/passbolt.nix
@@ -16,7 +16,6 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Passbolt, your password manager";
-  pod = "passbolt";
   defaultPort = "4433";
   scheme = "https";
   dataDirEnabled = false;
diff --git a/modules/services/pi-hole.nix b/modules/services/pi-hole.nix
index d663c0d..3129c86 100644
--- a/modules/services/pi-hole.nix
+++ b/modules/services/pi-hole.nix
@@ -15,6 +15,7 @@ in
 helper.mkPodmanService {
   inherit name;
   description = "Pi-Hole, the ads black hole";
+  pod = false;
   defaultPort = "4443";
   scheme = "https";
   dependencies = [ "network.target" "multi-user.target" ];
diff --git a/modules/services/traefik.nix b/modules/services/traefik.nix
index 0fe6a7c..052f9e1 100644
--- a/modules/services/traefik.nix
+++ b/modules/services/traefik.nix
@@ -16,8 +16,9 @@ helper.mkPodmanService {
   inherit name;
   description = "Traefik reverse proxy, one to rule them all";
   reverseProxied = false;
-  dependencies = [ "network.target" "multi-user.target" ];
+  pod = false;
   dataDir = false;
+  dependencies = [ "network.target" "multi-user.target" ];
   startDelay = 10;
   generatedSecrets = {
     CLOUDFLARE_DNS_API_TOKEN = "cat ${config.numbus.mail.smtpPasswordPath}";