diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5dc6a0e3..cc5d069d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,7 +159,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn sonar:sonar \
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -Dsonar.projectKey=GreenButtonAlliance_OpenESPI-GreenButton-Java \
             -Dsonar.organization=greenbuttonalliance \
             -Dsonar.host.url=https://sonarcloud.io \
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index f8afd234..61810825 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -88,7 +88,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn sonar:sonar \
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -Dsonar.projectKey=GreenButtonAlliance_OpenESPI-GreenButton-Java \
             -Dsonar.organization=greenbuttonalliance \
             -Dsonar.host.url=https://sonarcloud.io \
diff --git a/openespi-common/pom.xml b/openespi-common/pom.xml
index 06948dcf..3ff6d16b 100644
--- a/openespi-common/pom.xml
+++ b/openespi-common/pom.xml
@@ -82,7 +82,6 @@
         <!-- Modern Dependencies for Spring Boot 3.5.0 -->
         <lombok.version>1.18.34</lombok.version>
         <mapstruct.version>1.6.0</mapstruct.version>
-        <testcontainers.version>1.20.1</testcontainers.version>
 
         <!-- Legacy support for compatibility -->
         <commons-lang.version>2.6</commons-lang.version>
@@ -296,20 +295,6 @@
         </repository>
     </repositories>
 
-    <!-- Dependency Management for version consistency -->
-    <dependencyManagement>
-        <dependencies>
-            <!-- Testcontainers BOM for version management -->
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>${testcontainers.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- Spring Boot Starters for Common Library -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index b49e229c..86f19f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,12 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- SonarCloud Maven Plugin -->
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file