diff --git a/extras/cloudsql/create_cloudsql_instance.sh b/extras/cloudsql/create_cloudsql_instance.sh
index 88c36573c..f806941e5 100755
--- a/extras/cloudsql/create_cloudsql_instance.sh
+++ b/extras/cloudsql/create_cloudsql_instance.sh
@@ -19,8 +19,8 @@ echo "☁️ Enabling the Cloud SQL API..."
 gcloud config set project ${PROJECT_ID}
 gcloud services enable sqladmin.googleapis.com
 
-CSQL_EXISTS=$(gcloud sql instances list --filter="${INSTANCE_NAME}")
-if [ $CSQL_EXISTS = "Listed 0 items." ]; then
+CSQL_EXISTS=$(gcloud sql instances list --filter="${INSTANCE_NAME}" | wc -l)
+if [ $CSQL_EXISTS = "0" ]; then
   echo "☁️ Creating Cloud SQL instance: ${INSTANCE_NAME} ..."
   gcloud sql instances create $INSTANCE_NAME \
     --database-version=POSTGRES_12 --tier=db-custom-1-3840 \
@@ -35,15 +35,15 @@ gcloud sql users create admin \
    --instance=$INSTANCE_NAME --password=admin
 
 # Create Accounts DB
-ACCOUNTS_DB_EXISTS=$(gcloud sql databases list --instance=${INSTANCE_NAME} --filter="accounts-db")
-if [ $ACCOUNTS_DB_EXISTS = "Listed 0 items." ]; then
+ACCOUNTS_DB_EXISTS=$(gcloud sql databases list --instance=${INSTANCE_NAME} --filter="accounts-db" | wc -l)
+if [ $ACCOUNTS_DB_EXISTS = "0" ]; then
   echo "☁️ Creating accounts-db in ${INSTANCE_NAME}..."
   gcloud sql databases create accounts-db --instance=$INSTANCE_NAME
 fi
 
 # Create Ledger DB
-LEDGER_DB_EXISTS=$(gcloud sql databases list --instance=${INSTANCE_NAME} --filter="ledger-db")
-if [ $LEDGER_DB_EXISTS = "Listed 0 items." ]; then
+LEDGER_DB_EXISTS=$(gcloud sql databases list --instance=${INSTANCE_NAME} --filter="ledger-db" | wc -l)
+if [ $LEDGER_DB_EXISTS = "0" ]; then
   echo "☁️ Creating ledger-db in ${INSTANCE_NAME}..."
   gcloud sql databases create ledger-db --instance=$INSTANCE_NAME
 fi
diff --git a/extras/cloudsql/setup_workload_identity.sh b/extras/cloudsql/setup_workload_identity.sh
index ff758a7b8..58460848f 100755
--- a/extras/cloudsql/setup_workload_identity.sh
+++ b/extras/cloudsql/setup_workload_identity.sh
@@ -26,8 +26,8 @@ kubectl create namespace $NAMESPACE
 echo "✅ Creating GCP and K8s service accounts..."
 kubectl create serviceaccount --namespace $NAMESPACE $KSA_NAME
 
-SA_EXISTS=$(gcloud iam service-accounts list --filter="${GSA_NAME}")
-if [ $SA_EXISTS = "Listed 0 items." ]; then
+SA_EXISTS=$(gcloud iam service-accounts list --filter="${GSA_NAME}" | wc -l)
+if [ $SA_EXISTS = "0" ]; then
    gcloud iam service-accounts create $GSA_NAME
 fi