diff --git a/.github/workflows/sonar-evidence-example.yml b/.github/workflows/sonar-evidence-example.yml
index 41ffdd3..8f47541 100644
--- a/.github/workflows/sonar-evidence-example.yml
+++ b/.github/workflows/sonar-evidence-example.yml
@@ -63,7 +63,7 @@ jobs:
           # create evidence from sonar-scan analysis
           set +e
           # --FailOnAnalysisFailure causes a failure on gateway-failed sonar analysis 
-          ./examples/sonar-scan-example/bin/sonar-scan-extractor-linux-amd64  --reportTaskFile=$PWD/.scannerwork/report-task.txt > predicate.json
+          ./examples/sonar-scan/bin/sonar-scan-extractor-linux-amd64  --reportTaskFile=$PWD/.scannerwork/report-task.txt > predicate.json
           EXIT_CODE=$?
           set -e          
           # write the exit code to the github output so that it can be used in the evidence creation step
@@ -117,5 +117,6 @@ jobs:
             --build-number "${{ github.run_number }}" \
             --predicate ./predicate.json \
             --predicate-type https://jfrog.com/evidence/sonar-scan/v1 \
+            --provider-id "sonar" \
             --key "${{ secrets.JIRA_TEST_PKEY }}" \
             --key-alias ${{ vars.JIRA_TEST_KEY }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a1d2a25..284b3ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/examples/sonar-scan-example/sonar-scanner-4.6.2.2472-linux/*
-/examples/sonar-scan-example/bin/*
-/examples/jira-transition-example/bin/*
+/examples/sonar-scan/sonar-scanner-4.6.2.2472-linux/*
+/examples/sonar-scan/bin/*
+/examples/jira/bin/*
 *.pem
\ No newline at end of file
diff --git a/examples/service-now evidence/CryptoJS b/examples/service-now/CryptoJS
similarity index 100%
rename from examples/service-now evidence/CryptoJS
rename to examples/service-now/CryptoJS
diff --git a/examples/service-now evidence/JFrogEvidenceOperations b/examples/service-now/JFrogEvidenceOperations
similarity index 100%
rename from examples/service-now evidence/JFrogEvidenceOperations
rename to examples/service-now/JFrogEvidenceOperations
diff --git a/examples/service-now evidence/JFrogReleaseOperations b/examples/service-now/JFrogReleaseOperations
similarity index 100%
rename from examples/service-now evidence/JFrogReleaseOperations
rename to examples/service-now/JFrogReleaseOperations
diff --git a/examples/service-now evidence/README.md b/examples/service-now/README.md
similarity index 100%
rename from examples/service-now evidence/README.md
rename to examples/service-now/README.md
diff --git a/examples/service-now evidence/jfrog_promotion b/examples/service-now/jfrog_promotion
similarity index 100%
rename from examples/service-now evidence/jfrog_promotion
rename to examples/service-now/jfrog_promotion
diff --git a/examples/sonar-scan-example/README.md b/examples/sonar-scan/README.md
similarity index 94%
rename from examples/sonar-scan-example/README.md
rename to examples/sonar-scan/README.md
index 8e919f6..6f00aa2 100644
--- a/examples/sonar-scan-example/README.md
+++ b/examples/sonar-scan/README.md
@@ -36,7 +36,7 @@ $PWD/sonar-scanner-6.2.1.4610/bin/sonar-scanner \
 ``
 3. call the jira-transition-checker utility (use the binary for your build platform) with these arguments: "transition name" JIRA-ID [,JIRA-ID]
 for example:
- ``./examples/sonar-scan-example/bin/sonar-scan-extractor-linux-amd64  --reportTaskFile=$PWD/.scannerwork/report-task.txt --FailOnAnalysisFailure > predicate.json
+ ``./examples/sonar-scan/bin/sonar-scan-extractor-linux-amd64  --reportTaskFile=$PWD/.scannerwork/report-task.txt --FailOnAnalysisFailure > predicate.json
 ``               
 4. call the evidence create cli with the predicate.json file
 for example:
@@ -46,6 +46,7 @@ jf evd create \
             --build-number "${{ github.run_number }}" \
             --predicate ./predicate.json \
             --predicate-type https://jfrog.com/evidence/sonar-scan/v1 \
+            --provider-id "sonar" \
             --key "${{ secrets.JIRA_TEST_PKEY }}" \
             --key-alias ${{ vars.JIRA_TEST_KEY }}
 ``
diff --git a/examples/sonar-scan-example/build-binary.sh b/examples/sonar-scan/build-binary.sh
similarity index 100%
rename from examples/sonar-scan-example/build-binary.sh
rename to examples/sonar-scan/build-binary.sh
diff --git a/examples/sonar-scan-example/main.go b/examples/sonar-scan/main.go
similarity index 100%
rename from examples/sonar-scan-example/main.go
rename to examples/sonar-scan/main.go
diff --git a/examples/sonar-scan-example/sonar-helper.go b/examples/sonar-scan/sonar-helper.go
similarity index 100%
rename from examples/sonar-scan-example/sonar-helper.go
rename to examples/sonar-scan/sonar-helper.go