diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index ddd75aa08e..52479da45c 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -57,6 +57,8 @@ jobs:
             const workflows = [
               'cleanup.yml',
               'depsreview.yaml',
+              'qodana.yml',
+              'closed-issues.yml',
               'laravel.yml',
               'lock.yml',
               'stale.yml'
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index cb933a2508..d7f4411566 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -32,6 +32,6 @@ jobs:
           php artisan ide-helper:generate;
 
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@main
+        uses: JetBrains/qodana-action@v2023.1.0
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
diff --git a/.github/workflows/sonarcloud.yaml b/.github/workflows/sonarcloud.yaml
new file mode 100644
index 0000000000..5e6bc93605
--- /dev/null
+++ b/.github/workflows/sonarcloud.yaml
@@ -0,0 +1,21 @@
+name: Sonarcloud
+on:
+  push:
+    branches:
+      - main
+      - develop
+  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.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..72777406a0
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,17 @@
+sonar.projectKey=firefly-iii_firefly-iii
+sonar.organization=firefly-iii
+
+# This is the name and version displayed in the SonarCloud UI.
+#sonar.projectName=firefly-iii
+#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
+
+
+sonar.projectVersion=6.0.11
+sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests
+sonar.sourceEncoding=UTF-8