diff --git a/gradle.properties b/gradle.properties
index bf9d82171f..1d602ce94f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 enablePublishing=false
 fiatVersion=1.18.3
 keikoVersion=3.6.1
-korkVersion=7.41.1
+korkVersion=7.41.3
 kotlinVersion=1.3.71
 org.gradle.parallel=true
 spinnakerGradleVersion=8.0.6
diff --git a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/graph/StageDefinitionBuilder.java b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/graph/StageDefinitionBuilder.java
index ded35e5e61..40eacae4d2 100644
--- a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/graph/StageDefinitionBuilder.java
+++ b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/pipeline/graph/StageDefinitionBuilder.java
@@ -20,6 +20,7 @@
 import static com.netflix.spinnaker.orca.api.pipeline.graph.TaskNode.GraphType.FULL;
 
 import com.netflix.spinnaker.kork.annotations.Beta;
+import com.netflix.spinnaker.kork.plugins.api.internal.SpinnakerExtensionPoint;
 import com.netflix.spinnaker.orca.api.pipeline.graph.TaskNode.TaskGraph;
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution;
 import java.lang.annotation.ElementType;
@@ -30,7 +31,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import javax.annotation.Nonnull;
-import org.pf4j.ExtensionPoint;
 
 /**
  * Provides a low-level API for building stages.
@@ -41,7 +41,7 @@
  * stages.
  */
 @Beta
-public interface StageDefinitionBuilder extends ExtensionPoint {
+public interface StageDefinitionBuilder extends SpinnakerExtensionPoint {
 
   default @Nonnull TaskGraph buildTaskGraph(@Nonnull StageExecution stage) {
     Builder graphBuilder = Builder(FULL);
diff --git a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/preconfigured/jobs/PreconfiguredJobConfigurationProvider.java b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/preconfigured/jobs/PreconfiguredJobConfigurationProvider.java
index df3253f4ee..b9a91c3e70 100644
--- a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/preconfigured/jobs/PreconfiguredJobConfigurationProvider.java
+++ b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/preconfigured/jobs/PreconfiguredJobConfigurationProvider.java
@@ -17,12 +17,12 @@
 package com.netflix.spinnaker.orca.api.preconfigured.jobs;
 
 import com.netflix.spinnaker.kork.annotations.Beta;
+import com.netflix.spinnaker.kork.plugins.api.internal.SpinnakerExtensionPoint;
 import java.util.List;
-import org.pf4j.ExtensionPoint;
 
 /** Extension point for provisioning preconfigured Job stages. */
 @Beta
-public interface PreconfiguredJobConfigurationProvider extends ExtensionPoint {
+public interface PreconfiguredJobConfigurationProvider extends SpinnakerExtensionPoint {
 
   /**
    * Provides list of job configurations that gets launched from PreConfigured job stage.
diff --git a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/simplestage/SimpleStage.java b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/simplestage/SimpleStage.java
index b7107424f3..cefe69c0ff 100644
--- a/orca-api/src/main/java/com/netflix/spinnaker/orca/api/simplestage/SimpleStage.java
+++ b/orca-api/src/main/java/com/netflix/spinnaker/orca/api/simplestage/SimpleStage.java
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.orca.api.simplestage;
 
 import com.netflix.spinnaker.kork.annotations.Beta;
-import org.pf4j.ExtensionPoint;
+import com.netflix.spinnaker.kork.plugins.api.internal.SpinnakerExtensionPoint;
 
 /**
  * Allows the creation of the most simple stage possible: One with a single task.
@@ -26,7 +26,7 @@
  *     fields that are required for the stage to run.
  */
 @Beta
-public interface SimpleStage<T> extends ExtensionPoint {
+public interface SimpleStage<T> extends SpinnakerExtensionPoint {
   /**
    * When this stage runs, the execute method gets called. It takes in a class that is created that
    * has the data needed by the stage. It returns a class that contains the status of the stage,
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/TaskResolver.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/TaskResolver.java
index abb30f2a70..caddc2a9ff 100644
--- a/orca-core/src/main/java/com/netflix/spinnaker/orca/TaskResolver.java
+++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/TaskResolver.java
@@ -113,7 +113,8 @@ public Task getTask(@Nonnull Class<? extends Task> taskType) {
   @Nonnull
   public Class<? extends Task> getTaskClass(@Nonnull String taskTypeIdentifier) {
     try {
-      return getTask(taskTypeIdentifier).getClass();
+      Task task = getTask(taskTypeIdentifier);
+      return (Class<? extends Task>) task.getClass();
     } catch (IllegalArgumentException e) {
       if (!allowFallback) {
         throw e;
diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/SimpleTask.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/SimpleTask.java
index 9550400db8..0002e45b1d 100644
--- a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/SimpleTask.java
+++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/SimpleTask.java
@@ -17,7 +17,6 @@
 package com.netflix.spinnaker.orca.pipeline;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.spinnaker.kork.plugins.proxy.ExtensionClassProvider;
 import com.netflix.spinnaker.orca.api.pipeline.Task;
 import com.netflix.spinnaker.orca.api.pipeline.TaskResult;
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus;
@@ -47,7 +46,7 @@ public SimpleTask(@Nullable SimpleStage simpleStage) {
 
   private SimpleStageInput getStageInput(StageExecution stage, ObjectMapper objectMapper) {
     try {
-      Class<?> extensionClass = ExtensionClassProvider.getExtensionClass(simpleStage);
+      Class<?> extensionClass = simpleStage.getExtensionClass();
       List<Class<?>> cArg = Arrays.asList(SimpleStageInput.class);
       Method method = extensionClass.getMethod("execute", cArg.toArray(new Class[0]));
       Type inputType = ResolvableType.forMethodParameter(method, 0).getGeneric().getType();