diff --git a/scripts/cockroachdb_client.sh b/scripts/cockroachdb_client.sh
index 6ac9eea6e429e535b1a788a2f5eb54cec573c082..edd9794465e0afa5acc743a3b4375040b793857d 100755
--- a/scripts/cockroachdb_client.sh
+++ b/scripts/cockroachdb_client.sh
@@ -13,4 +13,39 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-kubectl exec -it cockroachdb-client-secure --namespace crdb -- ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public
+
+########################################################################################################################
+# Read deployment settings
+########################################################################################################################
+
+# If not already set, set the namespace where CockroackDB will be deployed.
+export CRDB_NAMESPACE=${CRDB_NAMESPACE:-"crdb"}
+
+# If not already set, set the database username to be used by Context.
+export CRDB_USERNAME=${CRDB_USERNAME:-"tfs"}
+
+# If not already set, set the database user's password to be used by Context.
+export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}
+
+# If not already set, set the database name to be used by Context.
+export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}
+
+# If not already set, set CockroachDB installation mode. Accepted values are: 'single' and 'cluster'.
+export CRDB_DEPLOY_MODE=${CRDB_DEPLOY_MODE:-"single"}
+
+
+########################################################################################################################
+# Automated steps start here
+########################################################################################################################
+
+if [ "$CRDB_DEPLOY_MODE" == "single" ]; then
+    CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
+    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${CRDB_SQL_PORT}/defaultdb?sslmode=require"
+    kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
+        ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL}
+elif [ "$CRDB_DEPLOY_MODE" == "cluster" ]; then
+    kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-client-secure -- \
+        ./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public
+else
+    echo "Unsupported value: CRDB_DEPLOY_MODE=$CRDB_DEPLOY_MODE"
+fi