diff --git a/swarm-private/templates/bootnode.statefulset.yaml b/swarm-private/templates/bootnode.statefulset.yaml
index 09697d1..1e689ec 100644
--- a/swarm-private/templates/bootnode.statefulset.yaml
+++ b/swarm-private/templates/bootnode.statefulset.yaml
@@ -39,15 +39,34 @@ spec:
         - sh
         - -ac
         - >
-          /bootnode
+          /run.sh
+          --debug
+          --bootnode-mode
           --nodekey=/keys/bootnode.key
-          --addr=:30301
           --verbosity={{ .Values.bootnode.config.verbosity }}
+          --maxpeers=5000
+          --nat=ip:$POD_IP
+          --port=30301
+          --bzznetworkid={{ .Values.swarm.config.bzznetworkid }}
+          # Non-existent bootnode until we have a way to specify that we want empty bootnodes list, see https://github.com/ethereum/go-ethereum/pull/18509
+          --bootnodes=enode://1519bbd8251a4f3a0a2aa1f62b08741ded86ca8d4f08ade1fd3447866816ce129f3dae84b8078d2a6a6d41764c2ebb39ec608695fa588912b84025fd514f8ab0@10.255.255.212:33399
+{{- range $i, $flag := .Values.bootnode.config.extraFlags }}
+          {{ $flag }}
+{{- end }}
         env:
         - name: POD_NAME
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        - name: PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ template "swarm.fullname" . }}
+              key: PASSWORD
         ports:
         - name: network
           containerPort: 30301
diff --git a/swarm-private/values.yaml b/swarm-private/values.yaml
index 68a0deb..3ed8a71 100644
--- a/swarm-private/values.yaml
+++ b/swarm-private/values.yaml
@@ -5,7 +5,7 @@
 bootnode:
   # Image configuration
   image:
-    repository: ethdevops/bootnode
+    repository: ethdevops/swarm
     tag: latest
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -13,9 +13,10 @@ bootnode:
   ##
   imagePullPolicy: Always
   config:
-    verbosity: 2
+    verbosity: 3
     publicaddr: 846c424961adc146d54861bdf1eb6015e6908b689fd12d01c61307fffc848c22e514f5c898dc9243fbb17aa80750b556772599d84fe86a4b715f40ebc4c049bf
     nodekey: 09a28f7be03b782768ae2a8e2de90e7e27cd643a60f2a68e57514097bfa23566
+    extraFlags: []
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
   resources: {}