diff --git a/Backend/helper/time_test.go b/Backend/helper/time_test.go
index d106e7f..9593ab6 100644
--- a/Backend/helper/time_test.go
+++ b/Backend/helper/time_test.go
@@ -25,6 +25,7 @@ func TestFormatDuration(t *testing.T) {
 		{"30min", time.Duration(30 * time.Minute)},
 		{"1h 30min", time.Duration(90 * time.Minute)},
 		{"-1h 30min", time.Duration(-90 * time.Minute)},
+		{"", 0},
 	}
 	for _, d := range durations {
 		t.Run(d.name, func(t *testing.T) {
diff --git a/Backend/sonar-project.properties b/Backend/sonar-project.properties
index 7b20983..d859e77 100644
--- a/Backend/sonar-project.properties
+++ b/Backend/sonar-project.properties
@@ -1,8 +1,8 @@
-sonar.token=sqp_d5e23f24eb2725b03bb8055771cd8c4b48e788cc
 sonar.projectKey=Arbeitszeitmessung
 sonar.sources=.
 sonar.exclusions=**/*_test.go
 
 sonar.tests=.
 sonar.test.inclusions=**/*_test.go
+sonar.go.tests.reportPaths=.test/report.json
 sonar.go.coverage.reportPaths=.test/coverage.out
diff --git a/Jenkinsfile b/Jenkinsfile
index ee0171f..5e68d30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
         environment {
-        DOCKER_USERNAME = 'tom'
-        DOCKER_PASSWORD = credentials('dgitea_tom')
+        DOCKER_USERNAME = 'jenkins'
+        DOCKER_PASSWORD = credentials('gitea_jenkins')
     }
 
     agent any
diff --git a/Makefile b/Makefile
index 210097e..ccd2917 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 DOCKER_USERNAME ?= tom
+PACKAGE_OWNER ?= tom
 DOCKER_PASSWORD ?= $(shell echo "YOUR_DEFAULT_PASSWORD")
 IMAGE_REGISTRY ?= git.letsstein.de
 APPLICATION_NAME ?= arbeitszeit
@@ -16,12 +17,12 @@ ifdef JENKINS_HOME
 endif
 
 _builder:
-	docker build --tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
+	docker build --tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} -f $(call capitalize, ${_BUILD_ARGS_APP_PART})/Dockerfile $(call capitalize, ${_BUILD_ARGS_APP_PART})
 
 _pusher: login_registry
-	docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
-	docker tag ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
-	docker push ${IMAGE_REGISTRY}/${DOCKER_USERNAME}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
+	docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT}
+	docker tag ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${GIT_COMMIT} ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
+	docker push ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/${APPLICATION_NAME}-${_BUILD_ARGS_APP_PART}:${_BUILD_ARGS_TAG}
 
 
 build_%:
@@ -43,5 +44,8 @@ generateFrontend:
 
 
 backend: generateFrontend login_registry
-	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:latest Backend --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t git.letsstein.de/tom/arbeitszeit-backend:${GIT_COMMIT} Backend --push
+	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeit-backend:latest Backend --push
+	docker buildx build --platform linux/amd64,linux/arm64 -t ${IMAGE_REGISTRY}/${PACKAGE_OWNER}/arbeitszeit-backend:${GIT_COMMIT} Backend --push
+
+scan:
+    $(MAKE) -C Backend scan