diff --git a/Tasks/Common/packaging-common/cache/feedUtilities.ts b/Tasks/Common/packaging-common/cache/feedUtilities.ts
index 7c26e8b..51d8af9 100644
--- a/Tasks/Common/packaging-common/cache/feedUtilities.ts
+++ b/Tasks/Common/packaging-common/cache/feedUtilities.ts
@@ -13,7 +13,7 @@ export async function doesPackageExist(hash: string): Promise<boolean> {
   // Getting package name from hash
   const packageId = tl
     .getVariable("Build.DefinitionName")
-    .replace(/\s/g, "")
+    .replace(/[^a-z0-9\-]/g, "")
     .substring(0, 255)
     .toLowerCase();
 
diff --git a/Tasks/Common/packaging-common/cache/universaldownload.ts b/Tasks/Common/packaging-common/cache/universaldownload.ts
index 4d483f6..f960242 100644
--- a/Tasks/Common/packaging-common/cache/universaldownload.ts
+++ b/Tasks/Common/packaging-common/cache/universaldownload.ts
@@ -35,7 +35,7 @@ export async function run(artifactToolPath: string, hash: string, targetFolder:
 
         // Getting package name from hash
         const packageId = tl.getVariable('Build.DefinitionName')
-            .replace(/\s/g, "")
+            .replace(/[^a-z0-9\-]/g, "")
             .substring(0, 255)
             .toLowerCase();
 
diff --git a/Tasks/Common/packaging-common/cache/universalpublish.ts b/Tasks/Common/packaging-common/cache/universalpublish.ts
index 66b3c44..5fc7e21 100644
--- a/Tasks/Common/packaging-common/cache/universalpublish.ts
+++ b/Tasks/Common/packaging-common/cache/universalpublish.ts
@@ -35,7 +35,7 @@ export async function run(artifactToolPath: string, hash: string, targetFolder:
         serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);
 
         packageName = tl.getVariable('Build.DefinitionName')
-            .replace(/\s/g, "")
+            .replace(/[^a-z0-9\-]/g, "")
             .substring(0, 255)
             .toLowerCase();