diff --git a/.github/workflows/zerocat.yml b/.github/workflows/zerocat.yml
index 7711a31..b6b1758 100644
--- a/.github/workflows/zerocat.yml
+++ b/.github/workflows/zerocat.yml
@@ -29,8 +29,8 @@ jobs:
 
     - name: Build
       env:
-        APIHOST: ${{ vars.APIHOST }}
-        ASSETSHOST: ${{ vars.ASSETSHOST }}
+        ZCAPIHOST: ${{ vars.ZCAPIHOST }}
+        ZCASSETHOST: ${{ vars.ZCASSETHOST }}
       run: |
         export NODE_OPTIONS=--openssl-legacy-provider
         yarn install
diff --git a/src/lib/project-fetcher-hoc.jsx b/src/lib/project-fetcher-hoc.jsx
index 6172bd8..9f26d53 100644
--- a/src/lib/project-fetcher-hoc.jsx
+++ b/src/lib/project-fetcher-hoc.jsx
@@ -134,7 +134,7 @@ const ProjectFetcherHOC = function (WrappedComponent) {
         setProjectId: PropTypes.func
     };
     ProjectFetcherComponent.defaultProps = {
-        assetHost: process.env.ZCASSET,
+        assetHost: process.env.ZCASSETHOST,
         projectHost: 'https://projects.scratch.mit.edu'
     };
 
diff --git a/src/playground/index.ejs b/src/playground/index.ejs
index 4e66f7a..e88e7c2 100644
--- a/src/playground/index.ejs
+++ b/src/playground/index.ejs
@@ -14,7 +14,7 @@
     <title>
         <%= htmlWebpackPlugin.options.title %>
     </title>
-    <script src="<%= process.env.ZCAPI %>/scratchtool"></script>
+    <script src="<%= process.env.ZCAPIHOST %>/scratchtool"></script>
             <% if (htmlWebpackPlugin.options.enablePWA ) { %>
                 <!--<meta name="viewport" content="width=device-width, user-scalable=no" />-->
                 <link rel="manifest" href="manifest.webmanifest">
diff --git a/webpack.config.js b/webpack.config.js
index 811e6a9..5b8d454 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -130,8 +130,8 @@ function getPlugins () {
     let res = base.plugins.concat([
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': '"' + process.env.NODE_ENV + '"',
-            'process.env.ZCAPI': '"' + process.env.ZCAPI + '"',
-            'process.env.ZCASSET': '"' + process.env.ZCASSET + '"',
+            'process.env.ZCAPIHOST': '"' + process.env.ZCAPIHOST + '"',
+            'process.env.ZCASSETHOST': '"' + process.env.ZCASSETHOST + '"',
             'process.env.DEBUG': Boolean(process.env.DEBUG),
             'process.env.GA_ID': '"' + (process.env.GA_ID || 'UA-000000-01') + '"'
         }),