diff --git a/public/v4/apps/sonarqube.yml b/public/v4/apps/sonarqube.yml
index e0e75d1..93ddad8 100644
--- a/public/v4/apps/sonarqube.yml
+++ b/public/v4/apps/sonarqube.yml
@@ -12,6 +12,8 @@ services:
             POSTGRES_INITDB_ARGS: $$cap_pg_initdb_args
         caproverExtra:
             notExposeAsWebApp: 'true'
+            ports:
+                - 5432:5432
     $$cap_appname:
         image: sonarqube:$$cap_sonar_version
         depends_on:
@@ -23,9 +25,9 @@ services:
             - $$cap_appname-extensions:/opt/sonarqube/extensions
         restart: always
         environment:
-            sonar.jdbc.username: sonarqube
-            sonar.jdbc.password: $$cap_pg_pass
-            sonar.jdbc.url: jdbc:postgresql://srv-captain--$$cap_appname-db/sonarqube
+            SONAR_JDBC_USERNAME: sonarqube
+            SONAR_JDBC_PASSWORD: $$cap_pg_pass
+            SONAR_JDBC_URL: jdbc:postgresql://srv-captain--$$cap_appname-db:5432/sonarqube
         caproverExtra:
             containerHttpPort: '9000'
 caproverOneClickApp:
@@ -37,7 +39,7 @@ caproverOneClickApp:
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_sonar_version
           label: Sonarqube Version
-          defaultValue: 7.7-community
+          defaultValue: 10.2.1-community
           description: Check out their Docker page for the valid tags https://hub.docker.com/_/sonarqube?tab=tags/
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_pg_pass