diff --git a/modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/jdk/21/artifacts/jvm-options
similarity index 100%
rename from modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options
rename to modules/jdk/21/artifacts/jvm-options
diff --git a/modules/jdk/21/configure.sh b/modules/jdk/21/configure.sh
index f0450b47..74fa138d 100755
--- a/modules/jdk/21/configure.sh
+++ b/modules/jdk/21/configure.sh
@@ -2,17 +2,6 @@
 # Configure module
 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
-
 # Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
 JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
 SECURERANDOM=securerandom.source
diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
index fe2f4a5f..85834284 100644
--- a/modules/jdk/21/module.yaml
+++ b/modules/jdk/21/module.yaml
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jdk
diff --git a/modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options b/modules/jre/21/artifacts/jvm-options
similarity index 100%
rename from modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options
rename to modules/jre/21/artifacts/jvm-options
diff --git a/modules/jre/21/configure.sh b/modules/jre/21/configure.sh
deleted file mode 100755
index fdc8f6c2..00000000
--- a/modules/jre/21/configure.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Configure module
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-echo $SCRIPT_DIR
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-echo $ARTIFACTS_DIR
-
-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
diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml
index 5a2ff731..aba6937f 100644
--- a/modules/jre/21/module.yaml
+++ b/modules/jre/21/module.yaml
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jre
diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options b/modules/jvm/artifacts/jvm/debug-options
old mode 100644
new mode 100755
similarity index 100%
rename from modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options
rename to modules/jvm/artifacts/jvm/debug-options
diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options b/modules/jvm/artifacts/jvm/java-default-options
old mode 100644
new mode 100755
similarity index 100%
rename from modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options
rename to modules/jvm/artifacts/jvm/java-default-options
diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh
deleted file mode 100755
index 79e86ecc..00000000
--- a/modules/jvm/configure.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Configure module
-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/java/jvm/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
diff --git a/modules/jvm/module.yaml b/modules/jvm/module.yaml
index c7f381b5..8a454e6c 100644
--- a/modules/jvm/module.yaml
+++ b/modules/jvm/module.yaml
@@ -5,8 +5,9 @@ description: ^
   Provides support for configuring Java JVM, e.g. GC settings, etc.  Basic usage
   is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options)
 
-execute:
-- script: configure.sh
+artifacts:
+  - path: artifacts/jvm
+    dest: /opt/jboss/container/java/jvm
 
 modules:
   install:
diff --git a/modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml b/modules/maven/default/artifacts/default/jboss-settings.xml
similarity index 100%
rename from modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml
rename to modules/maven/default/artifacts/default/jboss-settings.xml
diff --git a/modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh b/modules/maven/default/artifacts/default/maven.sh
similarity index 100%
rename from modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh
rename to modules/maven/default/artifacts/default/maven.sh
diff --git a/modules/maven/default/configure.sh b/modules/maven/default/configure.sh
index e94230cf..1b634043 100755
--- a/modules/maven/default/configure.sh
+++ b/modules/maven/default/configure.sh
@@ -2,19 +2,6 @@
 # Configure module
 set -e
 
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-# configure artifact permissions
-chown -R $USER:root $ARTIFACTS_DIR
-chmod -R ug+rwX $ARTIFACTS_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh
-
-# install artifacts
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
-
 # install default settings.xml file in user home
 mkdir -p $HOME/.m2
 ln -s /opt/jboss/container/maven/default/jboss-settings.xml $HOME/.m2/settings.xml
diff --git a/modules/maven/default/module.yaml b/modules/maven/default/module.yaml
index e029a78e..08ae2a84 100644
--- a/modules/maven/default/module.yaml
+++ b/modules/maven/default/module.yaml
@@ -8,6 +8,10 @@ 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
deleted file mode 100755
index d42c27a7..00000000
--- a/modules/maven/module/configure.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/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 cd2b136d..4128f34f 100644
--- a/modules/maven/module/module.yaml
+++ b/modules/maven/module/module.yaml
@@ -4,5 +4,6 @@ version: '3.8'
 description: ^
   Enables the AppStream RPM Module for Maven 3.8 packages.
 
-execute:
-- script: configure.sh
+artifacts:
+  - path: artifacts/maven.module
+    dest: /etc/dnf/modules.d
diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides b/modules/maven/s2i/artifacts/s2i/maven-overrides
similarity index 100%
rename from modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides
rename to modules/maven/s2i/artifacts/s2i/maven-overrides
diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i b/modules/maven/s2i/artifacts/s2i/maven-s2i
similarity index 100%
rename from modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i
rename to modules/maven/s2i/artifacts/s2i/maven-s2i
diff --git a/modules/maven/s2i/artifacts/usr/libexec/s2i/save-artifacts b/modules/maven/s2i/artifacts/save-artifacts
old mode 100644
new mode 100755
similarity index 100%
rename from modules/maven/s2i/artifacts/usr/libexec/s2i/save-artifacts
rename to modules/maven/s2i/artifacts/save-artifacts
diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh
deleted file mode 100755
index 948c8a6a..00000000
--- a/modules/maven/s2i/configure.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Configure module
-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/maven/s2i/*
-chmod ug+x ${ARTIFACTS_DIR}/usr/libexec/s2i/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
diff --git a/modules/maven/s2i/module.yaml b/modules/maven/s2i/module.yaml
index 11c53490..da17a28e 100644
--- a/modules/maven/s2i/module.yaml
+++ b/modules/maven/s2i/module.yaml
@@ -23,9 +23,6 @@ envs:
 - name: JBOSS_CONTAINER_MAVEN_S2I_MODULE
   value: /opt/jboss/container/maven/s2i
 
-execute:
-- script: configure.sh
-
 modules:
   install:
   - name: jboss.container.user
@@ -36,3 +33,9 @@ modules:
 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/opt/jboss/container/java/proxy/parse-proxy-url.sh b/modules/proxy/artifacts/proxy/parse-proxy-url.sh
similarity index 100%
rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh
rename to modules/proxy/artifacts/proxy/parse-proxy-url.sh
diff --git a/modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options b/modules/proxy/artifacts/proxy/proxy-options
old mode 100644
new mode 100755
similarity index 100%
rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options
rename to modules/proxy/artifacts/proxy/proxy-options
diff --git a/modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh b/modules/proxy/artifacts/proxy/translate-no-proxy.sh
similarity index 100%
rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh
rename to modules/proxy/artifacts/proxy/translate-no-proxy.sh
diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh
deleted file mode 100755
index 4f485eb5..00000000
--- a/modules/proxy/configure.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Configure module
-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/java/proxy*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
diff --git a/modules/proxy/module.yaml b/modules/proxy/module.yaml
index ba613442..3a50686f 100644
--- a/modules/proxy/module.yaml
+++ b/modules/proxy/module.yaml
@@ -23,5 +23,6 @@ modules:
   install:
   - name: jboss.container.user
 
-execute:
-- script: configure.sh
+artifacts:
+  - path: artifacts/proxy
+    dest: /opt/jboss/container/java/proxy
diff --git a/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh b/modules/run/artifacts/run-java.sh
old mode 100644
new mode 100755
similarity index 100%
rename from modules/run/artifacts/opt/jboss/container/java/run/run-java.sh
rename to modules/run/artifacts/run-java.sh
diff --git a/modules/run/configure.sh b/modules/run/configure.sh
index 218e0d0e..1ddb2428 100755
--- a/modules/run/configure.sh
+++ b/modules/run/configure.sh
@@ -7,11 +7,6 @@ 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/java/run/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
 
 mkdir -p /deployments/data \
  && chmod -R "ug+rwX" /deployments/data \
diff --git a/modules/run/module.yaml b/modules/run/module.yaml
index 249e85eb..70be354d 100644
--- a/modules/run/module.yaml
+++ b/modules/run/module.yaml
@@ -59,3 +59,7 @@ 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/usr/libexec/s2i/assemble b/modules/s2i/bash/artifacts/libexec/assemble
old mode 100644
new mode 100755
similarity index 100%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/assemble
rename to modules/s2i/bash/artifacts/libexec/assemble
diff --git a/modules/s2i/bash/artifacts/usr/libexec/s2i/run b/modules/s2i/bash/artifacts/libexec/run
old mode 100644
new mode 100755
similarity index 100%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/run
rename to modules/s2i/bash/artifacts/libexec/run
diff --git a/modules/s2i/bash/artifacts/usr/libexec/s2i/usage b/modules/s2i/bash/artifacts/libexec/usage
old mode 100644
new mode 100755
similarity index 100%
rename from modules/s2i/bash/artifacts/usr/libexec/s2i/usage
rename to modules/s2i/bash/artifacts/libexec/usage
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides b/modules/s2i/bash/artifacts/opt/maven-overrides
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides
rename to modules/s2i/bash/artifacts/opt/maven-overrides
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides b/modules/s2i/bash/artifacts/opt/maven-s2i-overrides
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
rename to modules/s2i/bash/artifacts/opt/maven-s2i-overrides
diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks b/modules/s2i/bash/artifacts/opt/s2i-core-hooks
similarity index 100%
rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks
rename to modules/s2i/bash/artifacts/opt/s2i-core-hooks
diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh
deleted file mode 100755
index 9c039677..00000000
--- a/modules/s2i/bash/configure.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Configure module
-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/java/s2i/*
-chmod ug+x ${ARTIFACTS_DIR}/usr/libexec/s2i/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
diff --git a/modules/s2i/bash/module.yaml b/modules/s2i/bash/module.yaml
index 3199994c..8825bde8 100644
--- a/modules/s2i/bash/module.yaml
+++ b/modules/s2i/bash/module.yaml
@@ -7,9 +7,6 @@ envs:
 - name: JBOSS_CONTAINER_JAVA_S2I_MODULE
   value: /opt/jboss/container/java/s2i
 
-execute:
-- script: configure.sh
-
 modules:
   install:
   - name: jboss.container.user
@@ -20,3 +17,9 @@ modules:
 packages:
   install:
   - rsync
+
+artifacts:
+  - path: artifacts/libexec
+    dest: /usr/libexec/s2i
+  - path: artifacts/opt
+    dest: /opt/jboss/container/java/s2i
diff --git a/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core b/modules/s2i/core/artifacts/s2i-core
similarity index 100%
rename from modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core
rename to modules/s2i/core/artifacts/s2i-core
diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh
index d8cd9934..f05075f8 100755
--- a/modules/s2i/core/configure.sh
+++ b/modules/s2i/core/configure.sh
@@ -3,15 +3,9 @@
 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/s2i/core/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
 
 mkdir -p /deployments \
  && chmod -R "ug+rwX" /deployments \
diff --git a/modules/s2i/core/module.yaml b/modules/s2i/core/module.yaml
index eb24eb11..a2475984 100644
--- a/modules/s2i/core/module.yaml
+++ b/modules/s2i/core/module.yaml
@@ -121,3 +121,7 @@ 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/opt/jboss/container/util/logging/logging.sh b/modules/util/logging/artifacts/logging.sh
similarity index 100%
rename from modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh
rename to modules/util/logging/artifacts/logging.sh
diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh
deleted file mode 100755
index 470528df..00000000
--- a/modules/util/logging/configure.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Configure module
-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/util/logging/*
-
-pushd ${ARTIFACTS_DIR}
-cp -pr * /
-popd
diff --git a/modules/util/logging/module.yaml b/modules/util/logging/module.yaml
index ef81ff78..0c43c5da 100644
--- a/modules/util/logging/module.yaml
+++ b/modules/util/logging/module.yaml
@@ -14,5 +14,6 @@ modules:
   install:
   - name: jboss.container.user
 
-execute:
-- script: configure.sh
+artifacts:
+  - path: artifacts/logging.sh
+    dest: /opt/jboss/container/util/logging