diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
index cdcafa9fa..39db9fb41 100644
--- a/.github/workflows/system-test.yml
+++ b/.github/workflows/system-test.yml
@@ -173,7 +173,7 @@ jobs:
         needs: [ waitForNative, buildMockserver ]
         runs-on: windows-latest
         env:
-            spring_profiles_active: systemtest,core
+            spring_profiles_active: build,systemtest,core
             nzbhydra_port: 5076
             nzbhydra.port: 5076
             nzbhydra_name: windows
@@ -224,6 +224,10 @@ jobs:
             - name: "List files in folder"
               run: ls
 
+            - name: "Add mockserver to /etc/hosts"
+              run: |
+                  sudo echo "127.0.0.1 mockserver" | sudo tee -a /etc/hosts
+
             - name: "Start mock server and hydra, run tests"
               uses: BerniWittmann/background-server-action@v1
               with:
@@ -232,12 +236,16 @@ jobs:
 
             - name: "Shutdown hydra"
               uses: fjogeleit/http-request-action@v1
+              if: always()
+              continue-on-error: true
               with:
                   method: "GET"
                   url: "http://127.0.0.1:5076/internalapi/control/shutdown"
 
             - name: "Shutdown mockserver"
               uses: fjogeleit/http-request-action@v1
+              if: always()
+              continue-on-error: true
               with:
                   method: "POST"
                   url: "http://127.0.0.1:5080/actuator/shutdown"