diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 7c3763d1e41ca98e062a054e82f95f319ae87d90..2ac8251f148ec98a8d163714acb35054511d53d6 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -405,8 +405,8 @@ case ${TEST_SUITE} in
                 ;;
             mssql)
                 [[ ! -z "$DATABASE_DRIVER" ]] && echo "Using driver: ${DATABASE_DRIVER}"
-                docker-compose run prepare_functional_mssql2017cu9
-                docker-compose run functional_mssql2017cu9
+                docker-compose run prepare_functional_mssql2017cu17
+                docker-compose run functional_mssql2017cu17
                 SUITE_EXIT_CODE=$?
                 ;;
             mssql2017latest)
diff --git a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
index ac33f6fd7e524549d590a6d2c302ed995c9567a9..7086fac2a37ecb355f789a6a604b9fea71e9f3b7 100644
--- a/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
+++ b/Build/bamboo/src/main/java/core/AbstractCoreSpec.java
@@ -674,7 +674,7 @@ abstract class AbstractCoreSpec {
                                 "        -e typo3DatabaseHost=localhost \\\n" +
                                 "        -e typo3DatabasePort=1433 \\\n" +
                                 "        -e typo3DatabaseCharset=utf-8 \\\n" +
-                                "        -e typo3DatabaseHost=mssql2017cu9 \\\n" +
+                                "        -e typo3DatabaseHost=mssql2017cu17 \\\n" +
                                 "        -e typo3TestingRedisHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_redis4_1 \\\n" +
                                 "        -e typo3TestingMemcachedHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_memcached1-5_1 \\\n" +
                                 "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
@@ -741,7 +741,7 @@ abstract class AbstractCoreSpec {
                                 "        -e typo3DatabaseHost=localhost \\\n" +
                                 "        -e typo3DatabasePort=1433 \\\n" +
                                 "        -e typo3DatabaseCharset=utf-8 \\\n" +
-                                "        -e typo3DatabaseHost=mssql2017cu9 \\\n" +
+                                "        -e typo3DatabaseHost=mssql2017cu17 \\\n" +
                                 "        -e typo3TestingRedisHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_redis4_1 \\\n" +
                                 "        -e typo3TestingMemcachedHost=${BAMBOO_COMPOSE_PROJECT_NAME}sib_memcached1-5_1 \\\n" +
                                 "        --name ${BAMBOO_COMPOSE_PROJECT_NAME}sib_adhoc \\\n" +
diff --git a/Build/bamboo/src/main/java/core/NightlySpec.java b/Build/bamboo/src/main/java/core/NightlySpec.java
index 5faa26ff3623a395418577bbef83403a03ad5f43..603c59e825503e4a7b5289494e6d0aefa7b03be9 100644
--- a/Build/bamboo/src/main/java/core/NightlySpec.java
+++ b/Build/bamboo/src/main/java/core/NightlySpec.java
@@ -111,10 +111,10 @@ public class NightlySpec extends AbstractCoreSpec {
                 stageCodeceptionPgSqlStage,
                 stageFunctionalMySqlStage,
                 stageFunctionalMySqlPdoStage,
-                stageFunctionalMsSqlStage,
-                stageFunctionalMsSqlPdoStage,
                 stageFunctionalPgSqlStage,
-                stageFunctionalSqLiteStage
+                stageFunctionalSqLiteStage,
+                stageFunctionalMsSqlStage,
+                stageFunctionalMsSqlPdoStage
             )
             .linkedRepositories("github TYPO3 TYPO3.CMS")
             .triggers(
diff --git a/Build/testing-docker/bamboo/docker-compose.yml b/Build/testing-docker/bamboo/docker-compose.yml
index c1d568972f1625627db244c4e7f5e143aec3e965..f993b3c76d1c096aaa13cfb5cb7c4d081dadfc33 100644
--- a/Build/testing-docker/bamboo/docker-compose.yml
+++ b/Build/testing-docker/bamboo/docker-compose.yml
@@ -23,8 +23,8 @@ services:
       - /var/lib/postgresql/data:rw,noexec,nosuid
     networks:
       - test
-  mssql2017cu9:
-    image: mcr.microsoft.com/mssql/server:2017-CU9-ubuntu
+  mssql2017cu17:
+    image: mcr.microsoft.com/mssql/server:2017-CU17-ubuntu
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: Test1234!
@@ -156,7 +156,7 @@ services:
   start_dependencies_functional_mssql:
     image: alpine:3.8
     links:
-      - mssql2017cu9
+      - mssql2017cu17
       - redis4
       - memcached1-5
     networks:
@@ -165,7 +165,7 @@ services:
       /bin/sh -c "
         echo Waiting for database start
         COUNT=0
-        while ! nc -z mssql2017cu9 1433; do
+        while ! nc -z mssql2017cu17 1433; do
           if [ "$${COUNT}" -ge "60" ]; then
             echo Database did not come up
             exit 1
diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml
index 5b388a228dc5162415b83708559f0998bc82284c..da18531098b955e98a62c0581aae6e7c0185be9b 100644
--- a/Build/testing-docker/local/docker-compose.yml
+++ b/Build/testing-docker/local/docker-compose.yml
@@ -17,8 +17,8 @@ services:
     tmpfs:
       - /var/lib/mysql/:rw,noexec,nosuid
 
-  mssql2017cu9:
-    image: mcr.microsoft.com/mssql/server:2017-CU9-ubuntu
+  mssql2017cu17:
+    image: mcr.microsoft.com/mssql/server:2017-CU17-ubuntu
     environment:
       ACCEPT_EULA: Y
       SA_PASSWORD: "Test1234!"
@@ -598,10 +598,10 @@ services:
         fi
       "
 
-  prepare_functional_mssql2017cu9:
+  prepare_functional_mssql2017cu17:
     image: alpine:3.8
     links:
-      - mssql2017cu9
+      - mssql2017cu17
       - redis4
       - memcached1-5
     command: >
@@ -610,12 +610,12 @@ services:
           set -x
         fi
         echo Waiting for database start...;
-        while ! nc -z mssql2017cu9 1433; do
+        while ! nc -z mssql2017cu17 1433; do
           sleep 1;
         done;
         echo Database is up;
       "
-  functional_mssql2017cu9:
+  functional_mssql2017cu17:
     image: typo3gmbh/${DOCKER_PHP_IMAGE}:latest
     user: ${HOST_UID}
     volumes:
@@ -630,7 +630,7 @@ services:
       typo3DatabaseUsername: SA
       typo3DatabasePort: 1433
       typo3DatabaseCharset: utf-8
-      typo3DatabaseHost: mssql2017cu9
+      typo3DatabaseHost: mssql2017cu17
       typo3TestingRedisHost: redis4
       typo3TestingMemcachedHost: memcached1-5
     working_dir: ${CORE_ROOT}