diff --git a/.github/workflows/release-snapshots.yaml b/.github/workflows/release-snapshots.yaml
index 67fc4bf1e2d..6f7457a434c 100644
--- a/.github/workflows/release-snapshots.yaml
+++ b/.github/workflows/release-snapshots.yaml
@@ -29,6 +29,7 @@ on:
 env:
   MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e ${{ github.event.inputs.additional_args }}
   RELEASE_MAVEN_ARGS: -Prelease -Denforcer.skip=true
+  ALT_DEPLOYMENT_REPOSITORY: -DaltDeploymentRepository=ossrh::default::https://oss.sonatype.org/content/repositories/snapshots/
   OSSRHUSERNAME: ${{ secrets.OSSRHUSERNAME }}
   OSSRHPASSWORD: ${{ secrets.OSSRHPASSWORD }}
   SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
@@ -90,3 +91,8 @@ jobs:
           gpg-passphrase: SIGNINGPASSWORD
       - name: Build and release Java 11 modules
         run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" -pl "httpclient-jetty" clean deploy
+      - name: Build and release BOM
+        run: |
+          ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom                                     &&
+          ./mvnw -f "target/classes/kubernetes-client-bom/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}      &&
+          ./mvnw -f "target/classes/kubernetes-client-bom-with-deps/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index fc563b40eb7..f8957615452 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -34,6 +34,7 @@ on:
 env:
   MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e ${{ github.event.inputs.additional_args }}
   RELEASE_MAVEN_ARGS: -Prelease -DstagingProgressTimeoutMinutes=20
+  ALT_DEPLOYMENT_REPOSITORY: -DaltDeploymentRepository=ossrh::default::https://oss.sonatype.org/service/local/staging/deploy/maven2/
   OSSRHUSERNAME: ${{ secrets.OSSRHUSERNAME }}
   OSSRHPASSWORD: ${{ secrets.OSSRHPASSWORD }}
   SIGNINGPASSWORD: ${{ secrets.SIGNINGPASSWORD }}
@@ -99,3 +100,8 @@ jobs:
           gpg-passphrase: SIGNINGPASSWORD
       - name: Build and release Java 11 modules
         run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" -pl "httpclient-jetty" clean deploy
+      - name: Build and release BOM
+        run: |
+          ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} clean sundr:generate-bom                                     &&
+          ./mvnw -f "target/classes/kubernetes-client-bom/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}      &&
+          ./mvnw -f "target/classes/kubernetes-client-bom-with-deps/pom.xml" clean deploy ${ALT_DEPLOYMENT_REPOSITORY}
diff --git a/pom.xml b/pom.xml
index 57e564a8771..d3b5bae707b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1185,78 +1185,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>io.sundr</groupId>
-        <artifactId>sundr-maven-plugin</artifactId>
-        <version>${sundrio.version}</version>
-        <!--dependencies>
-          <dependency>
-            <groupId>io.sundr</groupId>
-            <artifactId>sundr-codegen</artifactId>
-            <version>${sundrio.version}</version>
-            <exclusions>
-              <exclusion>
-                <groupId>com.sun</groupId>
-                <artifactId>tools</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-        </dependencies-->
-        <configuration>
-          <boms>
-            <bom>
-              <artifactId>kubernetes-client-bom</artifactId>
-              <name>Fabric8 :: Kubernetes :: Bom</name>
-              <properties>
-                <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
-                <sonar.skip>true</sonar.skip>
-              </properties>
-            </bom>
-            <bom>
-              <artifactId>kubernetes-client-bom-with-deps</artifactId>
-              <name>Fabric8 :: Kubernetes :: Bom with Dependencies</name>
-              <dependencies>
-                <includes>
-                  <include>com.squareup*:*</include>
-                  <include>com.fasterxml.jackson*:*</include>
-                  <include>io.fabric8:kubernetes-model-core*</include>
-                  <include>io.fabric8:kubernetes-model-rbac*</include>
-                  <include>io.fabric8:kubernetes-model-admissionregistration*</include>
-                  <include>io.fabric8:kubernetes-model-apiextensions*</include>
-                  <include>io.fabric8:kubernetes-model-apps*</include>
-                  <include>io.fabric8:kubernetes-model-autoscaling*</include>
-                  <include>io.fabric8:kubernetes-model-batch*</include>
-                  <include>io.fabric8:kubernetes-model-certificates*</include>
-                  <include>io.fabric8:kubernetes-model-coordination*</include>
-                  <include>io.fabric8:kubernetes-model-discovery*</include>
-                  <include>io.fabric8:kubernetes-model-events*</include>
-                  <include>io.fabric8:kubernetes-model-extensions*</include>
-                  <include>io.fabric8:kubernetes-model-gatewayapi*</include>
-                  <include>io.fabric8:kubernetes-model-networking*</include>
-                  <include>io.fabric8:kubernetes-model-node*</include>
-                  <include>io.fabric8:kubernetes-model-metrics*</include>
-                  <include>io.fabric8:kubernetes-model-policy*</include>
-                  <include>io.fabric8:kubernetes-model-scheduling*</include>
-                  <include>io.fabric8:kubernetes-model-storageclass*</include>
-                  <include>io.fabric8:kubernetes-model-resource*</include>
-                  <include>io.fabric8:openshift-model*</include>
-                </includes>
-              </dependencies>
-              <properties>
-                <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
-                <sonar.skip>true</sonar.skip>
-              </properties>
-            </bom>
-          </boms>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-bom</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -1477,6 +1405,69 @@
         <module>httpclient-jetty</module>
         <module>httpclient-tests</module>
       </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.sundr</groupId>
+            <artifactId>sundr-maven-plugin</artifactId>
+            <version>${sundrio.version}</version>
+            <configuration>
+              <boms>
+                <bom>
+                  <artifactId>kubernetes-client-bom</artifactId>
+                  <name>Fabric8 :: Kubernetes :: Bom</name>
+                  <properties>
+                    <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
+                    <sonar.skip>true</sonar.skip>
+                  </properties>
+                </bom>
+                <bom>
+                  <artifactId>kubernetes-client-bom-with-deps</artifactId>
+                  <name>Fabric8 :: Kubernetes :: Bom with Dependencies</name>
+                  <dependencies>
+                    <includes>
+                      <include>com.squareup*:*</include>
+                      <include>com.fasterxml.jackson*:*</include>
+                      <include>io.fabric8:kubernetes-model-core*</include>
+                      <include>io.fabric8:kubernetes-model-rbac*</include>
+                      <include>io.fabric8:kubernetes-model-admissionregistration*</include>
+                      <include>io.fabric8:kubernetes-model-apiextensions*</include>
+                      <include>io.fabric8:kubernetes-model-apps*</include>
+                      <include>io.fabric8:kubernetes-model-autoscaling*</include>
+                      <include>io.fabric8:kubernetes-model-batch*</include>
+                      <include>io.fabric8:kubernetes-model-certificates*</include>
+                      <include>io.fabric8:kubernetes-model-coordination*</include>
+                      <include>io.fabric8:kubernetes-model-discovery*</include>
+                      <include>io.fabric8:kubernetes-model-events*</include>
+                      <include>io.fabric8:kubernetes-model-extensions*</include>
+                      <include>io.fabric8:kubernetes-model-gatewayapi*</include>
+                      <include>io.fabric8:kubernetes-model-networking*</include>
+                      <include>io.fabric8:kubernetes-model-node*</include>
+                      <include>io.fabric8:kubernetes-model-metrics*</include>
+                      <include>io.fabric8:kubernetes-model-policy*</include>
+                      <include>io.fabric8:kubernetes-model-scheduling*</include>
+                      <include>io.fabric8:kubernetes-model-storageclass*</include>
+                      <include>io.fabric8:kubernetes-model-resource*</include>
+                      <include>io.fabric8:openshift-model*</include>
+                    </includes>
+                  </dependencies>
+                  <properties>
+                    <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
+                    <sonar.skip>true</sonar.skip>
+                  </properties>
+                </bom>
+              </boms>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>generate-bom</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>javadoc-test</id>