diff --git a/data/hostname/boatbucket.internal.softwareheritage.org.yaml b/data/hostname/boatbucket.internal.softwareheritage.org.yaml
index ae552a15..1e3c14d2 100644
--- a/data/hostname/boatbucket.internal.softwareheritage.org.yaml
+++ b/data/hostname/boatbucket.internal.softwareheritage.org.yaml
@@ -1,22 +1,34 @@
 ---
 users:
   marmoute:
     uid: 3000
     full_name: Pierre-Yves David
     shell: /bin/bash
     authorized_keys:
       marmoute@nodosa:
         type: ssh-rsa
         key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDgDqgHs1q3utmg1rsrVtLVh+W7OgWz+ft1A1e2e8kMZkHfDOtD5niwzd1j4EVegaY5fJygyL2Pnm+wRID4uLIsoG21BW2SA5SwgnCMmNzPE+v/7pCFjJ1koGUrrXFDETaYaFF1cXwQ9veXzm2QMqxQ2pGbz/Yvu3Ihw85EezACehBnr9UzSCJEKQ8b+Bs8Ijr6kAvyvR3CPXfDEzJmxR/wA6uWXUWo+zSNFeOO0n3C1/uqULy5JiiuzSBu8W/q7pQXnYjz9y7nD4isIshDH5whGBQXzkl2G7idt7wRQgr/ADYZbpZHOoJXtjYzHLINNqJ5HqX0GOMssA1fqyBB1u+l
     groups:
       - sudo
   alphare:
     uid: 3001
     full_name: Raphaël Gomès
     shell: /bin/bash
     authorized_keys:
       alphare@alphare-carbon:
         type: ecdsa-sha2-nistp521
         key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBABmkn2C9tUWukFZieumhLtgM9pUV5IgEK0BDn2nEh1cF/bcvlqmipQyfkr1/GnlBLQ+lbEZDVlrD2WLrGhT2NhYGQBNH9/K92hpuyIWODkjhKt3qGfDXTuRM+hUdpTuzLkBQhVPUdWGjhm/qfHNqy4gd7tThIa4tfcmVFD9JM6sjUQw8w==
     groups:
       - sudo
+
+  boatbucket:
+    uid: 1002
+    full_name: Bitbucket Life Raft
+    shell: /bin/bash
+    groups:
+      - boatbucket
+      - marmoute
+
+groups:
+  boatbucket:
+    gid: 1024