diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3aab40e..9377824 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,17 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
+        <option name="delegatedBuild" value="false" />
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
-        <option name="useAutoImport" value="true" />
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e2668c2..9526a82 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="adopt-openjdk-1.8.0_232" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="openjdk-13.0.2" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Test__Reset_DB___Run.xml b/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
similarity index 84%
rename from .idea/runConfigurations/Test__Reset_DB___Run.xml
rename to .idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
index a51cacf..a26a317 100644
--- a/.idea/runConfigurations/Test__Reset_DB___Run.xml
+++ b/.idea/runConfigurations/Lint_Test_Sonar__Reset_DB___Run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test, Reset DB &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Lint+Test+Sonar, Reset DB &amp; Run" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="env">
         <map>
@@ -33,6 +33,7 @@
     <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
     <method v="2">
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All Tests + Lint" run_configuration_type="JUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Sonarqube" run_configuration_type="GradleRunConfiguration" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Fixtures on Dev" run_configuration_type="RunSql" />
     </method>
   </configuration>
diff --git a/.idea/runConfigurations/Sonarqube.xml b/.idea/runConfigurations/Sonarqube.xml
new file mode 100644
index 0000000..108a92a
--- /dev/null
+++ b/.idea/runConfigurations/Sonarqube.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Sonarqube" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-x test" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="sonarqube" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 4e52b93..eaeafd5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,6 +22,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "5.0.0"
     id("org.jlleitschuh.gradle.ktlint") version "8.2.0"
     id("org.owasp.dependencycheck") version "5.1.0"
+    id("org.sonarqube") version "2.7"
 }
 
 application {
diff --git a/docker-compose.yml b/docker-compose.yml
index 0108060..2337801 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,13 @@
 # Add the "-d" flag at the end for detached execution
 version: '3.7'
 services:
+  sonarqube:
+    container_name: sonarqube_${NAME}
+    image: sonarqube
+    restart: always
+    ports:
+    - 9000:9000
+
   openapi:
     container_name: openapi_${NAME}
     image: swaggerapi/swagger-ui
diff --git a/gradle.properties b/gradle.properties
index 78095a5..9786bee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,3 +6,5 @@ postgresjson_version=0.1
 koinVersion=2.0.1
 jackson_version=2.9.9
 cucumber_version=4.7.1
+systemProp.sonar.host.url=http://localhost:9000
+systemProp.sonar.login=1196e8015c20035f1aa91e881b95ce9d6e879c8a