diff --git a/kieserver/modules/kieserver/install b/kieserver/modules/kieserver/install
index a3006c5e..c19f6389 100644
--- a/kieserver/modules/kieserver/install
+++ b/kieserver/modules/kieserver/install
@@ -28,20 +28,19 @@ fi
 
 cp -r ${SOURCES_DIR}/slf4j-*.jar ${JBOSS_HOME}/bin/launch
 
-# jbpm-clustering jar
-mkdir -p /opt/kie/dependencies/jbpm-clustering
-chown -R jboss:root /opt/kie/dependencies/jbpm-clustering
-chmod -R 0755 /opt/kie/dependencies/jbpm-clustering
-
-# jbpm-kafka-emitter jar
-mkdir -p /opt/kie/dependencies/jbpm-kafka
-chown -R jboss:root /opt/kie/dependencies/jbpm-kafka
-chmod -R 0755 /opt/kie/dependencies/jbpm-kafka
-
 chown -R jboss:root ${ROOT_WAR_DIR}
 chmod 0755 ${ROOT_WAR_DIR}
 
-chown -R jboss:root ${JBOSS_HOME}/bin
-chmod 0755 ${JBOSS_HOME}/bin
-chmod -R g+rwX ${JBOSS_HOME}/bin
+# Dir for optional deps
+mkdir -p /opt/kie/dependencies/{jbpm-clustering,jbpm-kafka}
+
+cp ${SOURCES_DIR}/jbpm-event-emitters-kafka-*.jar /opt/kie/dependencies/jbpm-kafka/
+cp ${SOURCES_DIR}/kie-server-services-jbpm-cluster-*.jar /opt/kie/dependencies/jbpm-clustering/
+
+# Necessary to permit running with a randomised UID
+for dir in ${JBOSS_HOME} /opt/kie; do
+    chown -R jboss:root ${dir}
+    chmod 0755 ${dir}
+    chmod -R g+rwX ${dir}
+done
 
diff --git a/kieserver/modules/kieserver/module.yaml b/kieserver/modules/kieserver/module.yaml
index 7188718c..5501b49c 100644
--- a/kieserver/modules/kieserver/module.yaml
+++ b/kieserver/modules/kieserver/module.yaml
@@ -37,10 +37,8 @@ artifacts:
   # slf4j-simple-1.7.22.redhat-2.jar
   md5: "62cc6eeb72e2738e3acc8957ca95f37b"
 - name: "kie-server-services-jbpm-cluster-7.58.0.redhat-210716.jar"
-  dest: "/opt/kie/dependencies/jbpm-clustering"
   md5: "ea09d73a2a559263e052cc24bd93084a"
 - name: "jbpm-event-emitters-kafka-7.58.0.redhat-210716.jar"
-  dest: "/opt/kie/dependencies/jbpm-kafka"
   md5: "ac7a47a4806153ff00c957ba7a5f99c7"
 run:
   user: 185