diff --git a/ebean-test/src/test/java/main/StartSqlServer.java b/ebean-test/src/test/java/main/StartSqlServer.java
index 167617698..d81d712c4 100644
--- a/ebean-test/src/test/java/main/StartSqlServer.java
+++ b/ebean-test/src/test/java/main/StartSqlServer.java
@@ -5,7 +5,7 @@ import io.ebean.test.containers.SqlServerContainer;
 public class StartSqlServer {
 
   public static void main(String[] args) {
-    SqlServerContainer.builder("2019-GA-ubuntu-16.04")
+    SqlServerContainer.builder("2022-RTM-CU2-ubuntu-20.04")
       .dbName("test_ebean")
       .user("test_ebean")
       .build()
diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties
index 9dec823ee..4f0a71f87 100644
--- a/ebean-test/src/test/resources/ebean.properties
+++ b/ebean-test/src/test/resources/ebean.properties
@@ -177,8 +177,8 @@ ebean.sqlserver.databasePlatformName=sqlserver17
 #ebean.sqlserver.caseSensitiveCollation=false
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
-#datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
-datasource.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
+datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
+#datasource.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
 #datasource.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 datasource.nuodb.schema=test_user
diff --git a/ebean-test/testconfig/ebean-sqlserver17.properties b/ebean-test/testconfig/ebean-sqlserver17.properties
index 103b1fea2..4bf54e54e 100644
--- a/ebean-test/testconfig/ebean-sqlserver17.properties
+++ b/ebean-test/testconfig/ebean-sqlserver17.properties
@@ -1,6 +1,6 @@
 ebean.test.platform=sqlserver
 ebean.test.dbName=test_ebean
-ebean.test.sqlserver.version=2017-CU28-ubuntu-16.04
+ebean.test.sqlserver.version=2022-RTM-CU2-ubuntu-20.04
 ebean.test.sqlserver.containerName=local_sqlserver2017
 ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CS_AS_SC
 ebean.test.sqlserver.port=9435