diff --git a/backup/bak-files/CSET.bak.part_aa b/backup/bak-files/CSET.bak.part_aa
index a8c48e6517..aaaa665e5d 100644
Binary files a/backup/bak-files/CSET.bak.part_aa and b/backup/bak-files/CSET.bak.part_aa differ
diff --git a/backup/bak-files/CSET.bak.part_ab b/backup/bak-files/CSET.bak.part_ab
index c6c10eacdd..1fd70eba95 100644
Binary files a/backup/bak-files/CSET.bak.part_ab and b/backup/bak-files/CSET.bak.part_ab differ
diff --git a/backup/bak-files/CSET.bak.part_ac b/backup/bak-files/CSET.bak.part_ac
deleted file mode 100644
index 81ebecea39..0000000000
Binary files a/backup/bak-files/CSET.bak.part_ac and /dev/null differ
diff --git a/backup/bak-files/CSET.bak.part_ad b/backup/bak-files/CSET.bak.part_ad
deleted file mode 100644
index 64bc21afc3..0000000000
Binary files a/backup/bak-files/CSET.bak.part_ad and /dev/null differ
diff --git a/backup/restoredb.sql b/backup/restoredb.sql
index b42ce129cf..cc399ef96a 100755
--- a/backup/restoredb.sql
+++ b/backup/restoredb.sql
@@ -1,6 +1,6 @@
 RESTORE DATABASE CSET
 FROM DISK = '/var/opt/mssql/backup/CSET.bak'
 WITH REPLACE,
-MOVE 'CSETWeb' TO '/var/opt/mssql/data/CSET.mdf',
-MOVE 'CSETWeb_Log' TO '/var/opt/mssql/data/CSET_Log.ldf'
+MOVE 'CSET' TO '/var/opt/mssql/data/CSET.mdf',
+MOVE 'CSET_log' TO '/var/opt/mssql/data/CSET_log.ldf'
 GO
diff --git a/taskfile.yml b/taskfile.yml
index d1e8e59ca3..7daec19e58 100644
--- a/taskfile.yml
+++ b/taskfile.yml
@@ -112,22 +112,22 @@ tasks:
     cmds:
       - docker compose -f compose.postgres.yml up -d db
 
-  split-bak:
+  split:bak:
     desc: Split the database backup file into smaller chunks
     cmds:
       - split -b 50M backup/CSET.bak backup/bak-files/CSET.bak.part_
 
-  create-bak:
+  create:bak:
     desc: Reassemble the database backup file from chunks
     cmds:
       - cat backup/bak-files/CSET.bak.part_* > backup/CSET.bak
 
-  load-bak:
+  load:bak:
     desc: Load the database backup file
     cmds:
       - docker exec -i cset-mssql /opt/mssql-tools/bin/sqlcmd -U 'sa' -P "Password123" -i /var/opt/mssql/backup/restoredb.sql
 
-  load-bak:dev:
+  load:bak:dev:
     desc: Load the database backup file (dev container)
     cmds:
       - docker exec -i cset-mssql-dev /opt/mssql-tools/bin/sqlcmd -U 'sa' -P "Password123" -i /var/opt/mssql/backup/restoredb.sql
@@ -146,17 +146,17 @@ tasks:
     desc: Open SQL shell for database exploration
     interactive: true
     cmds:
-      - docker exec -it cset-mssql /opt/mssql-tools18/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C
+      - docker exec -it cset-mssql /opt/mssql-tools/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C
 
   sql:query:
     desc: Execute a SQL query non-interactively (for coding agents)
     cmds:
-      - docker exec cset-mssql /opt/mssql-tools18/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C -W -s "|" -Q "{{.CLI_ARGS}}"
+      - docker exec cset-mssql /opt/mssql-tools/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C -W -s "|" -Q {{.CLI_ARGS}}
 
   sql:file:
     desc: Execute SQL from a file non-interactively
     cmds:
-      - docker exec -i cset-mssql /opt/mssql-tools18/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C -W -s "|" < {{.CLI_ARGS}}
+      - docker exec -i cset-mssql /opt/mssql-tools/bin/sqlcmd -U 'sa' -P "Password123" -d CSET -C -W -s "|" < {{.CLI_ARGS}}
 
   mssql-to-postgres:
     desc: Convert MSSQL .bak to PostgreSQL 17 backup