diff --git a/gradle.properties b/gradle.properties
index c92f652972..a316c4fd0c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.47.0
-korkVersion=7.229.0
+korkVersion=7.230.0
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx6g
diff --git a/keiko-sql/keiko-sql.gradle b/keiko-sql/keiko-sql.gradle
index f216a68952..1be7b119b1 100644
--- a/keiko-sql/keiko-sql.gradle
+++ b/keiko-sql/keiko-sql.gradle
@@ -19,5 +19,5 @@ dependencies {
   testImplementation project(":keiko-tck")
   testImplementation "io.spinnaker.kork:kork-sql-test"
   testImplementation "org.testcontainers:mysql"
-  testImplementation "mysql:mysql-connector-java"
+  testImplementation "com.mysql:mysql-connector-j"
 }
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/PinServerGroupStage.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/PinServerGroupStage.groovy
index 1353190a70..44a3bdec63 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/PinServerGroupStage.groovy
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/PinServerGroupStage.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup
 
+import com.netflix.spinnaker.orca.api.pipeline.graph.StageDefinitionBuilder
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution
 import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroupLinearStageSupport
 import com.netflix.spinnaker.orca.clouddriver.tasks.MonitorKatoTask
@@ -38,7 +39,7 @@ import org.springframework.stereotype.Component
 @Component
 @Slf4j
 class PinServerGroupStage extends TargetServerGroupLinearStageSupport {
-  public static final String TYPE = getType(PinServerGroupStage)
+  public static final String TYPE = StageDefinitionBuilder.getType(PinServerGroupStage)
 
   @Override
   protected void taskGraphInternal(StageExecution stage, TaskNode.Builder builder) {
diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy
index b0850a7401..d1e43b4460 100644
--- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy
+++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/ResizeServerGroupStage.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup
 
+import com.netflix.spinnaker.orca.api.pipeline.graph.StageDefinitionBuilder
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution
 import com.netflix.spinnaker.orca.clouddriver.pipeline.providers.aws.ModifyAwsScalingProcessStage
 import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.support.TargetServerGroupLinearStageSupport
@@ -37,7 +38,7 @@ import org.springframework.stereotype.Component
 @Component
 @Slf4j
 class ResizeServerGroupStage extends TargetServerGroupLinearStageSupport {
-  public static final String TYPE = getType(ResizeServerGroupStage)
+  public static final String TYPE = StageDefinitionBuilder.getType(ResizeServerGroupStage)
 
   @Override
   protected void taskGraphInternal(StageExecution stage, TaskNode.Builder builder) {
diff --git a/orca-integration/orca-integration.gradle b/orca-integration/orca-integration.gradle
index 132d5d3882..fc8cd1f8db 100644
--- a/orca-integration/orca-integration.gradle
+++ b/orca-integration/orca-integration.gradle
@@ -8,7 +8,7 @@ dependencies {
   testImplementation "org.testcontainers:testcontainers"
   testImplementation "org.testcontainers:junit-jupiter"
   testRuntimeOnly "ch.qos.logback:logback-classic"
-  testRuntimeOnly "mysql:mysql-connector-java"
+  testRuntimeOnly "com.mysql:mysql-connector-j"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
   testRuntimeOnly "org.postgresql:postgresql"
 
diff --git a/orca-queue-sql/orca-queue-sql.gradle b/orca-queue-sql/orca-queue-sql.gradle
index 63783b9005..af5bcdc646 100644
--- a/orca-queue-sql/orca-queue-sql.gradle
+++ b/orca-queue-sql/orca-queue-sql.gradle
@@ -25,5 +25,5 @@ dependencies {
   testImplementation("org.springframework:spring-test")
   testImplementation("org.springframework.boot:spring-boot-test")
 
-  testRuntimeOnly("mysql:mysql-connector-java")
+  testRuntimeOnly("com.mysql:mysql-connector-j")
 }
diff --git a/orca-sql-mysql/orca-sql-mysql.gradle b/orca-sql-mysql/orca-sql-mysql.gradle
index 959d633ddb..43eee689ec 100644
--- a/orca-sql-mysql/orca-sql-mysql.gradle
+++ b/orca-sql-mysql/orca-sql-mysql.gradle
@@ -1,4 +1,4 @@
 dependencies {
   implementation(project(":orca-sql"))
-  runtimeOnly("mysql:mysql-connector-java")
+  runtimeOnly("com.mysql:mysql-connector-j")
 }
diff --git a/orca-sql/orca-sql.gradle b/orca-sql/orca-sql.gradle
index 016028fdbe..68dbde4229 100644
--- a/orca-sql/orca-sql.gradle
+++ b/orca-sql/orca-sql.gradle
@@ -52,7 +52,7 @@ dependencies {
   testImplementation("org.testcontainers:mysql")
   testImplementation("org.testcontainers:postgresql")
 
-  testRuntimeOnly("mysql:mysql-connector-java")
+  testRuntimeOnly("com.mysql:mysql-connector-j")
   testRuntimeOnly("org.postgresql:postgresql")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }