diff --git a/Build/scripts/Start-Mssql.ps1 b/Build/scripts/Start-Mssql.ps1
index bcba0956..a69b1251 100644
--- a/Build/scripts/Start-Mssql.ps1
+++ b/Build/scripts/Start-Mssql.ps1
@@ -1,7 +1,7 @@
 function Start-Mssql {
     param ()
 
-    $container = Start-Container -Image sqldatabase/mssql:2017 -ContainerPort 1433
+    $container = Start-Container -Image sqldatabase/mssql:2025 -ContainerPort 1433
     $port = $container.port
 
     $builder = New-Object -TypeName System.Data.SqlClient.SqlConnectionStringBuilder
diff --git a/Build/tasks/create-images-tasks.ps1 b/Build/tasks/create-images-tasks.ps1
index da815842..f0b2ed2c 100644
--- a/Build/tasks/create-images-tasks.ps1
+++ b/Build/tasks/create-images-tasks.ps1
@@ -14,12 +14,12 @@ Enter-Build {
 }
 
 task BuildMsSqlDatabase {
-    $dockerfile = Join-Path $context 'image-mssql-2017.dockerfile'
+    $dockerfile = Join-Path $context 'image-mssql.dockerfile'
     exec {
         docker build `
             --pull `
             -f $dockerfile `
-            -t sqldatabase/mssql:2017 `
+            -t sqldatabase/mssql:2025 `
             $context
     }
 }
diff --git a/Build/tests.txt b/Build/tests.txt
deleted file mode 100644
index 3978cfe4..00000000
--- a/Build/tests.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-mcr.microsoft.com/powershell:6.0.2-ubuntu-16.04
-	Create-SqlDatabase : Invalid command line. ---> Could not load file or assembly 'System.Data.SqlClient, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'. The system cannot find the file specified.
-	
-mcr.microsoft.com/powershell:6.0.4-ubuntu-16.04
-	Create-SqlDatabase : Could not load file or assembly 'System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified.
\ No newline at end of file
diff --git a/Sources/Docker/docker-compose.yml b/Sources/Docker/docker-compose.yml
index 00319a8c..79eef9d4 100644
--- a/Sources/Docker/docker-compose.yml
+++ b/Sources/Docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   mssql:
-    image: sqldatabase/mssql:2017
+    image: sqldatabase/mssql:2025
     restart: always
     ports:
       - 1433:1433
diff --git a/Sources/Docker/image-mssql-2017.dockerfile b/Sources/Docker/image-mssql-2017.dockerfile
deleted file mode 100644
index 24069fc1..00000000
--- a/Sources/Docker/image-mssql-2017.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM mcr.microsoft.com/mssql/server:2017-latest AS build
-
-ENV ACCEPT_EULA=Y \
-   SA_PASSWORD=P@ssw0rd \
-   MSSQL_PID=Express
-
-COPY mssql.create-database.sql /db/
-
-RUN /opt/mssql/bin/sqlservr & \
-   sleep 20 && \
-   /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P P@ssw0rd -l 300 -i /db/mssql.create-database.sql && \
-   ls /var/opt/mssql/data/ && \
-   pkill sqlservr
-
-FROM mcr.microsoft.com/mssql/server:2017-latest AS runtime
-
-ENV ACCEPT_EULA=Y \
-   SA_PASSWORD=P@ssw0rd \
-   MSSQL_PID=Express
-
-COPY --from=build /var/opt/mssql/data/* /var/opt/mssql/data/
\ No newline at end of file
diff --git a/Sources/Docker/image-mssql.dockerfile b/Sources/Docker/image-mssql.dockerfile
new file mode 100644
index 00000000..c7ecade0
--- /dev/null
+++ b/Sources/Docker/image-mssql.dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/mssql/server:2025-latest AS build
+
+ENV ACCEPT_EULA=Y \
+   SA_PASSWORD=P@ssw0rd \
+   MSSQL_PID=Express
+
+COPY mssql.create-database.sql /app/
+
+RUN /opt/mssql/bin/sqlservr & \
+   sleep 20 && \
+   /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P P@ssw0rd -l 300 -C -i /app/mssql.create-database.sql && \
+   ls /var/opt/mssql/data/ && \
+   pkill sqlservr
+
+FROM mcr.microsoft.com/mssql/server:2025-latest AS runtime
+
+ENV ACCEPT_EULA=Y \
+   SA_PASSWORD=P@ssw0rd \
+   MSSQL_PID=Express
+
+COPY --chown=mssql:mssql --from=build /var/opt/mssql/data/* /var/opt/mssql/data/
\ No newline at end of file