diff --git a/my_deploy.sh b/my_deploy.sh
index a048edb30b66791d5405961b41faf2443f9d51e1..178c8e6fd1445aa062d1920f82e8024bb037e102 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -134,7 +134,7 @@ export CRDB_PASSWORD="tfs123"
 export CRDB_DEPLOY_MODE="single"
 
 # Disable flag for dropping database, if it exists.
-export CRDB_DROP_DATABASE_IF_EXISTS=""
+export CRDB_DROP_DATABASE_IF_EXISTS="YES"
 
 # Disable flag for re-deploying CockroachDB from scratch.
 export CRDB_REDEPLOY=""
@@ -186,7 +186,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
 export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"
 
 # Disable flag for dropping tables if they exist.
-export QDB_DROP_TABLES_IF_EXIST=""
+export QDB_DROP_TABLES_IF_EXIST="YES"
 
 # Disable flag for re-deploying QuestDB from scratch.
 export QDB_REDEPLOY=""
diff --git a/quick_deploy.sh b/quick_deploy.sh
index ade0c280525dda9ff19357ae22ee52c0aa5cdb7b..585fcfbc7534107e9a96450135dd592ca8737d66 100755
--- a/quick_deploy.sh
+++ b/quick_deploy.sh
@@ -47,7 +47,7 @@ export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-"YES"}
 
 # If TFS_SKIP_BUILD is "YES", select the containers to be build
 # Any other container will use previous docker images
-export TFS_QUICK_COMPONENTS="device"
+export TFS_QUICK_COMPONENTS="context"
 
 # ----- CockroachDB ------------------------------------------------------------