diff --git a/Makefile b/Makefile
index b27846e5f9..e6b9ed7af2 100644
--- a/Makefile
+++ b/Makefile
@@ -203,14 +203,15 @@ test-repository-upgrade: build init-db-test-minimal ## runs DB upgrade integrati
 
 .PHONY: test
 test: build ## runs all tests
-	sbt -v "shared/test"
-	sbt -v "sipi/test"
-	sbt -v "userCore/test"
-	sbt -v "userHandler/test"
-	sbt -v "userInterface/test"
-	sbt -v "userRepo/test"
-	sbt -v "valueObjects/test"
-	sbt -v "webapi/test"
+	sbt -v coverage "shared/test"
+	sbt -v coverage "sipi/test"
+	sbt -v coverage "userCore/test"
+	sbt -v coverage "userHandler/test"
+	sbt -v coverage "userInterface/test"
+	sbt -v coverage "userRepo/test"
+	sbt -v coverage "valueObjects/test"
+	sbt -v coverage "webapi/test"
+	sbt coverageAggregate
 
 
 #################################
diff --git a/build.sbt b/build.sbt
index 6e7a6165b5..590e4d2f03 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,4 +1,3 @@
-import rapture.core.booleanRepresentations.trueFalse
 import com.typesafe.sbt.SbtNativePackager.autoImport.NativePackagerHelper._
 import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.{Docker, dockerRepository}
 import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index cfdab326ec..871ea195f2 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -13,7 +13,6 @@ addSbtPlugin("com.eed3si9n"      % "sbt-assembly"        % "0.15.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % "0.1.6")
 addSbtPlugin("io.gatling"        % "gatling-sbt"         % "2.2.2")
 addSbtPlugin("org.scoverage"     % "sbt-scoverage"       % "1.9.3")
-addSbtPlugin("com.codacy"        % "sbt-codacy-coverage" % "1.3.15")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"       % "0.11.0")
 addSbtPlugin("org.scalameta"     % "sbt-scalafmt"        % "2.4.6")
 
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..82b3722d30
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,19 @@
+# Organization and project keys are displayed in the right sidebar of the project homepage
+sonar.organization=https://dasch.swiss
+sonar.projectKey=dasch-swiss
+sonar.host.url=https://sonarcloud.io
+
+# --- optional properties ---
+
+# defaults to project key
+#sonar.projectName=My project
+# defaults to 'not provided'
+#sonar.projectVersion=1.0
+
+# Path is relative to the sonar-project.properties file. Defaults to .
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
+
+sonar.scala.scoverage.reportPath=target/scala-2.13/scoverage-report/scoverage.xml