diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39725da..33a43ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,9 +107,9 @@ sonar-success:
   script:
     - make node_modules
     - sonar-scanner
-        -Dsonar.projectKey=ssube_rollup-template
+        -Dsonar.projectKey=${CI_PROJECT_NAMESPACE}_${CI_PROJECT_NAME}
         -Dsonar.projectVersion=${CI_COMMIT_REF_SLUG}
-        -Dsonar.organization=ssube-github
+        -Dsonar.organization=${CI_PROJECT_NAMESPACE}-github
         -Dsonar.sources=src/,test/
         -Dsonar.host.url=https://sonarcloud.io
         -Dsonar.login=${SONAR_SECRET}