diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
index b5e76d4c64..8856b4e853 100644
--- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
+++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -183,24 +183,23 @@ object IdeVersions {
         Profile(
             name = "2025.1",
             gateway = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:251.14649.45",
-                    "PythonCore:251.14649.49",
-                    "Docker:251.14649.49"
+                    "PythonCore:251.23774.16",
+                    "Docker:251.23774.16"
                 )
             ),
             ultimate = ProductProfile(
-                sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "251.23774-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
                     "JavaScriptDebugger",
@@ -208,17 +207,16 @@ object IdeVersions {
                     "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:251.14649.45",
-                    "Pythonid:251.14649.49",
-                    "org.jetbrains.plugins.go:251.14649.49",
+                    "Pythonid:251.23774.16",
+                    "org.jetbrains.plugins.go:251.23774.16",
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2025.1-EAP1-SNAPSHOT",
+                sdkVersion = "2025.1-EAP7-SNAPSHOT",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
-                rdGenVersion = "2024.3.1",
-                nugetVersion = " 2025.1.0-eap01"
+                rdGenVersion = "2025.1.1",
+                nugetVersion = " 2025.1.0-eap07"
             )
         ),
     ).associateBy { it.name }
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
index d082e17fb3..db5b9e0ae2 100644
--- a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
+++ b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -103,6 +103,13 @@ dependencies {
     }
 }
 
+tasks.prepareTestSandbox {
+    disabledPlugins = listOf(
+        "com.intellij.swagger",
+        "org.jetbrains.plugins.kotlin.jupyter",
+    )
+}
+
 tasks.jar {
     // :plugin-toolkit:jetbrains-community results in: --plugin-toolkit-jetbrains-community-IC-<version>.jar
     archiveBaseName.set(toolkitIntelliJ.ideFlavor.map { "${project.buildTreePath.replace(':', '-')}-$it" })
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt
index 9ec8bb3030..2e05b2c1b6 100644
--- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt
+++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/DockerfileParser.kt
@@ -29,7 +29,10 @@ class DockerfileParser(private val project: Project) {
 
         val command = commandsAfterLastFrom.filterIsInstance<DockerFileCmdCommand>().lastOrNull()?.text?.substringAfter("CMD ")
         val portMappings = commandsAfterLastFrom.filterIsInstance<DockerFileExposeCommand>().mapNotNull {
-            it.listChildren().find { child -> (child as? LeafPsiElement)?.elementType?.toString() == "INTEGER_LITERAL" }?.text?.toIntOrNull()
+            it.listChildren().find { child ->
+                val elementType = (child as? LeafPsiElement)?.elementType?.toString()
+                elementType == "INTEGER_LITERAL" || elementType == "IDENTIFIER"
+            }?.text?.toIntOrNull()
         }
 
         val copyDirectives = groupByWorkDir(commandsAfterLastFrom).flatMap { (workDir, commands) ->
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt
index a5821e1e95..986a956792 100644
--- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt
+++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/federation/psireferences/ArnPsiReferenceProviderTest.kt
@@ -119,7 +119,7 @@ class ArnPsiReferenceProviderTest {
                 }
             )
 
-            assertThat(elements).hasSize(5).allSatisfy {
+            assertThat(elements).allSatisfy {
                 assertThat(it.value)
                     .withFailMessage { "Expected ArnReference with value of '$expected' from PsiElement: $it" }
                     .isEqualTo(expected)
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt
index 56de768d2d..51cf9bba08 100644
--- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt
+++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/FakeCPython.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.utils.rules
 
+import com.intellij.openapi.projectRoots.Sdk
 import com.jetbrains.python.psi.LanguageLevel
 import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor
 import com.jetbrains.python.sdk.flavors.PyFlavorData
@@ -13,4 +14,6 @@ internal class FakeCPython(private val languageLevel: LanguageLevel) : CPythonSd
     override fun getName(): String = "FakeCPython"
 
     override fun getVersionString(sdkHome: String?) = "$name ${languageLevel.toPythonVersion()}"
+
+    override fun getLanguageLevel(sdk: Sdk) = languageLevel
 }
diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt
index 166de08a2d..ac166687ef 100644
--- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt
+++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/PythonCodeInsightTestFixtureRule.kt
@@ -118,7 +118,7 @@ internal class PlatformPythonModuleType : PythonModuleTypeBase<EmptyModuleBuilde
 }
 
 class PyTestSdk private constructor(private val version: LanguageLevel) : ProjectJdkImpl("PySdk $version", PyTestSdkType(version)) {
-    override fun getVersionString(): String = "FakeCPython $version"
+    override fun getVersionString(): String = version.toString()
 
     override fun getSdkAdditionalData(): SdkAdditionalData = PythonSdkAdditionalData(PyFlavorAndData(PyFlavorData.Empty, FakeCPython(version)))
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 168f4da0a1..424f1fa720 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -29,7 +29,7 @@ val codeArtifactMavenRepo = fun RepositoryHandler.(): MavenArtifactRepository? {
 plugins {
     id("com.github.burrunan.s3-build-cache") version "1.5"
     id("com.gradle.develocity") version "3.17.6"
-    id("org.jetbrains.intellij.platform.settings") version "2.1.0"
+    id("org.jetbrains.intellij.platform.settings") version "2.2.1"
 }
 
 dependencyResolutionManagement {
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
similarity index 100%
rename from ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
rename to ui-tests-starter/tst-243/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
diff --git a/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
new file mode 100644
index 0000000000..5cd7458f15
--- /dev/null
+++ b/ui-tests-starter/tst-251+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt
@@ -0,0 +1,29 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.uitests
+
+import com.intellij.ide.starter.ci.CIServer
+import java.nio.file.Path
+
+object TestCIServer : CIServer {
+    override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true
+    override val buildNumber: String = ""
+    override val branchName: String = ""
+    override val buildParams: Map<String, String> = mapOf()
+
+    override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) {
+    }
+
+    override fun reportTestFailure(testName: String, message: String, details: String, linkToLogs: String?) {
+        println("test: $testName")
+        println("message: $message")
+        println("details: $details")
+        error(message)
+    }
+
+    override fun ignoreTestFailure(testName: String, message: String, details: String?) {
+    }
+
+    override fun isTestFailureShouldBeIgnored(message: String) = false
+}