diff --git a/templates/sonarqube/docker-compose.yml.j2 b/templates/sonarqube/docker-compose.yml.j2
index dceae30..226d113 100644
--- a/templates/sonarqube/docker-compose.yml.j2
+++ b/templates/sonarqube/docker-compose.yml.j2
@@ -14,9 +14,9 @@ services:
       - SONAR_JDBC_PASSWORD=${DB_PASSWORD}
     restart: always
     volumes:
-      - {{ service_directory }}/data/appdata:/opt/sonarqube/data
-      - {{ service_directory }}/data/extensions:/opt/sonarqube/extensions
-      - {{ service_directory }}/data/logs:/opt/sonarqube/logs
+      - {{ service_directory }}/data/app/appdata:/opt/sonarqube/data
+      - {{ service_directory }}/data/app/extensions:/opt/sonarqube/extensions
+      - {{ service_directory }}/data/app/logs:/opt/sonarqube/logs
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -42,9 +42,9 @@ services:
     environment:
       - USER_UID={{ service_user_id }}
       - USER_GID={{ service_group_id }}
-    command: ["curl", "-L", "-O", "--output-dir", "/plugins", "https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar"]
+    command: ["curl", "-L", "-O", "-u {{ service_user_id }}:{{ service_group_id }}","--output-dir", "/plugins", "https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar"]
     volumes:
-      - {{ service_directory }}/data/extensions/plugins:/plugins
+      - {{ service_directory }}/data/app/extensions/plugins:/plugins
 
 networks:
   default: