diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 00000000..c6ef2c65
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,20 @@
+name: sonarqube
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
index d6d6714d..25f3f17c 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,2 +1,13 @@
-sonar.projectKey=pkpdapp_pkpdapp_AYv3MhfCVrxZ3l8OhwWR
-sonar.qualitygate.wait=true
\ No newline at end of file
+sonar.projectKey=pkpdapp-team_pkpdapp
+sonar.organization=pkpdapp-team
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=pkpdapp
+#sonar.projectVersion=1.0
+
+
+# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
+#sonar.sources=.
+
+# Encoding of the source code. Default is default system encoding
+#sonar.sourceEncoding=UTF-8
\ No newline at end of file