diff --git a/build.gradle b/build.gradle
index 724f5bfe..113a4328 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,19 +127,16 @@ task fatjar(type: Jar) {
                     'Implementation-Version': archiveVersion,
                     'Main-Class': 'com.ibm.northstar.CodeAnalyzer'
     }
-    // Collect and include files from compile classpath, excluding signature-related files
-    from (configurations.runtimeClasspath) {
-        exclude 'META-INF/*.SF'
-        exclude 'META-INF/*.DSA'
-        exclude 'META-INF/*.RSA'
-        exclude 'META-INF/MANIFEST.MF'
-        // Use zipTree to process JAR files
-        eachFile { details ->
-            if (details.file.isFile() && details.name.endsWith('.jar')) {
-                zipTree(details.file)
-            } else {
-                details.file
-            }
+
+    from(configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }) {
+        exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
+    }
+    // Use zipTree to process JAR files
+    eachFile { details ->
+        if (details.file.isFile() && details.name.endsWith('.jar')) {
+            zipTree(details.file)
+        } else {
+            details.file
         }
     }
     with jar