diff --git a/release/tools/caj.xml b/release/tools/caj.xml
index 9b43864e8f..9c67e10687 100644
--- a/release/tools/caj.xml
+++ b/release/tools/caj.xml
@@ -104,7 +104,7 @@
 		<copy todir="${deliverable.bundle.dir}/src" includeEmptyDirs="no">
 			<fileset dir="${ts.home}/src"
    			   includes="
-                       com/sun/ts/tests/signaturetest/signature-repository/jakarta.annotation.*${deliverable.version}*,
+                       com/sun/ts/tests/signaturetest/signature-repository/jakarta.annotation.*,
                        com/sun/ts/tests/signaturetest/*,
                        com/sun/ts/tests/signaturetest/caj/*"
 			   excludes="
diff --git a/release/tools/jms.xml b/release/tools/jms.xml
index aa37de1c02..e586b0fda3 100644
--- a/release/tools/jms.xml
+++ b/release/tools/jms.xml
@@ -140,7 +140,7 @@
                    com/sun/ts/tests/common/vehicle/standalone/*,
                    com/sun/ts/tests/signaturetest/*,
                    com/sun/ts/tests/signaturetest/jms/*,
-                   com/sun/ts/tests/signaturetest/signature-repository/jakarta.jms.*${deliverable.version}*,
+                   com/sun/ts/tests/signaturetest/signature-repository/jakarta.jms.*,
                    com/sun/ts/tests/jms/common/**/*,
                    com/sun/ts/tests/jms/core/**/*,
                    com/sun/ts/tests/jms/core20/**/*,
diff --git a/release/tools/servlet.xml b/release/tools/servlet.xml
index 11ae1d4012..28afa2450a 100644
--- a/release/tools/servlet.xml
+++ b/release/tools/servlet.xml
@@ -172,7 +172,7 @@
 		<copy todir="${deliverable.bundle.dir}/src/com/sun/ts/tests/signaturetest/signature-repository/"
 			  includeEmptyDirs="no">
 			<fileset dir="${ts.home}/src/com/sun/ts/tests/signaturetest/signature-repository/"
-					 includes="jakarta.servlet.sig_*" />
+					 includes="jakarta.servlet.*" />
 		</copy>
 
         <!-- the com/sun/ts/lib file -->
diff --git a/release/tools/websocket.xml b/release/tools/websocket.xml
index 7b43458823..906e64b9f4 100644
--- a/release/tools/websocket.xml
+++ b/release/tools/websocket.xml
@@ -173,7 +173,7 @@
 		<copy todir="${deliverable.bundle.dir}/src/com/sun/ts/tests/signaturetest/signature-repository/"
 			  includeEmptyDirs="no">
 			<fileset dir="${ts.home}/src/com/sun/ts/tests/signaturetest/signature-repository/"
-					 includes="jakarta.websocket.sig_2.1*" />
+					 includes="jakarta.websocket.*" />
 		</copy>
 
         <!-- the com/sun/ts/lib file -->