diff --git a/deploy.sh b/deploy.sh
index 186f214..e7d515b 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -905,10 +905,10 @@ postrun_action() {
       FOUND="true"
       echo -e "\n✅ Ping ${HOME_SERVER_IP} successful ! Continuing..."
     else
-      (i++)
-      if [[ "\${i}" -gt 150 ]]; then
+      i=$((i + 1))
+      if [[ "${i}" -gt 150 ]]; then
         echo -e "\n\n❌ Could not connect to the server after 150 retries. \
-  This is most likely due to a networking issue. Please double check your network settings. Aborting."
+        This is most likely due to a networking issue. Please double check your network settings. Aborting."
         exit 1
       fi
     fi
@@ -929,18 +929,18 @@ postrun_action() {
       sshpass -p "${REMOTE_PASS}" ssh -i "final-nix-config/home/numbus-admin/.ssh/id_ed25519" "${TARGET_USER}@${TARGET_HOST}" 'bash -s' << EOF
 echo "Enrolling boot disk key to TPM..."
 
-BOOT_DISKS_ID=(${BOOT_DISKS_ID[@]})
+BOOT_DISKS_NAME=(${BOOT_DISKS_NAME[@]})
 DEBUG=${DEBUG}
 DISK_PATH=""
 j=1
 
-for i in \${!BOOT_DISKS_ID[@]}; do
-  if echo "\${BOOT_DISKS_ID[\${i}]}" | grep -iq "nvme"; then
+for i in \${!BOOT_DISKS_NAME[@]}; do
+  if echo "\${BOOT_DISKS_NAME[\${i}]}" | grep -iq "nvme"; then
     [[ "\${DEBUG}" == "true" ]] && echo "NVMe detected..."
-    DISK_PATH="/dev/\${BOOT_DISKS_ID[\${i}]}p2"
+    DISK_PATH="/dev/\${BOOT_DISKS_NAME[\${i}]}p2"
   else
     [[ "\${DEBUG}" == "true" ]] && echo "Non-NVMe drive detected..."
-    DISK_PATH="/dev/\${BOOT_DISKS_ID[\${i}]}2"
+    DISK_PATH="/dev/\${BOOT_DISKS_NAME[\${i}]}2"
   fi
   [[ "\${DEBUG}" == "true" ]] && echo "Issuing enroll command for disk \${DISK_PATH}..."
   echo ${REMOTE_PASS} | sudo -S systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=0+7 --unlock-key-file=/etc/secrets/disks/boot-\${j} \${DISK_PATH}
diff --git a/templates/nix-config/configuration.nix b/templates/nix-config/configuration.nix
index f639bd4..89a8377 100644
--- a/templates/nix-config/configuration.nix
+++ b/templates/nix-config/configuration.nix
@@ -105,10 +105,10 @@
     podman
     podman-compose
     podman-tui
-    passt
     slirp4netns
-    netavark
-    aardvark-dns
+#    passt
+#    netavark
+#    aardvark-dns
     snapraid
     mergerfs
     mergerfs-tools
diff --git a/templates/nix-config/podman/nextcloud.nix b/templates/nix-config/podman/nextcloud.nix
index 9d6139b..9f02a75 100644
--- a/templates/nix-config/podman/nextcloud.nix
+++ b/templates/nix-config/podman/nextcloud.nix
@@ -53,7 +53,6 @@ in
               - traefik.http.routers.nextcloud-https.tls.certresolver=cloudflare
             depends_on:
               - nextcloud-database
-              - nextcloud-redis
         
           nextcloud-redis:
             image: docker.io/library/redis:alpine