diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b3879ca3..b72f2431c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -39,9 +39,23 @@ jobs:
     # Don't deploy on push if this is a fork
     if: ${{ github.event_name == 'workflow_dispatch' || github.repository == 'openfrontio/OpenFrontIO' }}
     # Use different logic based on event type
-    name: Deploy to ${{ inputs.target_subdomain && format('{0}.{1}', inputs.target_subdomain, inputs.target_domain) || inputs.target_domain || 'openfront.dev' }}
+    name: Deploy to ${{
+      github.event_name == 'push'
+      && (github.ref_name == 'main' && 'openfront.dev'
+      || format('{0}.openfront.dev', github.ref_name))
+      || inputs.target_subdomain && format('{0}.{1}', inputs.target_subdomain, inputs.target_domain)
+      || inputs.target_domain
+      || 'openfront.dev'
+      }}
     runs-on: ubuntu-latest
-    environment: ${{ inputs.target_subdomain && format('{0}.{1}', inputs.target_subdomain, inputs.target_domain) || inputs.target_domain || 'openfront.dev' }}
+    environment: ${{
+      github.event_name == 'push'
+      && (github.ref_name == 'main' && 'openfront.dev'
+      || format('{0}.openfront.dev', github.ref_name))
+      || inputs.target_subdomain && format('{0}.{1}', inputs.target_subdomain, inputs.target_domain)
+      || inputs.target_domain
+      || 'openfront.dev'
+      }}
     env:
       DOMAIN: ${{ inputs.target_domain || 'openfront.dev' }}
       SUBDOMAIN: ${{ github.event_name == 'push' && github.ref_name || inputs.target_subdomain || 'main' }}