diff --git a/.github/workflows/buildNative.yml b/.github/workflows/buildNative.yml
index ae1500ff3..cb8313ea9 100644
--- a/.github/workflows/buildNative.yml
+++ b/.github/workflows/buildNative.yml
@@ -61,11 +61,11 @@ jobs:
 
             -   name: "Install all with Maven"
                 if: steps.changed-files-specific.outputs.any_changed == 'true'
-                run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -pl !org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,!org.nzbhydra:windows-release,!org.nzbhydra:generic-release -DskipTests -T 1C
+                run: mvn --batch-mode clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -pl !org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,!org.nzbhydra:windows-release,!org.nzbhydra:generic-release -DskipTests -T 1C
 
             -   name: "Run unit tests"
                 if: steps.changed-files-specific.outputs.any_changed == 'true'
-                run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test -T 1C -pl !org.nzbhydra:tests,!org.nzbhydra.tests:system --fail-at-end
+                run: mvn --batch-mode test -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -T 1C -pl !org.nzbhydra:tests,!org.nzbhydra.tests:system --fail-at-end
 
             -   name: "Create test Report"
                 uses: dorny/test-reporter@v1
@@ -80,7 +80,7 @@ jobs:
                 if: steps.changed-files-specific.outputs.any_changed == 'true'
                 working-directory: ./core
                 run: |
-                    mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Pnative clean native:compile -DskipTests
+                    mvn --batch-mode -Pnative clean native:compile -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
             -   name: "Upload linux artifact"
                 if: steps.changed-files-specific.outputs.any_changed == 'true' && startsWith(matrix.os,'ubuntu')
diff --git a/.github/workflows/system-test.yml b/.github/workflows/system-test.yml
index f8c27a02b..fd5a05c10 100644
--- a/.github/workflows/system-test.yml
+++ b/.github/workflows/system-test.yml
@@ -52,9 +52,9 @@ jobs:
       - name: "Build and push mockserver container"
         if: steps.changed-files-specific.outputs.any_changed == 'true'
         run: |
-          mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn install -DskipTests -T 1C
+          mvn --batch-mode install -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -T 1C
           cd other/mockserver/
-          mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn spring-boot:build-image -Dspring-boot.build-image.imageName=ghcr.io/theotherp/mockserver:latest
+          mvn --batch-mode spring-boot:build-image -Dspring-boot.build-image.imageName=ghcr.io/theotherp/mockserver:latest -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
           docker push ghcr.io/theotherp/mockserver:latest
 
   runSystemTestsLinux:
@@ -83,7 +83,7 @@ jobs:
           cache: 'maven'
 
       - name: "Install maven"
-        run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -DskipTests -pl org.nzbhydra:nzbhydra2,org.nzbhydra:shared,org.nzbhydra:mapping,org.nzbhydra:assertions
+        run: mvn --batch-mode clean install -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -pl org.nzbhydra:nzbhydra2,org.nzbhydra:shared,org.nzbhydra:mapping,org.nzbhydra:assertions
 
       - name: "Create docker network"
         run: docker network create systemtest
@@ -112,7 +112,7 @@ jobs:
           docker container inspect -f '{{ .Mounts}}' v1Migration
 
       - name: "Run tests"
-        run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test -pl org.nzbhydra.tests:system -DtrimStackTrace=false
+        run: mvn --batch-mode test -pl org.nzbhydra.tests:system -DtrimStackTrace=false -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       - name: "Write docker-compose logs"
         if: always()
@@ -215,7 +215,7 @@ jobs:
           cache: 'maven'
 
       - name: "Install maven"
-        run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -DskipTests -pl org.nzbhydra:nzbhydra2,org.nzbhydra:shared,org.nzbhydra:mapping,org.nzbhydra:assertions,org.nzbhydra:mockserver
+        run: mvn --batch-mode clean install -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DskipTests -pl org.nzbhydra:nzbhydra2,org.nzbhydra:shared,org.nzbhydra:mapping,org.nzbhydra:assertions,org.nzbhydra:mockserver
 
       - name: "Copy mockserver"
         run: |
@@ -235,7 +235,7 @@ jobs:
         uses: BerniWittmann/background-server-action@v1
         with:
           start: ./core.exe directstart, java -jar ./exec.jar
-          command: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test -pl org.nzbhydra.tests:system -DtrimStackTrace=false
+          command: mvn --batch-mode test -pl org.nzbhydra.tests:system -DtrimStackTrace=false -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       - name: "Shutdown hydra"
         uses: fjogeleit/http-request-action@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1f8a6e392..b528f6a83 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,4 @@ jobs:
           distribution: 'adopt'
           cache: 'maven'
       - name: Test with Maven
-        run: mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --update-snapshots verify
+        run: mvn --batch-mode --update-snapshots verify -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/misc/buildLinuxCore/amd64/buildInContainer.sh b/misc/buildLinuxCore/amd64/buildInContainer.sh
index 1733411eb..9805691eb 100644
--- a/misc/buildLinuxCore/amd64/buildInContainer.sh
+++ b/misc/buildLinuxCore/amd64/buildInContainer.sh
@@ -7,8 +7,8 @@
 cd /nzbhydra2 || exit
 #clean so that if the build fails we won't use the old results
 rm -rf core/target
-mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests -T 1C
-mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -pl org.nzbhydra:core -Pnative clean native:compile -DskipTests
+mvn --batch-mode clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -T 1C
+mvn -pl org.nzbhydra:core -Pnative clean native:compile -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 /upx-4.2.4-amd64_linux/upx -3 core/target/core
 #Because docker is run as root the files are written to the host file system as root
 chmod o+rwx -R .
diff --git a/misc/buildLinuxCore/arm64/buildInContainer.sh b/misc/buildLinuxCore/arm64/buildInContainer.sh
index f45677ef3..c6fac3c80 100644
--- a/misc/buildLinuxCore/arm64/buildInContainer.sh
+++ b/misc/buildLinuxCore/arm64/buildInContainer.sh
@@ -6,7 +6,7 @@
 cd /nzbhydra2 || exit
 #clean so that if the build fails we won't use the old results
 rm -rf core/target
-mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests -T 1C
+mvn --batch-mode clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests  -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -T 1C
 mvn -pl org.nzbhydra:core -Pnative clean native:compile -DskipTests
 /upx-4.2.4-arm64_linux/upx -3 core/target/core
 #Because docker is run as root the files are written to the host file system as root
diff --git a/tests/system/instanceData/v1Migration/database/nzbhydra.mv.db b/tests/system/instanceData/v1Migration/database/nzbhydra.mv.db
index 40e5ec969..3c9514bde 100644
Binary files a/tests/system/instanceData/v1Migration/database/nzbhydra.mv.db and b/tests/system/instanceData/v1Migration/database/nzbhydra.mv.db differ