diff --git a/build-node.scm b/build-node.scm
index 3641c4a1b8b3106047f30ce18f567233cb98335b..ecb9224e187945a00d90a65e5458495ea51fdfc3 100644
--- a/build-node.scm
+++ b/build-node.scm
@@ -28,7 +28,8 @@
                                        (local-file "guix/keys/guix-hpc4.pub")
                                        (local-file "guix/keys/guix-hpc5.pub")
                                        (local-file "guix/keys/guix-hpc6.pub")
-                                       (local-file "guix/keys/guix-hpc7.pub"))
+                                       (local-file "guix/keys/guix-hpc7.pub")
+                                       (local-file "guix/keys/guix-hpc8.pub"))
                                  (guix-configuration-authorized-keys config)))
                         (build-accounts 40)
 
diff --git a/deploy.scm b/deploy.scm
index 228834d909fc1c4ad92ab388224cf8bf94d1a6cb..756d45823f64c671ef258ae3fce5d10cd5093ad4 100644
--- a/deploy.scm
+++ b/deploy.scm
@@ -69,4 +69,13 @@
                        (system "x86_64-linux")
                        (host-name "guix-hpc7")
                        (host-key
-                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOyhK3PjJ1aKtkOHoBUke0dqKAtBbh1rqAh9W7W0qLRp root@(none)")))))
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOyhK3PjJ1aKtkOHoBUke0dqKAtBbh1rqAh9W7W0qLRp root@(none)"))))
+
+      (machine
+       (operating-system (load-operating-system "guix-hpc8.scm"))
+       (environment managed-host-environment-type)
+       (configuration (machine-ssh-configuration
+                       (system "x86_64-linux")
+                       (host-name "guix-hpc8")
+                       (host-key
+                        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIES0cHOOh1xBXj/Yi2DNVju1k12utBal5Ut3hBAHUu6R root@(none)")))))
diff --git a/guix-hpc8.scm b/guix-hpc8.scm
new file mode 100644
index 0000000000000000000000000000000000000000..61498c1d1a30a4bd3b5ea88732cd2ebf651f4d74
--- /dev/null
+++ b/guix-hpc8.scm
@@ -0,0 +1,44 @@
+;;; Configuration of the guix-hpc8 build node.
+
+(use-modules (gnu))
+
+(let ((base-os (load "build-node.scm")))
+  (operating-system
+    (inherit base-os)
+    (host-name "guix-hpc8")
+
+    ;; This is a UEFI setup.
+    (bootloader (bootloader-configuration
+                  (bootloader grub-efi-bootloader)
+                  (targets (list "/boot/efi"))))
+
+    (initrd-modules (append (list "megaraid_sas")
+                            %base-initrd-modules))
+
+    (file-systems (append (list (file-system
+                                  (mount-point "/boot/efi")
+                                  (device (uuid "B65C-D597" 'fat32))
+                                  (type "vfat"))
+                                (file-system
+                                  (mount-point "/")
+                                  (device (uuid "af2de248-a752-4a49-b391-fb471fe913f6"
+                                                'ext4))
+                                  (type "ext4")))
+                          %base-file-systems))
+
+    (swap-devices (list (swap-space
+                         (target (uuid "278cd11b-7ff2-4b75-9138-03dcd69a911c")))))
+
+    (services
+     ;; Configure networking.
+     (cons  (service static-networking-service-type
+                     (list (static-networking
+                            (addresses (list (network-address
+                                              (device "ens10f0")
+                                              (value "194.199.1.118/26"))))
+                            (routes (list (network-route
+                                           (destination "default")
+                                           (gateway "194.199.1.64"))))
+                            (name-servers '("193.50.111.150")))))
+
+            (operating-system-user-services base-os)))))
diff --git a/guix/keys/guix-hpc8.pub b/guix/keys/guix-hpc8.pub
new file mode 100644
index 0000000000000000000000000000000000000000..6ce0e536d9a46f026fea3e9a46f97bca8c26f6e0
--- /dev/null
+++ b/guix/keys/guix-hpc8.pub
@@ -0,0 +1,6 @@
+(public-key 
+ (ecc 
+  (curve Ed25519)
+  (q #CEB9EF58FFFF96286219C706519CF0A4F8C424B94EB04F70AF5C13182A120E2A#)
+  )
+ )
\ No newline at end of file
diff --git a/head-node.scm b/head-node.scm
index ef791be3c3684eba8bf400ccb818e1088d98c76e..c755821991c6821c6f272253c510055a38b88eb1 100644
--- a/head-node.scm
+++ b/head-node.scm
@@ -49,7 +49,8 @@ export CUIRASS_LOGGING_LEVEL=${CUIRASS_LOGGING_LEVEL:-debug}\n"
                                        (local-file "guix/keys/guix-hpc4.pub")
                                        (local-file "guix/keys/guix-hpc5.pub")
                                        (local-file "guix/keys/guix-hpc6.pub")
-                                       (local-file "guix/keys/guix-hpc7.pub"))
+                                       (local-file "guix/keys/guix-hpc7.pub")
+                                       (local-file "guix/keys/guix-hpc8.pub"))
                                  (guix-configuration-authorized-keys config)))
                         (build-accounts 60)