diff --git a/.github/actions/startdeps/action.yml b/.github/actions/startdeps/action.yml
index 70171efbf..6e84ff4b2 100644
--- a/.github/actions/startdeps/action.yml
+++ b/.github/actions/startdeps/action.yml
@@ -22,4 +22,4 @@ runs:
     - name: Build the docker-compose stack
       if: inputs.module-name == 'openmaqs-database'
       shell: bash
-      run: docker-compose -f docker/MAQSSQLServer/docker-compose.yml -p OpenMAQS/openmaqs-java up -d
+      run: docker compose -f docker/MAQSSQLServer/docker-compose.yml -p openmaqs-java up -d
diff --git a/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh b/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh
index bd3f97f63..da99e46ca 100644
--- a/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh
+++ b/docker/MAQSSQLServer/initialize_and_start_sqlserver.sh
@@ -6,7 +6,7 @@
     while [ $not_ready != 0 ]
     do
         # Wait for the return code of the following statement to be zero
-        /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -Q "SELECT TOP 1 message_id FROM sys.messages"
+        /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -C -Q "SELECT TOP 1 message_id FROM sys.messages"
         not_ready=$?
 
         if [ $not_ready != 0 ]
@@ -18,17 +18,17 @@
 
     echo "Started initializing database"
     # Set up the schema and stored procedures
-    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -i `dirname $0`/schema.sql
-    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P globalMAQS2 -d master -i `dirname $0`/stored_procedures.sql
+    /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -C -P globalMAQS2 -d master -i `dirname $0`/schema.sql
+    /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -C -P globalMAQS2 -d master -i `dirname $0`/stored_procedures.sql
     # Use BCP to import test data
-    /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.States in "`dirname $0`/SeedData/GlobalAutomation/States.bcp" \
-        -n -S localhost -U sa -P globalMAQS2
-    /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.Cities in "`dirname $0`/SeedData/GlobalAutomation/Cities.bcp" \
-        -n -S localhost -U sa -P globalMAQS2
-    /opt/mssql-tools/bin/bcp GlobalAutomation.dbo.Datatype in "`dirname $0`/SeedData/GlobalAutomation/Datatype.bcp" \
-        -n -S localhost -U sa -P globalMAQS2
+    /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.States in "`dirname $0`/SeedData/GlobalAutomation/States.bcp" \
+        -n -u -S localhost -U sa -P globalMAQS2
+    /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.Cities in "`dirname $0`/SeedData/GlobalAutomation/Cities.bcp" \
+        -n -u -S localhost -U sa -P globalMAQS2
+    /opt/mssql-tools18/bin/bcp GlobalAutomation.dbo.Datatype in "`dirname $0`/SeedData/GlobalAutomation/Datatype.bcp" \
+        -n -u -S localhost -U sa -P globalMAQS2
     echo "Finished initializing database"
 }&
 
 # Start SQL server
-exec /opt/mssql/bin/sqlservr
\ No newline at end of file
+exec /opt/mssql/bin/sqlservr