diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 48bb16a21..557046a99 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,7 +138,7 @@ jobs:
   deploy-core:
     runs-on: ubuntu-latest
     needs: dockerize-core
-    environment: ${{ inputs.target || 'dev' }}
+    environment: ${{ inputs.target || 'dev' }}-core
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
 
     steps:
@@ -168,18 +168,18 @@ jobs:
       - name: Deploy core to containerapp
         uses: azure/webapps-deploy@v2
         with:
-          app-name: ${{ vars.APP_NAME_CORE }}
+          app-name: ${{ vars.APP_NAME }}
           slot-name: staging
           images: ghcr.io/logto-io/logto:sha-${{ steps.sha.outputs.short }}
 
       - name: Swap core to production
         # See https://learn.microsoft.com/en-us/cli/azure/webapp/deployment/slot?view=azure-cli-latest#az-webapp-deployment-slot-swap
-        run: az webapp deployment slot swap -g ${{ vars.RESOURCE_GROUP }} -n ${{ vars.APP_NAME_CORE }} --slot staging
+        run: az webapp deployment slot swap -g ${{ vars.RESOURCE_GROUP }} -n ${{ vars.APP_NAME }} --slot staging
 
   deploy-cloud:
     runs-on: ubuntu-latest
     needs: dockerize-cloud
-    environment: ${{ inputs.target || 'dev' }}
+    environment: ${{ inputs.target || 'dev' }}-cloud
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
 
     steps:
@@ -204,13 +204,13 @@ jobs:
       - name: Deploy cloud to containerapp
         uses: azure/webapps-deploy@v2
         with:
-          app-name: ${{ vars.APP_NAME_CLOUD }}
+          app-name: ${{ vars.APP_NAME }}
           slot-name: staging
           images: ghcr.io/logto-io/cloud:sha-${{ steps.sha.outputs.short }}
 
       - name: Swap cloud to production
         # See https://learn.microsoft.com/en-us/cli/azure/webapp/deployment/slot?view=azure-cli-latest#az-webapp-deployment-slot-swap
-        run: az webapp deployment slot swap -g ${{ vars.RESOURCE_GROUP }} -n ${{ vars.APP_NAME_CLOUD }} --slot staging
+        run: az webapp deployment slot swap -g ${{ vars.RESOURCE_GROUP }} -n ${{ vars.APP_NAME }} --slot staging
 
   # Publish packages and create git tags if needed
   publish-and-tag: