diff --git a/.env.dev b/.env.dev
index 3a7990a..7d60c6b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,5 +1,5 @@
+REACT_APP_CERT_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/certificate
 REACT_APP_AUTH_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/compute_auth
 REACT_APP_UPLOAD_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update
 REACT_APP_AUTH_CALLBACK_URL=https://dev-ota-admin.cloud.fiskerinc.com
-REACT_APP_SUPERSET_URL=http://superset-dev.fisker.internal
-REACT_APP_CERT_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/certificate
+REACT_APP_SUPERSET_URL=http://superset-dev.fiskercloud.internal
diff --git a/.env.local b/.env.local
index 234f2fa..20d8df2 100644
--- a/.env.local
+++ b/.env.local
@@ -1,5 +1,5 @@
 REACT_APP_AUTH_SERVICE_URL=http://localhost/compute_auth
+REACT_APP_CERT_SERVICE_URL=http://localhost/certificate
 REACT_APP_UPLOAD_SERVICE_URL=http://localhost/ota_update
 REACT_APP_AUTH_CALLBACK_URL=http://localhost:3000
-REACT_APP_SUPERSET_URL=http://superset-dev.fisker.internal
-REACT_APP_CERT_SERVICE_URL=http://localhost/certificate
+REACT_APP_SUPERSET_URL=http://superset-dev.fiskercloud.internal
diff --git a/.env.prd b/.env.prd
index d89cfe0..cc65470 100644
--- a/.env.prd
+++ b/.env.prd
@@ -1,5 +1,5 @@
 REACT_APP_AUTH_SERVICE_URL=https://gw.cloud.fiskerinc.com/compute_auth
+REACT_APP_CERT_SERVICE_URL=https://gw.cloud.fiskerinc.com/certificate
 REACT_APP_UPLOAD_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update
 REACT_APP_AUTH_CALLBACK_URL=https://ota-admin.cloud.fiskerinc.com
-REACT_APP_SUPERSET_URL=http://superset.fisker.internal
-REACT_APP_CERT_SERVICE_URL=https://gw.cloud.fiskerinc.com/certificate
+REACT_APP_SUPERSET_URL=http://superset.fiskercloud.internal
diff --git a/.env.stg b/.env.stg
index 3903193..a54619d 100644
--- a/.env.stg
+++ b/.env.stg
@@ -1,5 +1,5 @@
 REACT_APP_AUTH_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/compute_auth
+REACT_APP_CERT_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/certificate
 REACT_APP_UPLOAD_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update
 REACT_APP_AUTH_CALLBACK_URL=https://stg-ota-admin.cloud.fiskerinc.com
-REACT_APP_SUPERSET_URL=http://superset-stg.fisker.internal
-REACT_APP_CERT_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/certificate
+REACT_APP_SUPERSET_URL=http://superset-stg.fiskercloud.internal
diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 097aefb..91e332d 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -213,7 +213,7 @@ exports[`App Route / authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -711,7 +711,7 @@ exports[`App Route /home authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -1245,7 +1245,7 @@ exports[`App Route /package-create authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -2742,7 +2742,7 @@ exports[`App Route /package-deploy authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -3614,7 +3614,7 @@ exports[`App Route /package-status authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -4222,7 +4222,7 @@ exports[`App Route /packages authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -5032,7 +5032,7 @@ exports[`App Route /page-not-found authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -5453,7 +5453,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -6112,7 +6112,7 @@ exports[`App Route /vehicle-add authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -7246,7 +7246,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
@@ -7911,7 +7911,7 @@ exports[`App Route /vehicles authenticated 1`] = `
               <a
                 aria-disabled="false"
                 class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-0000 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-                href="http://superset-dev.fisker.internal/r/3"
+                href="http://superset-dev.fiskercloud.internal/r/3"
                 rel="noopener"
                 role="button"
                 tabindex="0"
diff --git a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
index d40f672..9d1fe73 100644
--- a/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
+++ b/src/components/Layouts/__snapshots__/SideMenu.test.jsx.snap
@@ -156,7 +156,7 @@ exports[`SideMenu Authenticated 1`] = `
         <a
           aria-disabled="false"
           class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiButtonBase-root MuiListItem-root makeStyles-menuExternalLink-52 MuiListItem-gutters MuiListItem-button MuiTypography-colorPrimary"
-          href="http://superset-dev.fisker.internal/r/3"
+          href="http://superset-dev.fiskercloud.internal/r/3"
           rel="noopener"
           role="button"
           tabindex="0"