diff --git a/src/test/resources/docker/docker-compose.yml b/src/test/resources/docker/docker-compose.yml
index c3a77c14c..a3f16fab8 100644
--- a/src/test/resources/docker/docker-compose.yml
+++ b/src/test/resources/docker/docker-compose.yml
@@ -308,7 +308,7 @@ services:
 
   crdb-20.2:
     image: cockroachdb/cockroach:v20.2.19
-    command: start-single-node --insecure
+    command: start-single-node
     expose:
       - "8080"
       - "26257"
@@ -330,7 +330,7 @@ services:
 
   crdb-21.1:
     image: cockroachdb/cockroach:v21.1.16
-    command: start-single-node --insecure
+    command: start-single-node
     expose:
       - "8080"
       - "26257"
@@ -352,7 +352,7 @@ services:
 
   crdb-21.2:
     image: cockroachdb/cockroach:v21.2.7
-    command: start-single-node --insecure
+    command: start-single-node
     expose:
       - "8080"
       - "26257"
@@ -375,7 +375,7 @@ services:
 
   crdb-22.1:
     image: cockroachdb/cockroach-unstable:v22.1.0-beta.4
-    command: start-single-node --insecure
+    command: start-single-node
     expose:
       - "8080"
       - "26257"
diff --git a/src/test/resources/docker/setup_db.sh b/src/test/resources/docker/setup_db.sh
index 3de1d2e02..ab2c2fc15 100755
--- a/src/test/resources/docker/setup_db.sh
+++ b/src/test/resources/docker/setup_db.sh
@@ -3,8 +3,9 @@
 #sleep 10
 
 HOST=$1
-HOSTPARAMS="--host $HOST --insecure"
-SQL="/cockroach/cockroach.sh sql $HOSTPARAMS"
+ARGS=$2
+HOSTPARAMS="--host $HOST"
+SQL="/cockroach/cockroach.sh sql $HOSTPARAMS $ARGS"
 
 $SQL -e "CREATE DATABASE lbcat;"
 $SQL -e "CREATE USER lbuser;"