diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index 95918477..daca8475 100644
--- a/wildfly-builder-image/image.yaml
+++ b/wildfly-builder-image/image.yaml
@@ -34,8 +34,10 @@ envs:
       value: org.wildfly.plugins
     - name: PROVISIONING_MAVEN_PLUGIN_ARTIFACT_ID
       value: wildfly-maven-plugin
-    - name: PROVISIONING_MAVEN_PLUGIN_VERSION
-      value: 5.0.1.Final
+    - name: DEFAULT_PROVISIONING_MAVEN_PLUGIN_VERSION
+      value: 5.0.0.Final
+    - name: PROVISIONING_MAVEN_PLUGIN_VERSION_EXCLUDES
+      value: .*-redhat-[0-9][0-9][0-9][0-9][0-9],.*\.Beta\d+,.*\.Alpha\d+
 ports:
     - value: 8080
 modules:
@@ -46,8 +48,8 @@ modules:
               ref: ubi9
           - name: wildfly-cekit-modules
             git:
-              url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              url: https://github.com/jfdenise/wildfly-cekit-modules
+              ref: patch_wfmp_version2
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-builder-image/tests/features/legacy-s2i.feature b/wildfly-builder-image/tests/features/legacy-s2i.feature
index 710b9a8e..621861b7 100644
--- a/wildfly-builder-image/tests/features/legacy-s2i.feature
+++ b/wildfly-builder-image/tests/features/legacy-s2i.feature
@@ -109,4 +109,22 @@ Scenario: Test external driver created during s2i.
    ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
    Then container log should contain WFLYSRV0010: Deployed "App1.war"
    Then container log should contain WFLYSRV0010: Deployed "App2.war"
-   Then container log should contain WFLYSRV0025
\ No newline at end of file
+   Then container log should contain WFLYSRV0025
+
+  Scenario: Test WildFly Maven Plugin version automatic update
+    Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images
+      | variable                             | value         |
+      | GALLEON_PROVISION_LAYERS | jaxrs-server |
+      | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
+    Then s2i build log should match regex wildfly-maven-plugin:.*\.Final:package
+    Then s2i build log should match regex Updated \$\{version.s2i.provisioning.maven.plugin\} from .*\.Final to .*\.Final
+    Then container log should contain WFLYSRV0025
+
+  Scenario: Test WildFly Maven Plugin version explicitly set
+    Given s2i build https://github.com/wildfly/wildfly-s2i from test/test-app-binary with env and True using legacy-s2i-images
+      | variable                             | value         |
+      | GALLEON_PROVISION_LAYERS | jaxrs-server |
+      | GALLEON_PROVISION_FEATURE_PACKS | org.wildfly:wildfly-galleon-pack:34.0.0.Beta1, org.wildfly.cloud:wildfly-cloud-galleon-pack:7.0.2.Final |
+      | PROVISIONING_MAVEN_PLUGIN_VERSION | 5.0.0.Final |
+    Then s2i build log should contain wildfly-maven-plugin:5.0.0.Final:package
+    Then container log should contain WFLYSRV0025
\ No newline at end of file