diff --git a/src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs b/src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs
index 74e63ea98..aa7a46bb5 100644
--- a/src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs
+++ b/src/Stats.AggregateCdnDownloadsInGallery/AggregateCdnDownloadsJob.cs
@@ -22,6 +22,7 @@ namespace Stats.AggregateCdnDownloadsInGallery
 {
     public class AggregateCdnDownloadsJob : JsonConfigurationJob
     {
+        private const int _defaultCommandTimeoutSeconds = 1800; // 30 minutes
         private const int _defaultBatchSize = 5000;
         private const int _defaultBatchSleepSeconds = 10;
         private const string _tempTableName = "#AggregateCdnDownloadsInGallery";
@@ -59,12 +60,14 @@ GROUP BY Stats.[PackageRegistrationKey]
         private const string _storedProcedureName = "[dbo].[SelectTotalDownloadCountsPerPackageVersion]";
 
         private AggregateCdnDownloadsConfiguration _configuration;
+        private int _commandTimeoutSeconds;
 
         public override void Init(IServiceContainer serviceContainer, IDictionary<string, string> jobArgsDictionary)
         {
             base.Init(serviceContainer, jobArgsDictionary);
 
             _configuration = _serviceProvider.GetRequiredService<IOptionsSnapshot<AggregateCdnDownloadsConfiguration>>().Value;
+            _commandTimeoutSeconds = _configuration.CommandTimeoutSeconds ?? _defaultCommandTimeoutSeconds;
         }
 
         public override async Task Run()
@@ -87,11 +90,12 @@ await connection.QueryWithRetryAsync<DownloadCountData>(
                         _storedProcedureName,
                         transaction: transaction,
                         commandType: CommandType.StoredProcedure,
-                        commandTimeout: TimeSpan.FromMinutes(30),
+                        commandTimeout: TimeSpan.FromSeconds(_commandTimeoutSeconds),
                         maxRetries: 3))
                     .ToList();
             }
 
+            stopwatch.Stop();
             Logger.LogInformation(
                 "Gathered {RecordCount} rows of data (took {DurationSeconds} seconds).",
                 downloadData.Count,
@@ -138,6 +142,7 @@ await connection.QueryWithRetryAsync<DownloadCountData>(
                     }
                 }
 
+                stopwatch.Stop();
                 Logger.LogInformation(
                     "It took {DurationSeconds} seconds to update all download counts.",
                     stopwatch.Elapsed.TotalSeconds);
@@ -161,7 +166,7 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
             var aggregateCdnDownloadsInGalleryTable = new DataTable();
             var command = new SqlCommand("SELECT * FROM " + _tempTableName, destinationDatabase);
             command.CommandType = CommandType.Text;
-            command.CommandTimeout = (int)TimeSpan.FromMinutes(10).TotalSeconds;
+            command.CommandTimeout = _commandTimeoutSeconds;
             var reader = await command.ExecuteReaderAsync();
             aggregateCdnDownloadsInGalleryTable.Load(reader);
             aggregateCdnDownloadsInGalleryTable.Rows.Clear();
@@ -188,6 +193,7 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
                 }
             }
 
+            stopwatch.Stop();
             Logger.LogInformation(
                 "Populated temporary table in memory with {RecordCount} rows (took {DurationSeconds} seconds).",
                 aggregateCdnDownloadsInGalleryTable.Rows.Count,
@@ -205,6 +211,7 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
                 bulkcopy.Close();
             }
 
+            stopwatch.Stop();
             Logger.LogInformation(
                 "Populated temporary table in database (took {DurationSeconds} seconds).",
                 stopwatch.Elapsed.TotalSeconds);
@@ -217,11 +224,12 @@ private async Task ProcessBatch(List<IPackageIdGroup> batch, SqlConnection desti
             {
                 cmd.CommandText = _updateFromTempTable;
                 cmd.CommandType = CommandType.Text;
-                cmd.CommandTimeout = (int)TimeSpan.FromMinutes(30).TotalSeconds;
+                cmd.CommandTimeout = _commandTimeoutSeconds;
 
                 await cmd.ExecuteNonQueryAsync();
             }
 
+            stopwatch.Stop();
             Logger.LogInformation(
                 "Updated destination database Download Counts (took {DurationSeconds} seconds).",
                 stopwatch.Elapsed.TotalSeconds);
@@ -275,7 +283,7 @@ private async Task<IDictionary<string, string>> GetPackageRegistrations(SqlConne
             // Ensure results are sorted deterministically.
             var packageRegistrationData = (await sqlConnection.QueryWithRetryAsync<PackageRegistrationData>(
                     "SELECT [Key], LOWER([Id]) AS LowercasedId, [Id] AS OriginalId FROM [dbo].[PackageRegistrations] (NOLOCK) ORDER BY [Id] ASC",
-                    commandTimeout: TimeSpan.FromMinutes(10),
+                    commandTimeout: TimeSpan.FromSeconds(_commandTimeoutSeconds),
                     maxRetries: 5)).ToList();
 
             // We are not using .ToDictionary() and instead explicitly looping through these items to be able to detect
@@ -308,6 +316,7 @@ private async Task<IDictionary<string, string>> GetPackageRegistrations(SqlConne
                 }
             }
 
+            stopwatch.Stop();
             Logger.LogInformation(
                 "Retrieved {Count} package registrations (took {DurationSeconds} seconds).",
                 packageRegistrationData.Count,
diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Configuration/AggregateCdnDownloadsConfiguration.cs b/src/Stats.AggregateCdnDownloadsInGallery/Configuration/AggregateCdnDownloadsConfiguration.cs
index 25ffb5d10..a3371b65d 100644
--- a/src/Stats.AggregateCdnDownloadsInGallery/Configuration/AggregateCdnDownloadsConfiguration.cs
+++ b/src/Stats.AggregateCdnDownloadsInGallery/Configuration/AggregateCdnDownloadsConfiguration.cs
@@ -8,5 +8,7 @@ public class AggregateCdnDownloadsConfiguration
         public int BatchSize { get; set; }
 
         public int BatchSleepSeconds { get; set; }
+
+        public int? CommandTimeoutSeconds { get; set; }
     }
 }
diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Settings/dev.json b/src/Stats.AggregateCdnDownloadsInGallery/Settings/dev.json
index b663af59e..d7dab6f0d 100644
--- a/src/Stats.AggregateCdnDownloadsInGallery/Settings/dev.json
+++ b/src/Stats.AggregateCdnDownloadsInGallery/Settings/dev.json
@@ -1,7 +1,8 @@
 {
   "Initialization": {
     "BatchSize": 5000,
-    "BatchSleepSeconds": 10
+    "BatchSleepSeconds": 10,
+    "CommandTimeoutSeconds": 1800
   },
 
   "GalleryDb": {
diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Settings/int.json b/src/Stats.AggregateCdnDownloadsInGallery/Settings/int.json
index 030d03434..824acb486 100644
--- a/src/Stats.AggregateCdnDownloadsInGallery/Settings/int.json
+++ b/src/Stats.AggregateCdnDownloadsInGallery/Settings/int.json
@@ -1,7 +1,8 @@
 {
   "Initialization": {
     "BatchSize": 5000,
-    "BatchSleepSeconds": 10
+    "BatchSleepSeconds": 10,
+    "CommandTimeoutSeconds": 1800
   },
 
   "GalleryDb": {
diff --git a/src/Stats.AggregateCdnDownloadsInGallery/Settings/prod.json b/src/Stats.AggregateCdnDownloadsInGallery/Settings/prod.json
index f0438f2aa..f6447e09d 100644
--- a/src/Stats.AggregateCdnDownloadsInGallery/Settings/prod.json
+++ b/src/Stats.AggregateCdnDownloadsInGallery/Settings/prod.json
@@ -1,7 +1,8 @@
 {
   "Initialization": {
     "BatchSize": 5000,
-    "BatchSleepSeconds": 10
+    "BatchSleepSeconds": 10,
+    "CommandTimeoutSeconds": 2700
   },
 
   "GalleryDb": {