diff --git a/packages/yoteams-build-core/package.json b/packages/yoteams-build-core/package.json
index 298c98ac..164563e5 100644
--- a/packages/yoteams-build-core/package.json
+++ b/packages/yoteams-build-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoteams-build-core",
-  "version": "1.2.0-preview",
+  "version": "1.2.0-preview2",
   "description": "Core build Gulp tasks for Yo Teams, Microsoft Teams Apps Generator (https://aka.ms/yoteams)",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/yoteams-build-core/src/codespacesTasks.ts b/packages/yoteams-build-core/src/codespacesTasks.ts
index b840152f..45b163d4 100644
--- a/packages/yoteams-build-core/src/codespacesTasks.ts
+++ b/packages/yoteams-build-core/src/codespacesTasks.ts
@@ -24,7 +24,7 @@ export const codespacesTasks = (gulp: GulpClient.Gulp, config: any) => {
             const codespaceEnv = fs.readJSONSync(codespaceEnvConfig);
             const codespaceName = codespaceEnv.CODESPACE_NAME;
 
-            process.env.PUBLIC_HOSTNAME = `${codespaceName}-${process.env.PORT}${process.env.RAILS_DEVELOPMENT_HOSTS}`;
+            process.env.PUBLIC_HOSTNAME = `${codespaceName}-${process.env.PORT}.githubpreview.dev`;
             log("[Codespace] Public url: " + process.env.PUBLIC_HOSTNAME);
             gulp.task("codespaces-serve", dependencies(gulp, "manifest", "serve"));
         } catch (ex) {