diff --git a/modules/jdk/17/artifacts/jvm-options b/modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
similarity index 100%
rename from modules/jdk/17/artifacts/jvm-options
rename to modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
diff --git a/modules/jdk/17/configure.sh b/modules/jdk/17/configure.sh
index d19bea43..1e6c223d 100755
--- a/modules/jdk/17/configure.sh
+++ b/modules/jdk/17/configure.sh
@@ -2,6 +2,11 @@
 # Configure module
 set -e
 
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
+
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-17-openjdk.${_arch}
diff --git a/modules/jdk/17/module.yaml b/modules/jdk/17/module.yaml
index 32dc1bf1..3fd1cd48 100644
--- a/modules/jdk/17/module.yaml
+++ b/modules/jdk/17/module.yaml
@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jdk
diff --git a/modules/jdk/21/artifacts/jvm-options b/modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
similarity index 100%
rename from modules/jdk/21/artifacts/jvm-options
rename to modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
diff --git a/modules/jdk/21/configure.sh b/modules/jdk/21/configure.sh
index 2020168a..c697a9ab 100755
--- a/modules/jdk/21/configure.sh
+++ b/modules/jdk/21/configure.sh
@@ -2,6 +2,11 @@
 # Configure module
 set -e
 
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
+
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
 alternatives --set java java-21-openjdk.${_arch}
diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
index 85834284..fe2f4a5f 100644
--- a/modules/jdk/21/module.yaml
+++ b/modules/jdk/21/module.yaml
@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jdk
diff --git a/modules/jdk/8/configure.sh b/modules/jdk/8/configure.sh
index 64bd5137..e3515858 100755
--- a/modules/jdk/8/configure.sh
+++ b/modules/jdk/8/configure.sh
@@ -5,13 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
diff --git a/modules/jre/17/artifacts/jvm-options b/modules/jre/17/artifacts/opt/jboss/container/openjdk/jre/jvm-options
similarity index 100%
rename from modules/jre/17/artifacts/jvm-options
rename to modules/jre/17/artifacts/opt/jboss/container/openjdk/jre/jvm-options
diff --git a/modules/jre/17/configure.sh b/modules/jre/17/configure.sh
index 815ee27d..920b0a64 100755
--- a/modules/jre/17/configure.sh
+++ b/modules/jre/17/configure.sh
@@ -1,5 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
diff --git a/modules/jre/17/module.yaml b/modules/jre/17/module.yaml
index 2ad5b0a3..88e87617 100644
--- a/modules/jre/17/module.yaml
+++ b/modules/jre/17/module.yaml
@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jre
diff --git a/modules/jre/21/artifacts/jvm-options b/modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options
similarity index 100%
rename from modules/jre/21/artifacts/jvm-options
rename to modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options
diff --git a/modules/jre/21/configure.sh b/modules/jre/21/configure.sh
index 038a8e71..9b850d27 100755
--- a/modules/jre/21/configure.sh
+++ b/modules/jre/21/configure.sh
@@ -1,5 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml
index aba6937f..5a2ff731 100644
--- a/modules/jre/21/module.yaml
+++ b/modules/jre/21/module.yaml
@@ -33,7 +33,3 @@ modules:
 
 execute:
 - script: configure.sh
-
-artifacts:
-  - path: artifacts/jvm-options
-    dest: /opt/jboss/container/openjdk/jre
diff --git a/modules/jre/8/configure.sh b/modules/jre/8/configure.sh
index 86be8555..b4b4c02b 100755
--- a/modules/jre/8/configure.sh
+++ b/modules/jre/8/configure.sh
@@ -1,17 +1,10 @@
-#!/bin/sh
-# Configure module
-set -e
+#!/bin/bash
+set -euo pipefail
 
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R $USER:root $SCRIPT_DIR
-chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
 
 # Set this JDK as the alternative in use
 _arch="$(uname -i)"
diff --git a/modules/jvm/artifacts/jvm/debug-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options
similarity index 100%
rename from modules/jvm/artifacts/jvm/debug-options
rename to modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options
diff --git a/modules/jvm/artifacts/jvm/java-default-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options
similarity index 100%
rename from modules/jvm/artifacts/jvm/java-default-options
rename to modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options
diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh
index ee8e7041..f9ebe210 100644
--- a/modules/jvm/configure.sh
+++ b/modules/jvm/configure.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-# OPENJDK-3695: force +x for scripts
-chmod 0755 /opt/jboss/container/java/jvm/*
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -D -t /opt/jboss/container/java/jvm \
+    ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*
diff --git a/modules/jvm/module.yaml b/modules/jvm/module.yaml
index 49821b72..9ab1d08f 100644
--- a/modules/jvm/module.yaml
+++ b/modules/jvm/module.yaml
@@ -5,9 +5,8 @@ description: ^
   Provides support for configuring Java JVM, e.g. GC settings, etc.  Basic usage
   is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options)
 
-artifacts:
-  - path: artifacts/jvm
-    dest: /opt/jboss/container/java/jvm
+execute:
+- script: configure.sh
 
 execute:
 - script: configure.sh
diff --git a/modules/maven/default/artifacts/default/jboss-settings.xml b/modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml
similarity index 100%
rename from modules/maven/default/artifacts/default/jboss-settings.xml
rename to modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml
diff --git a/modules/maven/default/artifacts/default/maven.sh b/modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh
similarity index 100%
rename from modules/maven/default/artifacts/default/maven.sh
rename to modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh
diff --git a/modules/maven/default/configure.sh b/modules/maven/default/configure.sh
index 8339e2ff..0dd5bf7b 100755
--- a/modules/maven/default/configure.sh
+++ b/modules/maven/default/configure.sh
@@ -1,12 +1,16 @@
-#!/bin/sh
-# Configure module
-set -e
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D -t /opt/jboss/container/maven/default \
+    ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/*
 
 MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
 
 # pull in specific maven version to serve as default
 ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
-chown -h $USER:root /opt/jboss/container/maven/default/*
 
 # install default settings.xml file in user home
 mkdir -p $HOME/.m2
diff --git a/modules/maven/default/module.yaml b/modules/maven/default/module.yaml
index 08ae2a84..e029a78e 100644
--- a/modules/maven/default/module.yaml
+++ b/modules/maven/default/module.yaml
@@ -8,10 +8,6 @@ description: ^
 execute:
 - script: configure.sh
 
-artifacts:
-  - path: artifacts/default
-    dest: /opt/jboss/container/maven/default
-
 modules:
   install:
   - name: jboss.container.user
diff --git a/modules/maven/module/configure.sh b/modules/maven/module/configure.sh
new file mode 100755
index 00000000..d42c27a7
--- /dev/null
+++ b/modules/maven/module/configure.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+cp ${ARTIFACTS_DIR}/maven.module /etc/dnf/modules.d/maven.module
diff --git a/modules/maven/module/module.yaml b/modules/maven/module/module.yaml
index 4128f34f..cd2b136d 100644
--- a/modules/maven/module/module.yaml
+++ b/modules/maven/module/module.yaml
@@ -4,6 +4,5 @@ version: '3.8'
 description: ^
   Enables the AppStream RPM Module for Maven 3.8 packages.
 
-artifacts:
-  - path: artifacts/maven.module
-    dest: /etc/dnf/modules.d
+execute:
+- script: configure.sh
diff --git a/modules/maven/s2i/artifacts/s2i/maven-overrides b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides
similarity index 100%
rename from modules/maven/s2i/artifacts/s2i/maven-overrides
rename to modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides
diff --git a/modules/maven/s2i/artifacts/s2i/maven-s2i b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
similarity index 100%
rename from modules/maven/s2i/artifacts/s2i/maven-s2i
rename to modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
diff --git a/modules/maven/s2i/artifacts/usr/local/s2i/assemble b/modules/maven/s2i/artifacts/usr/local/s2i/assemble
new file mode 100644
index 00000000..e926d46c
--- /dev/null
+++ b/modules/maven/s2i/artifacts/usr/local/s2i/assemble
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
+source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
+
+# invoke the build
+maven_s2i_build
diff --git a/modules/maven/s2i/artifacts/save-artifacts b/modules/maven/s2i/artifacts/usr/local/s2i/save-artifacts
old mode 100755
new mode 100644
similarity index 100%
rename from modules/maven/s2i/artifacts/save-artifacts
rename to modules/maven/s2i/artifacts/usr/local/s2i/save-artifacts
diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh
index f4fc30d8..2194c2c6 100644
--- a/modules/maven/s2i/configure.sh
+++ b/modules/maven/s2i/configure.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
-# OPENJDK-3695: force +x for scripts
-chmod 0755 /usr/libexec/s2i/save-artifacts
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -D ${ARTIFACTS_DIR}/usr/local/s2i/* /usr/local/s2i
+install -m 0644 -D -t /opt/jboss/container/maven/s2i \
+    ${ARTIFACTS_DIR}/opt/jboss/container/maven/s2i/*
diff --git a/modules/maven/s2i/module.yaml b/modules/maven/s2i/module.yaml
index 0b65c16b..bda76a18 100644
--- a/modules/maven/s2i/module.yaml
+++ b/modules/maven/s2i/module.yaml
@@ -23,6 +23,9 @@ envs:
 - name: JBOSS_CONTAINER_MAVEN_S2I_MODULE
   value: /opt/jboss/container/maven/s2i
 
+execute:
+- script: configure.sh
+
 modules:
   install:
   - name: jboss.container.user
@@ -36,9 +39,3 @@ execute:
 packages:
   install:
   - tar
-
-artifacts:
-  - path: artifacts/s2i
-    dest: /opt/jboss/container/maven/s2i
-  - path: artifacts/save-artifacts
-    dest: /usr/libexec/s2i
diff --git a/modules/proxy/artifacts/proxy/parse-proxy-url.sh b/modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh
similarity index 100%
rename from modules/proxy/artifacts/proxy/parse-proxy-url.sh
rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh
diff --git a/modules/proxy/artifacts/proxy/proxy-options b/modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options
similarity index 100%
rename from modules/proxy/artifacts/proxy/proxy-options
rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options
diff --git a/modules/proxy/artifacts/proxy/translate-no-proxy.sh b/modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh
similarity index 100%
rename from modules/proxy/artifacts/proxy/translate-no-proxy.sh
rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh
diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh
new file mode 100755
index 00000000..5f979eca
--- /dev/null
+++ b/modules/proxy/configure.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D -t /opt/jboss/container/java/proxy \
+    ${ARTIFACTS_DIR}/opt/jboss/container/java/proxy/*
diff --git a/modules/proxy/module.yaml b/modules/proxy/module.yaml
index 3a50686f..ba613442 100644
--- a/modules/proxy/module.yaml
+++ b/modules/proxy/module.yaml
@@ -23,6 +23,5 @@ modules:
   install:
   - name: jboss.container.user
 
-artifacts:
-  - path: artifacts/proxy
-    dest: /opt/jboss/container/java/proxy
+execute:
+- script: configure.sh
diff --git a/modules/run/artifacts/run-java.sh b/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh
similarity index 100%
rename from modules/run/artifacts/run-java.sh
rename to modules/run/artifacts/opt/jboss/container/java/run/run-java.sh
diff --git a/modules/run/configure.sh b/modules/run/configure.sh
index fa803fdc..e8184a38 100755
--- a/modules/run/configure.sh
+++ b/modules/run/configure.sh
@@ -1,5 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -D {${ARTIFACTS_DIR},}/opt/jboss/container/java/run/run-java.sh
 
 mkdir -p /deployments/data \
  && chmod -R "ug+rwX" /deployments/data \
diff --git a/modules/run/module.yaml b/modules/run/module.yaml
index 70be354d..249e85eb 100644
--- a/modules/run/module.yaml
+++ b/modules/run/module.yaml
@@ -59,7 +59,3 @@ modules:
   - name: jboss.container.user
   - name: jboss.container.java.jvm
   - name: jboss.container.util.logging
-
-artifacts:
-  - path: artifacts/run-java.sh
-    dest: /opt/jboss/container/java/run
diff --git a/modules/s2i/bash/artifacts/opt/maven-overrides b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/maven-overrides
rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides
diff --git a/modules/s2i/bash/artifacts/opt/maven-s2i-overrides b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/maven-s2i-overrides
rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
diff --git a/modules/s2i/bash/artifacts/opt/s2i-core-hooks b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/s2i-core-hooks
rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks
diff --git a/modules/s2i/bash/artifacts/local/assemble b/modules/s2i/bash/artifacts/usr/local/s2i/assemble
old mode 100755
new mode 100644
similarity index 100%
rename from modules/s2i/bash/artifacts/local/assemble
rename to modules/s2i/bash/artifacts/usr/local/s2i/assemble
diff --git a/modules/s2i/bash/artifacts/local/run b/modules/s2i/bash/artifacts/usr/local/s2i/run
old mode 100755
new mode 100644
similarity index 100%
rename from modules/s2i/bash/artifacts/local/run
rename to modules/s2i/bash/artifacts/usr/local/s2i/run
diff --git a/modules/s2i/bash/artifacts/local/usage b/modules/s2i/bash/artifacts/usr/local/s2i/usage
old mode 100755
new mode 100644
similarity index 100%
rename from modules/s2i/bash/artifacts/local/usage
rename to modules/s2i/bash/artifacts/usr/local/s2i/usage
diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh
index 408960f7..5ef32829 100644
--- a/modules/s2i/bash/configure.sh
+++ b/modules/s2i/bash/configure.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
-# OPENJDK-3695: force +x for scripts
-chmod 0755 /usr/local/s2i/{assemble,run,usage}
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -D ${ARTIFACTS_DIR}/usr/local/s2i/* /usr/local/s2i
+install -m 0644 -D -t /opt/jboss/container/java/s2i \
+    ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/*
diff --git a/modules/s2i/bash/module.yaml b/modules/s2i/bash/module.yaml
index 13e78b12..3199994c 100644
--- a/modules/s2i/bash/module.yaml
+++ b/modules/s2i/bash/module.yaml
@@ -7,6 +7,9 @@ envs:
 - name: JBOSS_CONTAINER_JAVA_S2I_MODULE
   value: /opt/jboss/container/java/s2i
 
+execute:
+- script: configure.sh
+
 modules:
   install:
   - name: jboss.container.user
@@ -17,12 +20,3 @@ modules:
 packages:
   install:
   - rsync
-
-artifacts:
-  - path: artifacts/local
-    dest: /usr/local/s2i
-  - path: artifacts/opt
-    dest: /opt/jboss/container/java/s2i
-
-execute:
-- script: configure.sh
diff --git a/modules/s2i/core/artifacts/s2i-core b/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core
similarity index 100%
rename from modules/s2i/core/artifacts/s2i-core
rename to modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core
diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh
index 1be1f78a..28834f72 100755
--- a/modules/s2i/core/configure.sh
+++ b/modules/s2i/core/configure.sh
@@ -1,5 +1,18 @@
-#!/bin/sh
-set -e
+#!/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 /usr/local/s2i \
+ && chmod 775 /usr/local/s2i \
+ && chown -R $USER:root /usr/local/s2i
 
 # OPENJDK-2805
 ln -s /usr/local/s2i /usr/libexec/s2i
diff --git a/modules/s2i/core/module.yaml b/modules/s2i/core/module.yaml
index 28e3e88f..1d0938ba 100644
--- a/modules/s2i/core/module.yaml
+++ b/modules/s2i/core/module.yaml
@@ -119,7 +119,3 @@ run:
 modules:
   install:
     - name: jboss.container.user
-
-artifacts:
-  - path: artifacts/s2i-core
-    dest: /opt/jboss/container/s2i/core
diff --git a/modules/util/logging/artifacts/logging.sh b/modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh
similarity index 100%
rename from modules/util/logging/artifacts/logging.sh
rename to modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh
diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh
new file mode 100755
index 00000000..7585bb38
--- /dev/null
+++ b/modules/util/logging/configure.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/util/logging/logging.sh
diff --git a/modules/util/logging/module.yaml b/modules/util/logging/module.yaml
index 0c43c5da..ef81ff78 100644
--- a/modules/util/logging/module.yaml
+++ b/modules/util/logging/module.yaml
@@ -14,6 +14,5 @@ modules:
   install:
   - name: jboss.container.user
 
-artifacts:
-  - path: artifacts/logging.sh
-    dest: /opt/jboss/container/util/logging
+execute:
+- script: configure.sh