diff --git a/app/config.py b/app/config.py
index d9f82ad6a..4232e2411 100644
--- a/app/config.py
+++ b/app/config.py
@@ -87,7 +87,7 @@ class Config(object):
         r"cqc\.org\.uk",
     ]
 
-    LOGO_UPLOAD_BUCKET_NAME = 'local-notifications-logo-upload'
+    LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'
 
 
 class Development(Config):
@@ -105,7 +105,7 @@ class Test(Development):
     STATSD_ENABLED = True
     WTF_CSRF_ENABLED = False
     CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
-    LOGO_UPLOAD_BUCKET_NAME = 'test-notifications-logo-upload'
+    LOGO_UPLOAD_BUCKET_NAME = 'public-logos-test'
     NOTIFY_ENVIRONMENT = 'test'
     TEMPLATE_PREVIEW_API_HOST = 'http://localhost:9999'
 
@@ -115,7 +115,7 @@ class Preview(Config):
     HEADER_COLOUR = '#F499BE'  # $baby-pink
     STATSD_ENABLED = True
     CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
-    LOGO_UPLOAD_BUCKET_NAME = 'preview-notifications-logo-upload'
+    LOGO_UPLOAD_BUCKET_NAME = 'public-logos-preview'
     NOTIFY_ENVIRONMENT = 'preview'
 
 
@@ -125,7 +125,7 @@ class Staging(Config):
     HEADER_COLOUR = '#6F72AF'  # $mauve
     STATSD_ENABLED = True
     CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
-    LOGO_UPLOAD_BUCKET_NAME = 'staging-notifications-logo-upload'
+    LOGO_UPLOAD_BUCKET_NAME = 'public-logos-staging'
     NOTIFY_ENVIRONMENT = 'staging'
 
 
@@ -135,7 +135,7 @@ class Live(Config):
     HTTP_PROTOCOL = 'https'
     STATSD_ENABLED = True
     CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
-    LOGO_UPLOAD_BUCKET_NAME = 'live-notifications-logo-upload'
+    LOGO_UPLOAD_BUCKET_NAME = 'public-logos-live'
     NOTIFY_ENVIRONMENT = 'live'
 
 
diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py
index 8e2269e32..14805cf96 100644
--- a/tests/app/test_utils.py
+++ b/tests/app/test_utils.py
@@ -159,6 +159,7 @@ def test_generate_notifications_csv_calls_twice_if_next_link(mocker):
     assert mock_get_notifications.mock_calls[1][2]['page'] == 2
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 @freeze_time('2017-07-14 14:59:59')  # Friday, before print deadline
 @pytest.mark.parametrize('upload_time, expected_print_time, is_printed, expected_earliest, expected_latest', [
@@ -298,6 +299,9 @@ def test_get_estimated_delivery_date_for_letter(
 >>>>>>> Update emails to use logos cdn
 def test_get_cdn_domain_on_localhost(client, mocker):
     mocker.patch.dict('app.current_app.config', values={'ADMIN_BASE_URL': 'http://localhost:6012'})
+=======
+def test_get_cdn_domain_on_localhost(client):
+>>>>>>> Update config to new s3 bucket names
     domain = get_cdn_domain()
     assert domain == 'static-logos.notify.tools'