diff --git a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
index c58a43aeb5..58ba3eddaf 100644
--- a/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
+++ b/openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
@@ -66,13 +66,12 @@ class Command(BaseCommand):
                     client_type="discovery" if is_discovery else "ecommerce",
                 ),
                 "url": url,
-                "client_id": "{client_type}-key-{site_name}".format(
+                "client_id": "{client_type}-key{site_name}".format(
                     client_type="discovery" if is_discovery else "ecommerce",
-                    site_name=site_name
+                    site_name="" if site_name == "edx" else "-{}".format(site_name)
                 ),
-                "client_secret": "{client_type}-secret-{dns_name}".format(
-                    client_type="discovery" if is_discovery else "ecommerce",
-                    dns_name=self.dns_name
+                "client_secret": "{client_type}-secret".format(
+                    client_type="discovery" if is_discovery else "ecommerce"
                 ),
                 "client_type": CONFIDENTIAL,
                 "logout_uri": "{url}logout/".format(url=url)
diff --git a/openedx/core/djangoapps/theming/management/commands/tests/test_create_sites_and_configurations.py b/openedx/core/djangoapps/theming/management/commands/tests/test_create_sites_and_configurations.py
index 3814b47360..0989bffd40 100644
--- a/openedx/core/djangoapps/theming/management/commands/tests/test_create_sites_and_configurations.py
+++ b/openedx/core/djangoapps/theming/management/commands/tests/test_create_sites_and_configurations.py
@@ -101,6 +101,14 @@ class TestCreateSiteAndConfiguration(TestCase):
                 client.redirect_uri,
                 "{ecommerce_url}complete/edx-oidc/".format(ecommerce_url=ecommerce_url)
             )
+            self.assertEqual(
+                client.client_id,
+                "ecommerce-key-{site_name}".format(site_name=site_name)
+            )
+            self.assertEqual(
+                client.client_secret,
+                "ecommerce-secret"
+            )
             self.assertEqual(
                 len(TrustedClient.objects.filter(client=client)),
                 1
@@ -127,6 +135,14 @@ class TestCreateSiteAndConfiguration(TestCase):
                 client.redirect_uri,
                 "{discovery_url}complete/edx-oidc/".format(discovery_url=discovery_url)
             )
+            self.assertEqual(
+                client.client_id,
+                "discovery-key-{site_name}".format(site_name=site_name)
+            )
+            self.assertEqual(
+                client.client_secret,
+                "discovery-secret"
+            )
             self.assertEqual(
                 len(TrustedClient.objects.filter(client=client)),
                 1