diff --git a/hydra/machines-for-berlin.scm b/hydra/machines-for-berlin.scm
index 7bf62b7..b8517c8 100644
--- a/hydra/machines-for-berlin.scm
+++ b/hydra/machines-for-berlin.scm
@@ -230,11 +230,18 @@
 (define armv7
   (list
    ;; BeagleBoard (2 cores) kindly hosted by Simon Josefsson.
-   #;(build-machine
-    (name "x15.sjd.se")
+   ;; Temporarily tunneled while waiting for firewall update.
+   (build-machine
+    (name "localhost") (port 2224) ;guix-x15.sjd.se
     (user "hydra")
     (system "armhf-linux")
-    (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvy4tWBLfuBGB2Q8S5q0CeKLaD9w4hAG5PU/+nTD6e2 root@BeagleBoard-X15"))
+    (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFZRvfeaRc7wEIiEoaWA5789+zcZ2Ht/OdFYOt7YAhgn root@beaglebone"))
+
+   (build-machine
+    (name "localhost") (port 2225) ;guix-15b.sjd.se
+    (user "hydra")
+    (system "armhf-linux")
+    (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEbCOTTg9Tl0E23Mnc0UA4Ib2W5oDqTukk6mT98tOph root@beaglebone"))
 
    #;(build-machine
     (name "hydra-slave1.netris.org")