diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index ee92f64..a9118ea 100644
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -64,8 +64,8 @@
     pre-build-script: !include-raw-escape:
       - ../shell/install-deb-nng-rmr.sh
     sonarcloud: true
-    sonarcloud-project-key: o-ran-sc_ric-plt-a1
-    sonarcloud-project-organization: o-ran-sc
-    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-tox-sonar