diff --git a/buildSrc/src/main/groovy/nextflow/gradle/plugins/SourcesMatcher.groovy b/buildSrc/src/main/groovy/nextflow/gradle/plugins/SourcesMatcher.groovy
index 7e9260f..1865b93 100644
--- a/buildSrc/src/main/groovy/nextflow/gradle/plugins/SourcesMatcher.groovy
+++ b/buildSrc/src/main/groovy/nextflow/gradle/plugins/SourcesMatcher.groovy
@@ -41,7 +41,7 @@ class SourcesMatcher {
         }
         matcher.collect { file ->
             def source = file.toString() - "$root.absolutePath/src/main/"
-            return source.split('\\.').dropRight(1).join().split(File.separator).drop(1).join('.')
+            return source.split('\\.').dropRight(1).join().split(File.separator).join('.')
         }
     }
 
diff --git a/plugins/build.gradle b/plugins/build.gradle
index 57c5bcc..6b08277 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -32,6 +32,21 @@ subprojects {
         mavenCentral()
     }
 
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(19)
+        }
+    }
+
+    compileJava {
+        options.release.set(11)
+    }
+
+    tasks.withType(GroovyCompile) {
+        sourceCompatibility = '11'
+        targetCompatibility = '11'
+    }
+
     tasks.withType(Jar) {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
diff --git a/plugins/nf-nomad/build.gradle b/plugins/nf-nomad/build.gradle
index 4a34108..2e04bb1 100644
--- a/plugins/nf-nomad/build.gradle
+++ b/plugins/nf-nomad/build.gradle
@@ -98,3 +98,15 @@ test {
     jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
 
+jar {
+    manifest {
+        attributes(
+                'Manifest-Version':'1.0',
+                'Plugin-Id': project.name,
+                'Plugin-Version': archiveVersion,
+                'Plugin-Class': "nextflow.nomad.NomadPlugin",
+                'Plugin-Provider': 'nextflow',
+                'Plugin-Requires': '>=23.10.0',
+        )
+    }
+}
diff --git a/plugins/nf-nomad/src/resources/META-INF/MANIFEST.MF b/plugins/nf-nomad/src/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index ceec83c..0000000
--- a/plugins/nf-nomad/src/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Plugin-Id: nf-nomad
-Plugin-Version: 0.0.1
-Plugin-Class: nextflow.nomad.NomadPlugin
-Plugin-Provider: nextflow
-Plugin-Requires: >=23.10.0
-
diff --git a/plugins/nf-nomad/src/resources/META-INF/extensions.idx b/plugins/nf-nomad/src/resources/META-INF/extensions.idx
deleted file mode 100644
index 1d1a1f1..0000000
--- a/plugins/nf-nomad/src/resources/META-INF/extensions.idx
+++ /dev/null
@@ -1,2 +0,0 @@
-nextflow.nomad.NomadPlugin
-nextflow.nomad.executor.NomadExecutor