diff --git a/scripts/packaging/octez/debian/octez-baker.postinst b/scripts/packaging/octez/debian/octez-baker.postinst
index 1cae9310a29138b319f111d8aa682649a66bccf7..5e8ffb71af9c9efd02d3e9adeb2f49f27d203a73 100755
--- a/scripts/packaging/octez/debian/octez-baker.postinst
+++ b/scripts/packaging/octez/debian/octez-baker.postinst
@@ -21,7 +21,7 @@ for file in /usr/bin/octez-baker-*; do
 done
 
 db_subst octez-baker/baker-active-protocol choices "$PROTO_CHOICES"
-db_subst octez-baker/baker-next-protocol choices "$PROTO_CHOICES"
+db_subst octez-baker/baker-next-protocol choices "none, $PROTO_CHOICES"
 
 case "${1}" in
 configure)
diff --git a/scripts/packaging/octez/debian/octez-baker.templates b/scripts/packaging/octez/debian/octez-baker.templates
index db957b78aa3fad2c8f4add9fda80f0746275ee95..fde89870f39716473004c6213f8280b7eb5c1081 100644
--- a/scripts/packaging/octez/debian/octez-baker.templates
+++ b/scripts/packaging/octez/debian/octez-baker.templates
@@ -16,18 +16,17 @@ Description: The baker key to associate to this baker:
 Type: string
 
 Template: octez-baker/baker-active-protocol
-Description: The protocol associated to the baker:
- For production bakers this is the protocol of mainnet. Upon activation
- both the baker for the active protocol and the next protocol must be running
- at the same time.
+Description: The active protocol associated to the baker:
+ Bakers use the current protocol of mainnet/ghostnet for production/staging, respectively.
 Type: select
 Choices: ${choices}
 
 Template: octez-baker/baker-next-protocol
-Description: The protocol associated to the baker:
- For production bakers this is the adopted mainnet protocol. Upon activation
+Description: The next protocol associated to the baker upon activation:
+ This is the next adopted mainnet protocol. Upon activation
  both the baker for the active protocol and the next protocol must be running
- at the same time. You can leave this field empty.
+ at the same time. You can choose the value "none" if you don't know
+ what to choose now.
  .
  After activation you can re-configure the package to stop the baker for the
  old protocol and mark the freshly activated protocol as active.