diff --git a/packages/lab-tool/config/config.scm b/packages/lab-tool/config/config.scm
index 15a17b4..c117850 100644
--- a/packages/lab-tool/config/config.scm
+++ b/packages/lab-tool/config/config.scm
@@ -24,10 +24,11 @@
 
 (define (get-ssh-config machine-name)
   "Get SSH configuration for a machine"
-  `((hostname . ,(symbol->string machine-name))
-    (user . "sma")
-    (identity-file . "~/.ssh/id_ed25519_admin")
-    (is-local . #f)))
+  (let ((hostname (symbol->string machine-name)))
+    `((hostname . ,hostname)
+      (user . "sma")
+      (identity-file . "~/.ssh/id_ed25519_admin")
+      (is-local . #f)))
 
 (define (get-homelab-root)
   "Get home lab root directory"
diff --git a/packages/lab-tool/utils/ssh.scm b/packages/lab-tool/utils/ssh.scm
index 171f33d..1f9a56d 100644
--- a/packages/lab-tool/utils/ssh.scm
+++ b/packages/lab-tool/utils/ssh.scm
@@ -141,4 +141,6 @@
           #f))
       (begin
         (log-error "Cannot establish SSH connection to ~a" machine-name)
-        #f)))
+        #f))))
+
+;; Ensure file ends with a newline and all parentheses are closed