diff --git a/.github/workflows/base-lambdas-reusable-deploy-all.yml b/.github/workflows/base-lambdas-reusable-deploy-all.yml
index f1185c986..496fb36a9 100644
--- a/.github/workflows/base-lambdas-reusable-deploy-all.yml
+++ b/.github/workflows/base-lambdas-reusable-deploy-all.yml
@@ -14,9 +14,14 @@ on:
         required: true
         type: 'string'
       sandbox:
-        description: 'Which Sandbox to push to'
+        description: 'Which Sandbox to push to?'
         required: true
         type: 'string'
+      is_sandbox:
+        description: 'Is this deploying to a sandbox?'
+        required: false
+        default: false
+        type: boolean
     secrets:
       AWS_ASSUME_ROLE:
         required: true
@@ -403,6 +408,7 @@ jobs:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 
   deploy_mns_notification_lambda:
+    if: ${{ ! inputs.is_sandbox }}
     name: Deploy mns notification lambda
     uses: ./.github/workflows/base-lambdas-reusable-deploy.yml
     with:
diff --git a/.github/workflows/full-deploy-to-sandbox.yml b/.github/workflows/full-deploy-to-sandbox.yml
index d0b764d08..9012298dc 100644
--- a/.github/workflows/full-deploy-to-sandbox.yml
+++ b/.github/workflows/full-deploy-to-sandbox.yml
@@ -85,6 +85,7 @@ jobs:
       sandbox: ${{ inputs.sandbox }}
       environment: ${{ inputs.environment }}
       python_version: "3.11"
+      is_sandbox: true
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
   
diff --git a/.github/workflows/lambdas-deploy-feature-to-sandbox.yml b/.github/workflows/lambdas-deploy-feature-to-sandbox.yml
index 8d3a6478a..82d158bab 100644
--- a/.github/workflows/lambdas-deploy-feature-to-sandbox.yml
+++ b/.github/workflows/lambdas-deploy-feature-to-sandbox.yml
@@ -72,6 +72,7 @@ jobs:
       python_version: "3.11"
       build_branch: ${{ inputs.build_branch }}
       sandbox: ${{ inputs.sandbox }}
+      is_sandbox: true
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 
diff --git a/lambdas/tests/unit/conftest.py b/lambdas/tests/unit/conftest.py
index 217bc6e1a..1069842e0 100644
--- a/lambdas/tests/unit/conftest.py
+++ b/lambdas/tests/unit/conftest.py
@@ -176,7 +176,6 @@ def set_env(monkeypatch):
     monkeypatch.setenv("NRL_SQS_QUEUE_URL", NRL_SQS_URL)
 
 
-
 EXPECTED_PARSED_PATIENT_BASE_CASE = PatientDetails(
     givenName=["Jane"],
     familyName="Smith",