diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
index fc42a55bd..cdcafa9fa 100644
--- a/.github/workflows/system-test.yml
+++ b/.github/workflows/system-test.yml
@@ -228,12 +228,24 @@ jobs:
               uses: BerniWittmann/background-server-action@v1
               with:
                   start: ./core.exe directstart, java -jar ./exec.jar
-                  #                  wait-on: 'http://localhost:5076, http://localhost:5080'
                   command: mvn --batch-mode test -pl org.nzbhydra.tests:system -DtrimStackTrace=false
 
+            - name: "Shutdown hydra"
+              uses: fjogeleit/http-request-action@v1
+              with:
+                  method: "GET"
+                  url: "http://127.0.0.1:5076/internalapi/control/shutdown"
+
+            - name: "Shutdown mockserver"
+              uses: fjogeleit/http-request-action@v1
+              with:
+                  method: "POST"
+                  url: "http://127.0.0.1:5080/actuator/shutdown"
+
             - name: "Upload data folder artifact"
               uses: actions/upload-artifact@v3
               if: always()
+              continue-on-error: true
               with:
                   name: dataWindows
                   path: data
diff --git a/other/mockserver/pom.xml b/other/mockserver/pom.xml
index 2d0f078fb..8d8edb9f8 100644
--- a/other/mockserver/pom.xml
+++ b/other/mockserver/pom.xml
@@ -116,7 +116,11 @@
             <version>3.0.0</version>
             <scope>runtime</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring.boot.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/other/mockserver/src/main/resources/application-systemtest.properties b/other/mockserver/src/main/resources/application-build.properties
similarity index 100%
rename from other/mockserver/src/main/resources/application-systemtest.properties
rename to other/mockserver/src/main/resources/application-build.properties
diff --git a/other/mockserver/src/main/resources/application.properties b/other/mockserver/src/main/resources/application.properties
index b564718f2..a349341ca 100644
--- a/other/mockserver/src/main/resources/application.properties
+++ b/other/mockserver/src/main/resources/application.properties
@@ -1,3 +1,5 @@
 server.port=5080
 #spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/
-warnLogCategory
\ No newline at end of file
+management.endpoints.web.exposure.include=*
+management.endpoint.shutdown.enabled=true
+endpoints.shutdown.enabled=true
\ No newline at end of file