diff --git a/packages/home-lab-tools.nix b/packages/home-lab-tools.nix
index 9385b03..a8b39e7 100644
--- a/packages/home-lab-tools.nix
+++ b/packages/home-lab-tools.nix
@@ -1,57 +1,63 @@
-{ lib, stdenv, writeShellScriptBin, rsync, openssh, ... }:
-
+{
+  lib,
+  stdenv,
+  writeShellScriptBin,
+  rsync,
+  openssh,
+  ...
+}:
 writeShellScriptBin "lab" ''
   #!/usr/bin/env bash
-  
+
   # Home-lab administration tools
   # Deploy and manage NixOS configurations across home lab infrastructure
-  
+
   set -euo pipefail
-  
+
   # Configuration
   HOMELAB_ROOT="/home/geir/Home-lab"
   TEMP_CONFIG_DIR="/tmp/home-lab-config"
-  
+
   # Color output
   RED='\033[0;31m'
   GREEN='\033[0;32m'
   YELLOW='\033[1;33m'
   BLUE='\033[0;34m'
   NC='\033[0m' # No Color
-  
+
   log() {
     echo -e "''${BLUE}[lab]''${NC} $1"
   }
-  
+
   success() {
     echo -e "''${GREEN}[lab]''${NC} $1"
   }
-  
+
   warn() {
     echo -e "''${YELLOW}[lab]''${NC} $1"
   }
-  
+
   error() {
     echo -e "''${RED}[lab]''${NC} $1" >&2
   }
-  
+
   # Deployment function
   deploy_machine() {
     local machine="$1"
     local mode="''${2:-boot}"  # boot, test, or switch
-    
+
     case "$machine" in
       "congenital-optimist")
         # Local deployment - no SSH needed
         log "Deploying $machine (mode: $mode) locally"
-        
+
         # Deploy the configuration locally
         log "Running nixos-rebuild $mode locally..."
         if ! sudo nixos-rebuild $mode --flake "$HOMELAB_ROOT#$machine"; then
           error "Failed to deploy configuration to $machine"
           exit 1
         fi
-        
+
         success "Successfully deployed $machine"
         return 0
         ;;
@@ -62,7 +68,7 @@ writeShellScriptBin "lab" ''
         local target_host="sma@grey-area"
         ;;
       "reverse-proxy")
-        local target_host="sma@reverse-proxy"
+        local target_host="sma@reverse-proxy.tail807ea.ts.net"
         ;;
       *)
         error "Unknown machine: $machine"
@@ -70,34 +76,34 @@ writeShellScriptBin "lab" ''
         exit 1
         ;;
     esac
-    
+
     log "Deploying $machine (mode: $mode)"
-    
+
     # Sync configuration to target machine
     log "Syncing configuration to $target_host..."
     if ! ${rsync}/bin/rsync -av --delete "$HOMELAB_ROOT/" "$target_host:$TEMP_CONFIG_DIR/"; then
       error "Failed to sync configuration to $machine"
       exit 1
     fi
-    
+
     # Deploy the configuration
     log "Running nixos-rebuild $mode on $machine..."
     if ! ${openssh}/bin/ssh "$target_host" "cd $TEMP_CONFIG_DIR && sudo nixos-rebuild $mode --flake .#$machine"; then
       error "Failed to deploy configuration to $machine"
       exit 1
     fi
-    
+
     success "Successfully deployed $machine"
   }
-  
+
   # Update all machines function
   update_all_machines() {
     local mode="''${1:-boot}"  # boot, test, or switch
     local machines=("congenital-optimist" "sleeper-service" "grey-area" "reverse-proxy")
     local failed_machines=()
-    
+
     log "Starting update of all machines (mode: $mode)"
-    
+
     for machine in "''${machines[@]}"; do
       log "Updating $machine..."
       if deploy_machine "$machine" "$mode"; then
@@ -108,7 +114,7 @@ writeShellScriptBin "lab" ''
       fi
       echo ""  # Add spacing between machines
     done
-    
+
     if [[ ''${#failed_machines[@]} -eq 0 ]]; then
       success "All machines updated successfully!"
     else
@@ -120,24 +126,67 @@ writeShellScriptBin "lab" ''
   # Show deployment status
   show_status() {
     log "Home-lab infrastructure status:"
-    
+
     # Check congenital-optimist (local)
     if /run/current-system/sw/bin/systemctl is-active --quiet tailscaled; then
       success "  congenital-optimist: ✓ Online (local)"
     else
       warn "  congenital-optimist: ⚠ Tailscale inactive"
     fi
-    
+
+    # Check if -v (verbose) flag is passed
+    local verbose=0
+    if [[ "''${1:-}" == "-v" ]]; then
+      verbose=1
+    fi
+
     # Check remote machines
     for machine in sleeper-service grey-area reverse-proxy; do
-      if ${openssh}/bin/ssh -o ConnectTimeout=5 -o BatchMode=yes "sma@$machine" "echo OK" >/dev/null 2>&1; then
-        success "  $machine: ✓ Online"
+      local ssh_user="sma"  # Using sma as the admin user for remote machines
+
+      # Test SSH connectivity with debug info if in verbose mode
+      if [[ $verbose -eq 1 ]]; then
+        log "Testing SSH connection to $machine (LAN)..."
+        ${openssh}/bin/ssh -v -o ConnectTimeout=5 -o BatchMode=yes "$ssh_user@$machine" "echo ✓ SSH connection to $machine successful" 2>&1
+
+        # Use specific hostname for reverse-proxy
+        if [[ "$machine" == "reverse-proxy" ]]; then
+          log "Testing SSH connection to reverse-proxy.tail807ea.ts.net (Tailscale)..."
+          ${openssh}/bin/ssh -v -o ConnectTimeout=5 -o BatchMode=yes "$ssh_user@reverse-proxy.tail807ea.ts.net" "echo ✓ SSH connection to reverse-proxy.tail807ea.ts.net successful" 2>&1
+        else
+          log "Testing SSH connection to $machine.tailnet (Tailscale)..."
+          ${openssh}/bin/ssh -v -o ConnectTimeout=5 -o BatchMode=yes "$ssh_user@$machine.tailnet" "echo ✓ SSH connection to $machine.tailnet successful" 2>&1
+        fi
+      fi
+
+      # For reverse-proxy, try Tailscale first as it's likely only accessible that way
+      if [[ "$machine" == "reverse-proxy" ]]; then
+        # Use the specific Tailscale hostname for reverse-proxy
+        if ${openssh}/bin/ssh -o ConnectTimeout=5 -o BatchMode=yes "$ssh_user@reverse-proxy.tail807ea.ts.net" "echo OK" >/dev/null 2>&1; then
+          success "  $machine: ✓ Online (Tailscale)"
+        elif ${openssh}/bin/ssh -o ConnectTimeout=2 -o BatchMode=yes "$ssh_user@$machine" "echo OK" >/dev/null 2>&1; then
+          success "  $machine: ✓ Online (LAN)"
+        else
+          warn "  $machine: ⚠ Unreachable"
+          if [[ $verbose -eq 1 ]]; then
+            log "    ℹ️  Note: reverse-proxy is likely only accessible via Tailscale"
+            log "    ℹ️  Check if Tailscale is running on both machines and if the SSH service is active"
+          fi
+        fi
+      # For other machines, try LAN first then Tailscale as fallback
       else
-        warn "  $machine: ⚠ Unreachable"
+        if ${openssh}/bin/ssh -o ConnectTimeout=2 -o BatchMode=yes "$ssh_user@$machine" "echo OK" >/dev/null 2>&1; then
+          success "  $machine: ✓ Online (LAN)"
+        # Try with Tailscale hostname as fallback
+        elif ${openssh}/bin/ssh -o ConnectTimeout=3 -o BatchMode=yes "$ssh_user@$machine.tailnet" "echo OK" >/dev/null 2>&1; then
+          success "  $machine: ✓ Online (Tailscale)"
+        else
+          warn "  $machine: ⚠ Unreachable"
+        fi
       fi
     done
   }
-  
+
   # Main command handling
   case "''${1:-}" in
     "deploy")
@@ -147,33 +196,33 @@ writeShellScriptBin "lab" ''
         error "Modes: boot (default), test, switch"
         exit 1
       fi
-      
+
       machine="$2"
       mode="''${3:-boot}"
-      
+
       if [[ ! "$mode" =~ ^(boot|test|switch)$ ]]; then
         error "Invalid mode: $mode. Use boot, test, or switch"
         exit 1
       fi
-      
+
       deploy_machine "$machine" "$mode"
       ;;
-      
+
     "status")
       show_status
       ;;
-      
+
     "update")
       mode="''${2:-boot}"
-      
+
       if [[ ! "$mode" =~ ^(boot|test|switch)$ ]]; then
         error "Invalid mode: $mode. Use boot, test, or switch"
         exit 1
       fi
-      
+
       update_all_machines "$mode"
       ;;
-      
+
     *)
       echo "Home-lab Management Tool"
       echo ""
@@ -181,7 +230,7 @@ writeShellScriptBin "lab" ''
       echo ""
       echo "Available commands:"
       echo "  deploy <machine> [mode]  - Deploy configuration to a machine"
-      echo "                            Machines: congenital-optimist, sleeper-service, grey-area, reverse-proxy"  
+      echo "                            Machines: congenital-optimist, sleeper-service, grey-area, reverse-proxy"
       echo "                            Modes: boot (default), test, switch"
       echo "  update [mode]            - Update all machines"
       echo "                            Modes: boot (default), test, switch"
@@ -196,4 +245,4 @@ writeShellScriptBin "lab" ''
       echo "  lab status                            # Check all machines"
       ;;
   esac
-''
\ No newline at end of file
+''