diff --git a/extensions/container-image/container-image-s2i/deployment/pom.xml b/extensions/container-image/container-image-s2i/deployment/pom.xml
index 6d1e0b00c4e25..23ee07b025f20 100644
--- a/extensions/container-image/container-image-s2i/deployment/pom.xml
+++ b/extensions/container-image/container-image-s2i/deployment/pom.xml
@@ -18,6 +18,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-spi</artifactId>
diff --git a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
index a438b69e04797..bcc2632ef635c 100644
--- a/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
+++ b/extensions/container-image/container-image-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
@@ -72,7 +72,7 @@ public class S2iProcessor {
 
     private static final Logger LOG = Logger.getLogger(S2iProcessor.class);
 
-    @BuildStep(onlyIf = S2iBuild.class, onlyIfNot = NativeBuild.class)
+    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
     public void s2iRequirementsJvm(S2iConfig s2iConfig,
             CurateOutcomeBuildItem curateOutcomeBuildItem,
             OutputTargetBuildItem out,
@@ -97,7 +97,7 @@ public void s2iRequirementsJvm(S2iConfig s2iConfig,
         commandProducer.produce(new KubernetesCommandBuildItem("java", args.toArray(new String[args.size()])));
     }
 
-    @BuildStep(onlyIf = { S2iBuild.class, NativeBuild.class })
+    @BuildStep(onlyIf = { IsNormal.class, S2iBuild.class, NativeBuild.class })
     public void s2iRequirementsNative(S2iConfig s2iConfig,
             CurateOutcomeBuildItem curateOutcomeBuildItem,
             OutputTargetBuildItem out,
diff --git a/extensions/container-image/container-image-s2i/runtime/pom.xml b/extensions/container-image/container-image-s2i/runtime/pom.xml
index 7a3f4fc8ba7e7..e9d121536bbaf 100644
--- a/extensions/container-image/container-image-s2i/runtime/pom.xml
+++ b/extensions/container-image/container-image-s2i/runtime/pom.xml
@@ -14,6 +14,13 @@
     <name>Quarkus - Container - Image - S2I</name>
     <description>Build container images of your application using OpenShift S2I</description>
 
+    <dependencies>
+        <!-- We need the config to be on the runtime classpath because it's referenced from the config generation -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-internal</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>