diff --git a/deploy/nats.sh b/deploy/nats.sh
index 004f67c44986f776adaca34a9272aff264ec034c..d6782c22f0699fcd46c931207d6664608afd244c 100755
--- a/deploy/nats.sh
+++ b/deploy/nats.sh
@@ -56,8 +56,10 @@ function nats_deploy_single() {
     if kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; then
         echo ">>> NATS is present; skipping step."
     else
+        # TESTING - Experimenting with cluster
         echo ">>> Deploy NATS"
-        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine
+        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine --set config.cluster.enabled=true --set config.cluster.tls.enabled=true
+
 
         echo ">>> Waiting NATS statefulset to be created..."
         while ! kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; do
diff --git a/my_deploy.sh b/my_deploy.sh
index 7dd5e5c3ee13cbce2b701b5b4e703823dfb2c28f..7ea4d49413d3bf1b3f1b73c2ec0866d021883710 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -96,7 +96,7 @@ export CRDB_DATABASE="tfs"
 
 # Set CockroachDB installation mode to 'single'. This option is convenient for development and testing.
 # See ./deploy/all.sh or ./deploy/crdb.sh for additional details
-export CRDB_DEPLOY_MODE="single"
+export CRDB_DEPLOY_MODE="cluster"
 
 # Disable flag for dropping database, if it exists.
 export CRDB_DROP_DATABASE_IF_EXISTS=""