diff --git a/app/config.py b/app/config.py
index 981ed9ed2..04ae40492 100644
--- a/app/config.py
+++ b/app/config.py
@@ -451,7 +451,7 @@ class Sandbox(CloudFoundryConfig):
     TEST_LETTERS_BUCKET_NAME = 'cf-sandbox-test-letters'
     DVLA_RESPONSE_BUCKET_NAME = 'notify.works-ftp'
     LETTERS_PDF_BUCKET_NAME = 'cf-sandbox-letters-pdf'
-    LETTERS_SCAN_BUCKET_NAME = 'cf-sandbox-virus-check-pdf'
+    LETTERS_SCAN_BUCKET_NAME = 'cf-sandbox-letters-scan'
     FROM_NUMBER = 'sandbox'
     REDIS_ENABLED = False
 
diff --git a/app/letters/utils.py b/app/letters/utils.py
index 7b6205c68..34f270b9b 100644
--- a/app/letters/utils.py
+++ b/app/letters/utils.py
@@ -64,6 +64,11 @@ def upload_letter_pdf(notification, pdf_data, is_test_letter=False):
     else:
         bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
 
+    if notification.template.is_precompiled_letter:
+        bucket_name = current_app.config['LETTERS_SCAN_BUCKET_NAME']
+    else:
+        bucket_name = current_app.config['LETTERS_PDF_BUCKET_NAME']
+
     s3upload(
         filedata=pdf_data,
         region=current_app.config['AWS_REGION'],
diff --git a/tests/app/letters/test_letter_utils.py b/tests/app/letters/test_letter_utils.py
index 04cb8eea9..241e5a27d 100644
--- a/tests/app/letters/test_letter_utils.py
+++ b/tests/app/letters/test_letter_utils.py
@@ -1,3 +1,4 @@
+from flask import current_app
 import pytest
 from datetime import datetime
 
@@ -21,6 +22,13 @@ def sample_precompiled_letter_notification_using_test_key(sample_letter_notifica
     sample_letter_notification.reference = 'foo'
     sample_letter_notification.created_at = datetime.utcnow()
     return sample_letter_notification
+from app.letters.utils import (
+    get_bucket_prefix_for_notification,
+    get_letter_pdf_filename,
+    upload_letter_pdf
+)
+from app.models import PRECOMPILED_TEMPLATE_NAME
+from app.variables import Retention
 
 
 def test_get_bucket_prefix_for_notification_valid_notification(sample_notification):
@@ -100,3 +108,32 @@ def test_get_letter_pdf_gets_pdf_from_correct_bucket(
     ret = get_letter_pdf(sample_precompiled_letter_notification_using_test_key)
 
     assert ret == b'pdf_content'
+
+
+@pytest.mark.parametrize('is_precompiled_letter,bucket_config_name', [
+    (False, 'LETTERS_PDF_BUCKET_NAME'),
+    (True, 'LETTERS_SCAN_BUCKET_NAME')
+])
+def test_upload_letter_pdf_to_correct_bucket(
+    sample_letter_notification, mocker, is_precompiled_letter, bucket_config_name
+):
+    if is_precompiled_letter:
+        sample_letter_notification.template.hidden = True
+        sample_letter_notification.template.name = PRECOMPILED_TEMPLATE_NAME
+
+    mock_s3 = mocker.patch('app.letters.utils.s3upload')
+
+    filename = get_letter_pdf_filename(
+        reference=sample_letter_notification.reference,
+        crown=sample_letter_notification.service.crown
+    )
+
+    upload_letter_pdf(sample_letter_notification, b'\x00\x01')
+
+    mock_s3.assert_called_once_with(
+        bucket_name=current_app.config[bucket_config_name],
+        file_location=filename,
+        filedata=b'\x00\x01',
+        region=current_app.config['AWS_REGION'],
+        tags={Retention.KEY: Retention.ONE_WEEK}
+    )