diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c95b517c..55baa76b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -88,6 +88,8 @@ jobs:
 
   build_storybook:
     name: Build Storybook
+    if: ${{ needs.prdetails.outputs.pr_data_json && contains(fromJSON(needs.prdetails.outputs.pr_data_json).labels.*.name, 'storybook build') }}
+    needs: prdetails
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
diff --git a/.github/workflows/deploy-to-netlify.yaml b/.github/workflows/deploy-to-netlify.yaml
index 08ae2e3f..59dcba43 100644
--- a/.github/workflows/deploy-to-netlify.yaml
+++ b/.github/workflows/deploy-to-netlify.yaml
@@ -48,7 +48,7 @@ jobs:
         with:
           step: start
           token: ${{ secrets.GITHUB_TOKEN }}
-          env: TestName
+          env: ${{ inputs.environment_name}}
           ref: ${{ inputs.deployment_ref }}
           desc: |
             Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
@@ -101,7 +101,7 @@ jobs:
           override: false
           token: ${{ secrets.GITHUB_TOKEN }}
           status: ${{ job.status }}
-          env: TestName
+          env: ${{ steps.deployment.outputs.env }}
           deployment_id: ${{ steps.deployment.outputs.deployment_id }}
           env_url: ${{ steps.netlify.outputs.deploy-url }}
           desc: |
diff --git a/.github/workflows/pr-deploy.yaml b/.github/workflows/pr-deploy.yaml
index 13c06f4f..93c9eec5 100644
--- a/.github/workflows/pr-deploy.yaml
+++ b/.github/workflows/pr-deploy.yaml
@@ -47,7 +47,7 @@ jobs:
       NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
       NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
 
-  netlify-sdk-deploy:
+  netlify-sdk:
     needs: prdetails
     permissions:
       deployments: write