diff --git a/index.js b/index.js
index 844ffba..59d5982 100644
--- a/index.js
+++ b/index.js
@@ -22147,8 +22147,13 @@ try {
     (0, import_core.setOutput)("url", pagesDeployment.url);
     (0, import_core.setOutput)("environment", pagesDeployment.environment);
     let alias = pagesDeployment.url;
-    if (!productionEnvironment && pagesDeployment.aliases && pagesDeployment.aliases.length > 0) {
+    if (pagesDeployment.aliases && pagesDeployment.aliases.length > 0) {
       alias = pagesDeployment.aliases[0];
+    } else if (!productionEnvironment) {
+      alias = pagesDeployment.url.replace(
+        pagesDeployment.short_id,
+        pagesDeployment.deployment_trigger.metadata.branch.toLowerCase().replace(/[^a-z\d]/g, "-")
+      );
     }
     (0, import_core.setOutput)("alias", alias);
     if (gitHubDeployment) {
diff --git a/src/index.ts b/src/index.ts
index f4fd01f..257f8b7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -117,8 +117,15 @@ try {
     setOutput("environment", pagesDeployment.environment);
 
     let alias = pagesDeployment.url;
-    if (!productionEnvironment && pagesDeployment.aliases && pagesDeployment.aliases.length > 0) {
+    if (pagesDeployment.aliases && pagesDeployment.aliases.length > 0) {
       alias = pagesDeployment.aliases[0];
+    } else if (!productionEnvironment) {
+      alias = pagesDeployment.url.replace(
+        pagesDeployment.short_id,
+        pagesDeployment.deployment_trigger.metadata.branch
+          .toLowerCase()
+          .replace(/[^a-z\d]/g, "-")
+      );
     }
     setOutput("alias", alias);