diff --git a/package.json b/package.json
index e445da41e..614cf5dba 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "test:cem:watch": "mocha --watch cem/test/*.js",
     "lint": "eslint --rulesdir eslint-rules rollup/*.js cem src tasks test wds",
     "lint:fix": "eslint --rulesdir eslint-rules --fix rollup/*.js cem src tasks test wds",
-    "prepack": "npm run test && npm run lint && npm run components:check-lit && npm run typecheck && npm run components:check-i18n && npm run components:build && npm run components:check-type-imports && npm run components:docs && npm run stylelint",
+    "prepack": "npm run components:build",
     "prestorybook:build": "npm run components:docs",
     "preview:list": "node tasks/preview.js list",
     "preview:publish": "node tasks/preview.js publish",
diff --git a/src/components/cc-zone/cc-zone.js b/src/components/cc-zone/cc-zone.js
index 802ec2fa7..52d1ff0a2 100644
--- a/src/components/cc-zone/cc-zone.js
+++ b/src/components/cc-zone/cc-zone.js
@@ -61,23 +61,30 @@ export class CcZone extends LitElement {
   // This is a bit irregular to do this but we need to reuse this text logic in a <select>.
   // Moving this to a separated module feels overkill right now.
   static getText (zone) {
-    const { title, subtitle } = CcZone._getTextParts(zone);
-    return [title, subtitle].filter((a) => a != null).join(', ');
+    const { title, subtitle, infra } = CcZone._getTextParts(zone);
+    return [title, subtitle, infra].filter((a) => a != null).join(', ');
   }
 
   static _getTextParts (zone) {
     return (zone.tags.includes(PRIVATE_ZONE) && zone.displayName != null)
       ? { title: zone.displayName }
-      : { title: zone.city, subtitle: i18n('cc-zone.country', { code: zone.countryCode, name: zone.country }) };
+      : {
+          title: zone.city,
+          subtitle: i18n('cc-zone.country', { code: zone.countryCode, name: zone.country }),
+          infra: CcZone._getInfraProviderSlug(zone),
+        };
+  }
+
+  static _getInfraProviderSlug (zone) {
+    const infraTag = zone.tags.find((t) => t.startsWith('infra:'));
+    return infraTag?.split(':')[1] ?? null;
   }
 
   render () {
 
     const skeleton = (this.zone == null);
     const zone = skeleton ? SKELETON_ZONE : this.zone;
-    const { title, subtitle } = CcZone._getTextParts(zone);
-    const infraTag = zone.tags.find((t) => t.startsWith('infra:'));
-    const infraProviderSlug = infraTag?.split(':')[1] ?? null;
+    const { title, subtitle, infra } = CcZone._getTextParts(zone);
 
     return html`
       <cc-img class="flag" ?skeleton=${skeleton} src=${ifDefined(getFlagUrl(zone.countryCode))} text=${ifDefined(zone.countryCode)}></cc-img>
@@ -87,8 +94,8 @@ export class CcZone extends LitElement {
             <span class="title ${classMap({ skeleton })}">${title}</span>
             <span class="subtitle ${classMap({ skeleton })}">${subtitle}</span>
           </div>
-          ${infraProviderSlug != null ? html`
-            <cc-img class="infra-logo" src=${ifDefined(getInfraProviderLogoUrl(infraProviderSlug))} text=${ifDefined(infraProviderSlug)}></cc-img>
+          ${infra != null ? html`
+            <cc-img class="infra-logo" src=${ifDefined(getInfraProviderLogoUrl(infra))} text=${ifDefined(infra)}></cc-img>
           ` : ''}
         </div>
         <cc-flex-gap class="tag-list">