diff --git a/cuebot/build.gradle b/cuebot/build.gradle
index 953af5201..cb4fe3032 100644
--- a/cuebot/build.gradle
+++ b/cuebot/build.gradle
@@ -137,8 +137,8 @@ jacocoTestReport {
 sonarqube {
     properties {
         property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.organization", "bcipriano"
-        property "sonar.projectKey", "bcipriano_OpenCue_Cuebot"
+        property "sonar.organization", "academysoftwarefoundation"
+        property "sonar.projectKey", "AcademySoftwareFoundation_OpenCue_Cuebot"
         property "sonar.projectName", "OpenCue Cuebot"
         // SonarCloud will pick up the JaCoCo report automatically, but has its own options
         // for excluding files. We don't need to exclude generated code here as it isn't
diff --git a/sonar-project.properties b/sonar-project.properties
index 3d756b88e..d9d399a61 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,6 +1,6 @@
 sonar.host.url=https://sonarcloud.io
-sonar.organization=bcipriano
-sonar.projectKey=bcipriano_OpenCue
+sonar.organization=academysoftwarefoundation
+sonar.projectKey=AcademySoftwareFoundation_OpenCue
 sonar.projectName=OpenCue Python Components
 sonar.sources=cueadmin/cueadmin,cuegui/cuegui,cuesubmit/cuesubmit,pycue/opencue,\
   pycue/FileSequence,pyoutline/outline,rqd/rqd