diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
index a43b661f3..d3855d2ef 100644
--- a/.github/workflows/deploy-demo.yml
+++ b/.github/workflows/deploy-demo.yml
@@ -102,5 +102,5 @@ jobs:
           CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }}
       with:
         cf_org: gsa-tts-benefits-studio
-        cf_space: notify-staging
-        app: notify-api-staging
+        cf_space: notify-demo
+        app: notify-api-demo
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index 23ef3dc6c..bc4eaae74 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -106,5 +106,5 @@ jobs:
           CF_PASSWORD: ${{ secrets.CLOUDGOV_PASSWORD }}
       with:
         cf_org: gsa-tts-benefits-studio
-        cf_space: notify-staging
-        app: notify-api-staging
+        cf_space: notify-production
+        app: notify-api-production
diff --git a/app/aws/s3.py b/app/aws/s3.py
index a3cd35811..d4d704632 100644
--- a/app/aws/s3.py
+++ b/app/aws/s3.py
@@ -295,7 +295,11 @@ def get_old_job_location(service_id, job_id):
 
 
 def get_job_and_metadata_from_s3(service_id, job_id):
-    obj = get_s3_object(*get_job_location(service_id, job_id))
+    try:
+        obj = get_s3_object(*get_job_location(service_id, job_id))
+    except botocore.exceptions.ClientError:
+        obj = get_s3_object(*get_old_job_location(service_id, job_id))
+
     return obj.get()["Body"].read().decode("utf-8"), obj.get()["Metadata"]