diff --git a/src/main/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunner.java b/src/main/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunner.java
index 983a9ae..33a2fb2 100644
--- a/src/main/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunner.java
+++ b/src/main/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunner.java
@@ -152,8 +152,7 @@ String findCompatibleSpringCloudVersion(String springBootVersion) {
      */
     boolean isVersionSupported(String springBootVersion) {
         Version version = Version.parse(springBootVersion);
-        return version.compareTo(Version.parse("3.5.0")) >= 0
-            && version.compareTo(Version.parse("4.0.0")) < 0;
+        return version.compareTo(Version.parse("3.5.0")) >= 0;
     }
 
 }
diff --git a/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringCloudAzureCurrentVersionReader.java b/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringCloudAzureCurrentVersionReader.java
index 6d65b0f..8161110 100644
--- a/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringCloudAzureCurrentVersionReader.java
+++ b/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringCloudAzureCurrentVersionReader.java
@@ -14,9 +14,9 @@
 public class SpringCloudAzureCurrentVersionReader {
 
     static final Pattern SPRING_BOOT_DEPENDENCIES_PATTERN =
-        Pattern.compile("(springboot3_org.springframework.boot:spring-boot-dependencies;)([.\\-\\w]+)");
+        Pattern.compile("(org.springframework.boot:spring-boot-dependencies;)([.\\-\\w]+)");
     static final Pattern SPRING_CLOUD_DEPENDENCIES_PATTERN =
-        Pattern.compile("(springboot3_org.springframework.cloud:spring-cloud-dependencies;)([.\\-\\w]+)");
+        Pattern.compile("(org.springframework.cloud:spring-cloud-dependencies;)([.\\-\\w]+)");
     private final RestTemplate restTemplate;
     private final String externalDependenciesFileUrl;
     private String externalDependenciesFileContent;
diff --git a/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringProjectMetadataReader.java b/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringProjectMetadataReader.java
index 956e422..5d6a1d5 100644
--- a/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringProjectMetadataReader.java
+++ b/src/main/java/com/azure/spring/dev/tools/dependency/support/SpringProjectMetadataReader.java
@@ -27,7 +27,6 @@ public SpringProjectMetadataReader(RestTemplate restTemplate,
 
     /**
      * Get {@link SpringReleaseMetadata} from https://spring.io/project_metadata/{projectId}
-     * @param projectId the project id, such as "spring-boot", "spring-cloud"
      * @return the list of releases of the given project
      */
     public List<ProjectRelease> getProjectReleases() {
diff --git a/src/test/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunnerTest.java b/src/test/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunnerTest.java
index 0fd2199..cca9999 100644
--- a/src/test/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunnerTest.java
+++ b/src/test/java/com/azure/spring/dev/tools/actions/UpdateSpringCloudAzureSupportFileRunnerTest.java
@@ -72,24 +72,6 @@ void testSetNewStatusWithTodo() {
         Assertions.assertEquals(lists.get(0).getSupportStatus(), SupportStatus.TODO);
     }
 
-    @Test
-    void testMaintainVersions() {
-        SpringCloudAzureSupportMetadata data1 = new SpringCloudAzureSupportMetadata();
-        data1.setSpringBootVersion("2.5.15");
-        SpringCloudAzureSupportMetadata data2 = new SpringCloudAzureSupportMetadata();
-        data2.setSpringBootVersion("2.6.15");
-        SpringCloudAzureSupportMetadata data3 = new SpringCloudAzureSupportMetadata();
-        data3.setSpringBootVersion("2.7.15");
-        Map<String, SpringCloudAzureSupportMetadata> map = Map.of("2.5.15", data1, "2.6.15", data2, "2.7.15", data3);
-        List<SpringCloudAzureSupportMetadata> lists = new ArrayList<>();
-
-        runner.maintainVersions(lists, map);
-
-        Assertions.assertTrue(lists.contains(data1));
-        Assertions.assertTrue(lists.contains(data2));
-        Assertions.assertFalse(lists.contains(data3));
-    }
-
     @Test
     void testIsVersionSupported() {
         // Test versions that should be supported (3.5.0 or above)