diff --git a/deploy/all.sh b/deploy/all.sh
index 254cc40c9275b5fc2c89c785a1838dac26d73ba7..484640c67b34ad0253738b996902ef75a887dbc8 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -18,6 +18,9 @@
 # Read deployment settings
 ########################################################################################################################
 
+
+# ----- TeraFlowSDN ------------------------------------------------------------
+
 # If not already set, set the URL of the Docker registry where the images will be uploaded to.
 # By default, assume internal MicroK8s registry is used.
 export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}
@@ -42,6 +45,9 @@ export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}
 # If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
 export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-""}
 
+
+# ----- CockroachDB ------------------------------------------------------------
+
 # If not already set, set the namespace where CockroackDB will be deployed.
 export CRDB_NAMESPACE=${CRDB_NAMESPACE:-"crdb"}
 
@@ -84,6 +90,9 @@ export CRDB_DROP_DATABASE_IF_EXISTS=${CRDB_DROP_DATABASE_IF_EXISTS:-""}
 # If CRDB_REDEPLOY is "YES", the database will be dropped while checking/deploying CockroachDB.
 export CRDB_REDEPLOY=${CRDB_REDEPLOY:-""}
 
+
+# ----- NATS -------------------------------------------------------------------
+
 # If not already set, set the namespace where NATS will be deployed.
 export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}
 
@@ -98,6 +107,9 @@ export NATS_SECRET_NAMESPACE=${NATS_SECRET_NAMESPACE:-${TFS_K8S_NAMESPACE}}
 # If NATS_REDEPLOY is "YES", the message broker will be dropped while checking/deploying NATS.
 export NATS_REDEPLOY=${NATS_REDEPLOY:-""}
 
+
+# ----- QuestDB ----------------------------------------------------------------
+
 # If not already set, set the namespace where QuestDB will be deployed.
 export QDB_NAMESPACE=${QDB_NAMESPACE:-"qdb"}
 
@@ -119,7 +131,7 @@ export QDB_TABLE=${QDB_TABLE:-"tfs_monitoring"}
 # If not already set, disable flag for re-deploying QuestDB from scratch.
 # WARNING: ACTIVATING THIS FLAG IMPLIES LOOSING THE DATABASE INFORMATION!
 # If QDB_REDEPLOY is "YES", the database will be dropped while checking/deploying QuestDB.
-export QDB_REDEPLOY=${QDB_REDEPLOY:-"YES"}
+export QDB_REDEPLOY=${QDB_REDEPLOY:-""}
 
 
 ########################################################################################################################
@@ -135,7 +147,7 @@ export QDB_REDEPLOY=${QDB_REDEPLOY:-"YES"}
 # Deploy QuestDB
 ./deploy/qdb.sh
 
-# Deploy TFS
+# Deploy TeraFlowSDN
 ./deploy/tfs.sh
 
 # Show deploy summary