diff --git a/deploy/all.sh b/deploy/all.sh
index 204bbcfe2595e14ca863778d77f77af2ee82ec13..c5d423a2f5112704f529670cb8bf18b8be7d4642 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -107,7 +107,6 @@ export NATS_EXT_PORT_CLIENT=${NATS_EXT_PORT_CLIENT:-"4222"}
 # If not already set, set the external port NATS HTTP Mgmt GUI interface will be exposed to.
 export NATS_EXT_PORT_HTTP=${NATS_EXT_PORT_HTTP:-"8222"}
 
-# TESTING
 # If not already set, set NATS installation mode. Accepted values are: 'single' and 'cluster'.
 # - If NATS_DEPLOY_MODE is "single", NATS is deployed in single node mode. It is convenient for
 #   development and testing purposes and should fit in a VM. IT SHOULD NOT BE USED IN PRODUCTION ENVIRONMENTS.
diff --git a/deploy/nats.sh b/deploy/nats.sh
index 9cc11ca8b4facf357436d8ff2ecfb775f7ebbbee..57fda629cf9a1cb62cf5100ba609147bb92168fc 100755
--- a/deploy/nats.sh
+++ b/deploy/nats.sh
@@ -31,7 +31,6 @@ export NATS_EXT_PORT_CLIENT=${NATS_EXT_PORT_CLIENT:-"4222"}
 # If not already set, set the external port NATS HTTP Mgmt GUI interface will be exposed to.
 export NATS_EXT_PORT_HTTP=${NATS_EXT_PORT_HTTP:-"8222"}
 
-# TESTING
 # If not already set, set NATS installation mode. Accepted values are: 'single' and 'cluster'.
 # - If NATS_DEPLOY_MODE is "single", NATS is deployed in single node mode. It is convenient for
 #   development and testing purposes and should fit in a VM. IT SHOULD NOT BE USED IN PRODUCTION ENVIRONMENTS.
@@ -73,7 +72,8 @@ function nats_deploy_single() {
         echo ">>> NATS is present; skipping step."
     else
         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/manifests/cockroachdb/cluster.yaml b/manifests/cockroachdb/cluster.yaml
index 73875ca3f5edef43208b8ac79cdc1ec3c38d9ec6..bcb0c704948ecdbd8b271b68e685c481e669594b 100644
--- a/manifests/cockroachdb/cluster.yaml
+++ b/manifests/cockroachdb/cluster.yaml
@@ -33,13 +33,11 @@ spec:
   resources:
     requests:
       # This is intentionally low to make it work on local k3d clusters.
-      # TESTING
-      cpu: 1 #4
-      memory: 500Mi #4Gi
+      cpu: 4
+      memory: 4Gi
     limits:
-      # TESTING
-      cpu: 1 #8
-      memory: 1Gi #8Gi
+      cpu: 8
+      memory: 8Gi
   tlsEnabled: true
   # You can set either a version of the db or a specific image name
   # cockroachDBVersion: v22.2.8
@@ -54,7 +52,6 @@ spec:
   # disabled by default. To enable please see the operator.yaml file.
 
   # The affinity field will accept any podSpec affinity rule.
-  # TESTING: Force one pod per node, if possible
   topologySpreadConstraints:
   - maxSkew: 1
     topologyKey: kubernetes.io/hostname  
diff --git a/manifests/cockroachdb/operator.yaml b/manifests/cockroachdb/operator.yaml
index 0d578410c37744e038ec81a04fd1a08eee4b8425..d8e691308e4cc16af3f545d87244281ab0730696 100644
--- a/manifests/cockroachdb/operator.yaml
+++ b/manifests/cockroachdb/operator.yaml
@@ -381,7 +381,6 @@ spec:
     spec:
       containers:
       - args:
-        # TESTING
         - -feature-gates=TolerationRules=true,AffinityRules=true,TopologySpreadRules=true
         - -zap-log-level
         - info
diff --git a/manifests/nats/cluster.yaml b/manifests/nats/cluster.yaml
index 39e41958fa8fee02f9e49b08ba88e7e3025131cb..491c86628fc7769c3dbde4cdd6b2a2e98e7ab904 100644
--- a/manifests/nats/cluster.yaml
+++ b/manifests/nats/cluster.yaml
@@ -9,11 +9,11 @@ container:
     # recommended limit is at least 2 CPU cores and 8Gi Memory for production JetStream clusters
     resources:
       requests:
-        cpu: 1 # 2
-        memory: 500Mi # 4Gi
+        cpu: 1
+        memory: 500Mi
       limits:
-        cpu: 1 # 4
-        memory: 1Gi # 8Gi 
+        cpu: 1
+        memory: 1Gi
 
 config:
   cluster:
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index 58e1a65a0a13945f9f790d26d48371a8073d3adb..132839edd95dfb742a56034f9a34406292199033 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -117,7 +117,6 @@ spec:
   - name: grafana
     port: 3000
     targetPort: 3000
-# TESTING
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
diff --git a/my_deploy.sh b/my_deploy.sh
index 0b7a259de68c286541ca0850e464985180dd3956..991c21e711618d0c33f891051a84deb4b8479a93 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -108,7 +108,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="cluster"
+export CRDB_DEPLOY_MODE="single"
 
 # Disable flag for dropping database, if it exists.
 export CRDB_DROP_DATABASE_IF_EXISTS=""
@@ -128,7 +128,6 @@ export NATS_EXT_PORT_CLIENT="4222"
 # Set the external port NATS HTTP Mgmt GUI interface will be exposed to.
 export NATS_EXT_PORT_HTTP="8222"
 
-# TESTING
 # Set NATS installation mode to 'single'. This option is convenient for development and testing.
 # See ./deploy/all.sh or ./deploy/nats.sh for additional details
 export NATS_DEPLOY_MODE="single"