diff --git a/src/Cli/src/ConfigGenerator.cs b/src/Cli/src/ConfigGenerator.cs
index 14e1b0c0fd..bc70cd6764 100644
--- a/src/Cli/src/ConfigGenerator.cs
+++ b/src/Cli/src/ConfigGenerator.cs
@@ -93,7 +93,6 @@ public static bool TryCreateRuntimeConfig(InitOptions options, out string runtim
             RuntimeConfig runtimeConfig = new(
                 Schema: RuntimeConfig.SCHEMA,
                 DataSource: dataSource,
-                CosmosDb: cosmosDbNoSqlOptions,
                 RuntimeSettings: GetDefaultGlobalSettings(
                     options.HostMode,
                     options.CorsOrigin,
diff --git a/src/Cli/test/InitTests.cs b/src/Cli/test/InitTests.cs
index 920b349db5..bd1eb6b5f6 100644
--- a/src/Cli/test/InitTests.cs
+++ b/src/Cli/test/InitTests.cs
@@ -153,11 +153,6 @@ public void CosmosDbNoSqlDatabase()
                         ""schema"": ""schemafile""
                     }
                 },
-                ""cosmos"": {
-                    ""database"": ""testdb"",
-                    ""container"": ""testcontainer"",
-                    ""schema"": ""schemafile""
-                },
                 ""entities"": {}
             }";
 
diff --git a/src/Config/DataSource.cs b/src/Config/DataSource.cs
index 00bd42b79b..8fe8d8b15e 100644
--- a/src/Config/DataSource.cs
+++ b/src/Config/DataSource.cs
@@ -75,10 +75,6 @@ public record CosmosDbOptions(
         string? GraphQLSchema)
     {
         public const string GRAPHQL_SCHEMA_PATH_PROPERTY_NAME = "schema";
-
-        // Keeping the name as cosmos only to provide backwards compatibility.
-        // This property won't be needed going forward.
-        public const string JSON_PROPERTY_NAME = nameof(DatabaseType.cosmos);
     }
 
     /// <summary>
diff --git a/src/Config/RuntimeConfig.cs b/src/Config/RuntimeConfig.cs
index 702616c513..8ecb513468 100644
--- a/src/Config/RuntimeConfig.cs
+++ b/src/Config/RuntimeConfig.cs
@@ -57,9 +57,7 @@ public record RuntimeConfig(
         [property: JsonPropertyName(GlobalSettings.JSON_PROPERTY_NAME)]
         Dictionary<GlobalSettingsType, object>? RuntimeSettings,
         [property: JsonPropertyName(Entity.JSON_PROPERTY_NAME)]
-        Dictionary<string, Entity> Entities,
-        [property: JsonPropertyName(CosmosDbOptions.JSON_PROPERTY_NAME)]
-        CosmosDbOptions? CosmosDb = null)
+        Dictionary<string, Entity> Entities)
     {
         public const string SCHEMA_PROPERTY_NAME = "$schema";
         public const string SCHEMA = "dab.draft.schema.json";
diff --git a/src/Service.Tests/Configuration/ConfigurationTests.cs b/src/Service.Tests/Configuration/ConfigurationTests.cs
index 1c117583e3..d1ecd6d0f6 100644
--- a/src/Service.Tests/Configuration/ConfigurationTests.cs
+++ b/src/Service.Tests/Configuration/ConfigurationTests.cs
@@ -426,7 +426,7 @@ public async Task TestSettingConfigurationCreatesCorrectClasses()
             Assert.IsTrue(isConfigSet, "TryGetRuntimeConfiguration should return true when the config is set.");
 
             Assert.AreEqual(DatabaseType.cosmos, configuration.DatabaseType, "Expected cosmos database type after configuring the runtime with cosmos settings.");
-            Assert.AreEqual(config.Schema, configuration.CosmosDb.GraphQLSchema, "Expected the schema in the configuration to match the one sent to the configuration endpoint.");
+            Assert.AreEqual(config.Schema, configuration.DataSource.CosmosDbNoSql.GraphQLSchema, "Expected the schema in the configuration to match the one sent to the configuration endpoint.");
             Assert.AreEqual(config.ConnectionString, configuration.ConnectionString, "Expected the connection string in the configuration to match the one sent to the configuration endpoint.");
         }
 
diff --git a/src/Service/Configurations/RuntimeConfigProvider.cs b/src/Service/Configurations/RuntimeConfigProvider.cs
index 4576ca6a47..6510c2167d 100644
--- a/src/Service/Configurations/RuntimeConfigProvider.cs
+++ b/src/Service/Configurations/RuntimeConfigProvider.cs
@@ -246,8 +246,9 @@ public void Initialize(
                         throw new ArgumentException($"'{nameof(schema)}' cannot be null or empty.", nameof(schema));
                     }
 
-                    CosmosDbOptions? cosmosDb = RuntimeConfiguration.CosmosDb! with { GraphQLSchema = schema };
-                    RuntimeConfiguration = RuntimeConfiguration with { CosmosDb = cosmosDb };
+                    CosmosDbOptions? cosmosDb = RuntimeConfiguration.DataSource.CosmosDbNoSql! with { GraphQLSchema = schema };
+                    DataSource dataSource = RuntimeConfiguration.DataSource with { CosmosDbNoSql = cosmosDb };
+                    RuntimeConfiguration = RuntimeConfiguration with { DataSource = dataSource };
                 }
             }
 
diff --git a/src/Service/Services/MetadataProviders/CosmosSqlMetadataProvider.cs b/src/Service/Services/MetadataProviders/CosmosSqlMetadataProvider.cs
index 5c616ee864..79c8a5cda1 100644
--- a/src/Service/Services/MetadataProviders/CosmosSqlMetadataProvider.cs
+++ b/src/Service/Services/MetadataProviders/CosmosSqlMetadataProvider.cs
@@ -33,7 +33,7 @@ public CosmosSqlMetadataProvider(RuntimeConfigProvider runtimeConfigProvider, IF
             _databaseType = _runtimeConfig.DatabaseType;
             _graphQLSingularTypeToEntityNameMap = _runtimeConfig.GraphQLSingularTypeToEntityNameMap;
 
-            CosmosDbOptions? cosmosDb = _runtimeConfig.CosmosDb;
+            CosmosDbOptions? cosmosDb = _runtimeConfig.DataSource.CosmosDbNoSql;
 
             if (cosmosDb is null)
             {