diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
index 157eadc3..a1a42919 100644
--- a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
+++ b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
@@ -1,7 +1,7 @@
 
 # include dependencies
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # initialization of maven s2i module
 function maven_s2i_init() {
@@ -80,11 +80,6 @@ function maven_s2i_maven_build() {
 # copy build output to deployments folder
 # internal method
 function maven_s2i_deploy_artifacts() {
-  if [ -n "$(type -t maven_s2i_deploy_artifacts_override)" ]; then
-    eval maven_s2i_deploy_artifacts_override $*
-    return $?
-  fi
-
   local artifact_dirs=${1:-${MAVEN_S2I_ARTIFACT_DIRS}}
 
   if [[ ! "${S2I_SOURCE_DIR}" =~ ^\/ ]]; then
diff --git a/modules/maven/s2i/module.yaml b/modules/maven/s2i/module.yaml
index bda76a18..d273e5f0 100644
--- a/modules/maven/s2i/module.yaml
+++ b/modules/maven/s2i/module.yaml
@@ -29,7 +29,6 @@ execute:
 modules:
   install:
   - name: jboss.container.user
-  - name: jboss.container.s2i.core
   - name: jboss.container.maven.default
   - name: jboss.container.util.logging
 
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides b/modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-overrides
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides
rename to modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-overrides
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides b/modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
similarity index 87%
rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
rename to modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
index 2def2413..184c92c3 100644
--- a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
+++ b/modules/s2i/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
@@ -1,6 +1,6 @@
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # inject our overridden maven_*() functions
 function maven_s2i_source_maven_overrides() {
@@ -33,9 +33,3 @@ function maven_s2i_custom_binary_build() {
 
   recursive_copy_files "${binary_dir}" "${S2I_TARGET_DEPLOYMENTS_DIR}"
 }
-
-function maven_s2i_deploy_artifacts_override() {
-  unset -f maven_s2i_deploy_artifacts_override
-  eval maven_s2i_deploy_artifacts $*
-  return $?
-}
diff --git a/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core b/modules/s2i/artifacts/opt/jboss/container/java/s2i/s2i-core
similarity index 96%
rename from modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core
rename to modules/s2i/artifacts/opt/jboss/container/java/s2i/s2i-core
index 47446df2..e2b37c17 100644
--- a/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core
+++ b/modules/s2i/artifacts/opt/jboss/container/java/s2i/s2i-core
@@ -19,8 +19,8 @@ function s2i_core_init() {
 }
 
 function s2i_core_env_init() {
-  # initialize core s2i environmet variables
-  s2i_core_env_init_hook
+  # initialize core s2i environment variables
+  S2I_TARGET_DATA_DIR="${S2I_TARGET_DATA_DIR:-${JAVA_DATA_DIR:-/deployments/data}}"
   S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
   S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
   S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
@@ -35,12 +35,6 @@ function s2i_core_env_init() {
   S2I_DELETE_SOURCE="${S2I_DELETE_SOURCE:-true}"
 }
 
-# extensions may override this method to initialize environment variables
-# to suit their own needs.
-function s2i_core_env_init_hook() {
-  : 
-}
-
 # Copy files from a source path to a destination path
 # Do not attempt to change metadata of the destination path, which we
 # may not own
diff --git a/modules/s2i/bash/artifacts/usr/libexec/s2i/assemble b/modules/s2i/artifacts/usr/libexec/s2i/assemble
old mode 100644
new mode 100755
similarity index 72%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/assemble
rename to modules/s2i/artifacts/usr/libexec/s2i/assemble
index fa5e0f20..ff4a9e82
--- a/modules/s2i/bash/artifacts/usr/libexec/s2i/assemble
+++ b/modules/s2i/artifacts/usr/libexec/s2i/assemble
@@ -5,9 +5,6 @@ set -e
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
 source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
 
-# include our s2i_core_*() overrides/extensions
-source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
-
 # inject our overridden maven_s2i_*() functions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
 
diff --git a/modules/s2i/bash/artifacts/usr/libexec/s2i/run b/modules/s2i/artifacts/usr/libexec/s2i/run
old mode 100644
new mode 100755
similarity index 78%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/run
rename to modules/s2i/artifacts/usr/libexec/s2i/run
index 0c6f5718..0b23df10
--- a/modules/s2i/bash/artifacts/usr/libexec/s2i/run
+++ b/modules/s2i/artifacts/usr/libexec/s2i/run
@@ -4,9 +4,7 @@
 args="$*"
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "${JBOSS_CONTAINER_S2I_CORE_MODULE}/s2i-core"
-# include our s2i_core_*() overrides/extensions
-source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # Global S2I variable setup
 s2i_core_env_init
diff --git a/modules/s2i/bash/artifacts/usr/libexec/s2i/usage b/modules/s2i/artifacts/usr/libexec/s2i/usage
old mode 100644
new mode 100755
similarity index 100%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/usage
rename to modules/s2i/artifacts/usr/libexec/s2i/usage
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks
deleted file mode 100644
index 6cc5e529..00000000
--- a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks
+++ /dev/null
@@ -1,7 +0,0 @@
-
-source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-
-# override core variables
-function s2i_core_env_init_hook() {
-  S2I_TARGET_DATA_DIR="${S2I_TARGET_DATA_DIR:-${JAVA_DATA_DIR:-/deployments/data}}"
-}
diff --git a/modules/s2i/bash/module.yaml b/modules/s2i/bash/module.yaml
deleted file mode 100644
index ffcfbc0b..00000000
--- a/modules/s2i/bash/module.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-schema_version: 1
-name: jboss.container.java.s2i.bash
-version: '1.0'
-description: Customization of common Maven S2I for Java S2I image.
-
-envs:
-- name: JBOSS_CONTAINER_JAVA_S2I_MODULE
-  value: /opt/jboss/container/java/s2i
-
-execute:
-- script: configure.sh
-
-modules:
-  install:
-  - name: jboss.container.user
-  - name: jboss.container.maven.s2i
-  - name: jboss.container.java.run
-  - name: jboss.container.util.logging
-  - name: jboss.container.s2i.core
-
-packages:
-  install:
-  - rsync
diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/configure.sh
old mode 100644
new mode 100755
similarity index 59%
rename from modules/s2i/bash/configure.sh
rename to modules/s2i/configure.sh
index e5eb983d..206aa1f8
--- a/modules/s2i/bash/configure.sh
+++ b/modules/s2i/configure.sh
@@ -7,3 +7,9 @@ ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 install -D ${ARTIFACTS_DIR}/usr/libexec/s2i/* /usr/libexec/s2i
 install -m 0644 -D -t /opt/jboss/container/java/s2i \
     ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/*
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/java/s2i/s2i-core
+
+mkdir -p /deployments \
+ && chmod -R "ug+rwX" /deployments \
+ && chown -R $USER:root /deployments
diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh
deleted file mode 100755
index 21081256..00000000
--- a/modules/s2i/core/configure.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/s2i/core/s2i-core
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
-mkdir -p /deployments \
- && chmod -R "ug+rwX" /deployments \
- && chown -R $USER:root /deployments
diff --git a/modules/s2i/core/module.yaml b/modules/s2i/module.yaml
similarity index 91%
rename from modules/s2i/core/module.yaml
rename to modules/s2i/module.yaml
index eb24eb11..19095b6e 100644
--- a/modules/s2i/core/module.yaml
+++ b/modules/s2i/module.yaml
@@ -1,28 +1,23 @@
 schema_version: 1
-name: jboss.container.s2i.core
-version: '9.0'
-description: "Provides support for core s2i capabilities."
+name: jboss.container.java.s2i
+version: '1.0'
+description: Customization of common Maven S2I for Java S2I image.
 
-execute:
-- script: configure.sh
+modules:
+  install:
+  - name: jboss.container.user
+  - name: jboss.container.maven.s2i
+  - name: jboss.container.java.run
+  - name: jboss.container.util.logging
 
 packages:
   install:
   - findutils
   - rsync
 
-labels:
-  # XXX this modules does not install files in this path
-- name: "io.openshift.s2i.scripts-url"
-  value: "image:///usr/libexec/s2i"
-- name: io.openshift.s2i.destination
-  value: "/tmp"
-- name: org.jboss.container.deployments-dir
-  value: "/deployments"
-
 envs:
-- name: JBOSS_CONTAINER_S2I_CORE_MODULE
-  value: /opt/jboss/container/s2i/core/
+- name: JBOSS_CONTAINER_JAVA_S2I_MODULE
+  value: /opt/jboss/container/java/s2i
 
 - name: S2I_DESTINATION_DIR
   description: ^
@@ -113,11 +108,17 @@ envs:
     Delete source files at the end of build.  Defaults to true.
   example: "false"
 
+labels:
+- name: "io.openshift.s2i.scripts-url"
+  value: "image:///usr/libexec/s2i"
+- name: io.openshift.s2i.destination
+  value: "/tmp"
+- name: org.jboss.container.deployments-dir
+  value: "/deployments"
+
+execute:
+- script: configure.sh
+
 run:
   cmd:
-    # XXX this script is in a different module
   - "/usr/libexec/s2i/run"
-
-modules:
-  install:
-    - name: jboss.container.user
diff --git a/modules/s2i/bash/tests/features/files.feature b/modules/s2i/tests/features/files.feature
similarity index 100%
rename from modules/s2i/bash/tests/features/files.feature
rename to modules/s2i/tests/features/files.feature
diff --git a/modules/s2i/core/tests/features/java_s2i_quarkus.feature b/modules/s2i/tests/features/java_s2i_quarkus.feature
similarity index 100%
rename from modules/s2i/core/tests/features/java_s2i_quarkus.feature
rename to modules/s2i/tests/features/java_s2i_quarkus.feature
diff --git a/modules/s2i/core/tests/features/s2i-core.feature b/modules/s2i/tests/features/s2i-core.feature
similarity index 100%
rename from modules/s2i/core/tests/features/s2i-core.feature
rename to modules/s2i/tests/features/s2i-core.feature
diff --git a/ubi10-openjdk-21.yaml b/ubi10-openjdk-21.yaml
index a8b9aa97..6708e1c7 100644
--- a/ubi10-openjdk-21.yaml
+++ b/ubi10-openjdk-21.yaml
@@ -57,7 +57,7 @@ modules:
     version: "21"
   - name: jboss.container.maven
     version: "3.9.21"
-  - name: jboss.container.java.s2i.bash
+  - name: jboss.container.java.s2i
 
 help:
   add: true