diff --git a/templates/nix-config/configuration.nix b/templates/nix-config/configuration.nix
index fbeda87..6130f38 100644
--- a/templates/nix-config/configuration.nix
+++ b/templates/nix-config/configuration.nix
@@ -10,7 +10,7 @@
     ./misc/mail.nix
     ./misc/networking.nix
     ./misc/smart.nix
-#    ./disks/pcr-check.nix
+##    ./disks/pcr-check.nix
 #    ./disks/snapraid.nix
 #    ./pcie-coral/coral.nix
   ];
@@ -47,9 +47,9 @@
   boot.swraid.mdadmConf = "MAILADDR ${config.email.userAddress},${config.email.adminAddress}";
 #  boot.initrd.systemd.tpm2.enable = true;
 
-  # TPM2 PCR check
-#  systemIdentity.enable = true;
-#  systemIdentity.pcr15 = "PCR_HASH"; 
+#  # TPM2 PCR check
+##  systemIdentity.enable = true;
+##  systemIdentity.pcr15 = "PCR_HASH"; 
 
   # Timezone
   time.timeZone = "Europe/Paris";
diff --git a/templates/nix-config/misc/networking.nix b/templates/nix-config/misc/networking.nix
index a840b10..fbcf4eb 100644
--- a/templates/nix-config/misc/networking.nix
+++ b/templates/nix-config/misc/networking.nix
@@ -16,7 +16,7 @@
   # Bridge configuration for VMs
   networking.bridges.br0.interfaces = [ "TARGET_INTERFACE" ];
   networking.interfaces.br0.useDHCP = false;
-  networking.nameservers = [ "127.0.0.1" "9.9.9.9" ];
+  networking.nameservers = [ "HOME_SERVER_IP" "9.9.9.9" ];
   networking.interfaces.br0.ipv4.addresses = [{
     address = "HOME_SERVER_IP";
     prefixLength = 24;
diff --git a/templates/nix-config/podman/frigate.nix b/templates/nix-config/podman/frigate.nix
index e16d693..7587bc9 100644
--- a/templates/nix-config/podman/frigate.nix
+++ b/templates/nix-config/podman/frigate.nix
@@ -56,7 +56,7 @@ in
     systemd.services.${container_name} = {
       description = "Podman container : ${container_name}";
       after = [ "network.target" ];
-      requires = [ "traefik.service" ];
+      requires = [ "traefik.service" "home-assistant.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.podman ];
 
@@ -67,7 +67,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 60 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/gitea.nix b/templates/nix-config/podman/gitea.nix
index e9d434e..1c8fb16 100644
--- a/templates/nix-config/podman/gitea.nix
+++ b/templates/nix-config/podman/gitea.nix
@@ -79,7 +79,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 60 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/home-assistant.nix b/templates/nix-config/podman/home-assistant.nix
index 487b11b..4b6ba72 100644
--- a/templates/nix-config/podman/home-assistant.nix
+++ b/templates/nix-config/podman/home-assistant.nix
@@ -66,7 +66,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 70 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/immich.nix b/templates/nix-config/podman/immich.nix
index 55f01b6..7e4c5f9 100644
--- a/templates/nix-config/podman/immich.nix
+++ b/templates/nix-config/podman/immich.nix
@@ -103,7 +103,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 80 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/it-tools.nix b/templates/nix-config/podman/it-tools.nix
index 3392d58..bf87666 100644
--- a/templates/nix-config/podman/it-tools.nix
+++ b/templates/nix-config/podman/it-tools.nix
@@ -46,7 +46,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 90 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/nextcloud.nix b/templates/nix-config/podman/nextcloud.nix
index e4be29a..c1495bf 100644
--- a/templates/nix-config/podman/nextcloud.nix
+++ b/templates/nix-config/podman/nextcloud.nix
@@ -69,7 +69,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 100 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/passbolt.nix b/templates/nix-config/podman/passbolt.nix
index feab218..0821f3f 100644
--- a/templates/nix-config/podman/passbolt.nix
+++ b/templates/nix-config/podman/passbolt.nix
@@ -98,7 +98,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 110 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";
diff --git a/templates/nix-config/podman/pi-hole.nix b/templates/nix-config/podman/pi-hole.nix
index d074635..7cdc5a1 100644
--- a/templates/nix-config/podman/pi-hole.nix
+++ b/templates/nix-config/podman/pi-hole.nix
@@ -80,7 +80,7 @@ in
         # Pull the latest image before running
         ExecStartPre = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} pull";
         # Bring the service up
-        ExecStart = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
+        ExecStart = "sleep 60 && ${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} up --remove-orphans";
         # Take it down gracefully
         ExecStop = "${pkgs.podman-compose}/bin/podman-compose -f /etc/${compose_file} down";
         Restart = "on-failure";