diff --git a/lib/shared/addon/utils/parse-externalid.js b/lib/shared/addon/utils/parse-externalid.js
index 9c8f5c485..878e2e286 100644
--- a/lib/shared/addon/utils/parse-externalid.js
+++ b/lib/shared/addon/utils/parse-externalid.js
@@ -117,8 +117,16 @@ export function parseHelmExternalId(externalId) {
     });
   }
 
-  out.templateId = `${ out.catalog }-${ out.template }`;
-  out.templateVersionId = `${ out.catalog }-${ out.template }-${ out.version }`;
+  let catalog = out.catalog
+
+  if ( catalog.indexOf('/') !== -1 ) {
+    catalog = catalog.replace('/', ':');
+  } else {
+    catalog = `cattle-global-data:${ catalog }`;
+  }
+
+  out.templateId = `${ catalog }-${ out.template }`;
+  out.templateVersionId = `${ catalog }-${ out.template }-${ out.version }`;
 
   return out;
 }