diff --git a/Jenkinsfile b/Jenkinsfile
index 49b1cbe3..d5422d04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 		label 'docker-multiarch'
 	}
 	options {
-		buildDiscarder(logRotator(numToKeepStr: '5'))
+		buildDiscarder(logRotator(numToKeepStr: '10'))
 		disableConcurrentBuilds()
 		ansiColor('xterm')
 	}
@@ -71,7 +71,8 @@ pipeline {
 			steps {
 				sh './scripts/ci/build-frontend'
 				sh './scripts/ci/test-backend'
-				sh './scripts/ci/build-backend'
+				// Temporarily disable building backend binaries
+				// sh './scripts/ci/build-backend'
 				// Build the docker image used for testing below
 				sh '''docker build --pull --no-cache \\
 					-t "${IMAGE}:${BRANCH_LOWER}-ci-${BUILD_NUMBER}" \\
@@ -84,12 +85,13 @@ pipeline {
 			}
 			post {
 				success {
-					archiveArtifacts allowEmptyArchive: false, artifacts: 'bin/*'
+					junit 'test/results/junit/*'
+					// archiveArtifacts allowEmptyArchive: false, artifacts: 'bin/*'
 					publishHTML([
 						allowMissing: false,
 						alwaysLinkToLastBuild: false,
 						keepAll: false,
-						reportDir: 'html-reports',
+						reportDir: 'test/results/html-reports',
 						reportFiles: 'backend-coverage.html',
 						reportName: 'HTML Reports',
 						useWrapperFileDirectly: true
diff --git a/scripts/ci/test-backend b/scripts/ci/test-backend
index 07e85cf5..4a34366e 100755
--- a/scripts/ci/test-backend
+++ b/scripts/ci/test-backend
@@ -44,10 +44,11 @@ if [ "${1:-}" = "--inside-docker" ]; then
 	cd /app/backend
 	[ -z "$(go tool fix -diff ./internal)" ]
 	go test -json -cover -coverprofile="/tmp/coverage.out" ./internal/... | tparse
-	mkdir "$DIR/../../html-reports"
-	go tool cover -html="/tmp/coverage.out" -o "$DIR/../../html-reports/backend-coverage.html"
+	mkdir -p "$DIR/../../test/results/html-reports" "$DIR/../../test/results/junit"
+	go tool cover -html="/tmp/coverage.out" -o "$DIR/../../test/results/html-reports/backend-coverage.html"
+	go test -v -tags="unit integration" -covermode=atomic ./internal/... 2>&1 | go-junit-report -set-exit-code > "$DIR/../../test/results/junit/backend.xml"
 	rm -f "/tmp/coverage.out"
-	chown -R 1000:1000 "$DIR/../../html-reports"
+	chown -R 1000:1000 "$DIR/../../test/results"
 	golangci-lint -v run ./...
 else
 	# run this script from within docker