diff --git a/entrypoint.sh b/entrypoint.sh
index 16068ff..fa81eef 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,8 +2,14 @@
 
 cd /root
 
-/bin/ipfs-key "$@" 2> /root/keygen.stderr 1> peer.key
-awk '/^ID for generated key:/ {print $5}' < keygen.stderr > peer.id
+/bin/ipfs-key "$@" 2> /root/keygen.stderr 1> captain.key
+awk '/^ID for generated key:/ {print $5}' < keygen.stderr > captain.id
+rm /root/keygen.stderr
+
+/bin/ipfs-key "$@" 2> /root/keygen.stderr 1> commander.key
+awk '/^ID for generated key:/ {print $5}' < keygen.stderr > commander.id
+rm /root/keygen.stderr
+
 xxd -p -l 32 -c 32 /dev/random | tr -d '\n' > cluster.key
 
 cat << EOF
@@ -13,8 +19,10 @@ kind: ConfigMap
 metadata:
   name: ipfs-config
 data:
-  bootstrap-peer-id: |-
-    $(cat peer.id)
+  captain-id: |-
+    $(cat captain.id)
+  commander-id: |-
+    $(cat commander.id)
 ---
 apiVersion: v1
 kind: Secret
@@ -24,6 +32,8 @@ stringData:
   cluster-secret: |-
     $(xxd -p -l 32 -c 32 /dev/random)
 data:
-  bootstrap-peer-priv-key: |-
-    $(base64 -w 0 peer.key)
+  captain-peer-priv-key: |-
+    $(base64 -w 0 captain.key)
+  commander-peer-priv-key: |-
+    $(base64 -w 0 commander.key)
 EOF