diff --git a/serving/src/main/resources/application.yml b/serving/src/main/resources/application.yml
index 0e5ff3a405..f6eaccf3cd 100644
--- a/serving/src/main/resources/application.yml
+++ b/serving/src/main/resources/application.yml
@@ -38,9 +38,9 @@ feast:
         # Please omit the trailing slash in the URI.
         staging_location: gs://mybucket/myprefix
         # Retry options for BigQuery retrieval jobs
-        bigquery_initial_retry_delay_secs: 1
+        initial_retry_delay_seconds: 1
         # BigQuery timeout for retrieval jobs
-        bigquery_total_timeout_secs: 21600
+        total_timeout_seconds: 21600
       subscriptions:
         - name: "*"
           project: "*"
diff --git a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java
index cc7a2f2695..0edcf67806 100644
--- a/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java
+++ b/storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/retriever/BigQueryHistoricalRetriever.java
@@ -55,7 +55,7 @@ public static HistoricalRetriever create(Map<String, String> config) {
     BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
     Storage storage = StorageOptions.getDefaultInstance().getService();
 
-    String jobStagingLocation = config.get("staging-location");
+    String jobStagingLocation = config.get("staging_location");
     if (!jobStagingLocation.contains("://")) {
       throw new IllegalArgumentException(
           String.format("jobStagingLocation is not a valid URI: %s", jobStagingLocation));
@@ -74,8 +74,8 @@ public static HistoricalRetriever create(Map<String, String> config) {
         .setDatasetId(config.get("dataset_id"))
         .setProjectId(config.get("project_id"))
         .setJobStagingLocation(config.get("staging_location"))
-        .setInitialRetryDelaySecs(Integer.parseInt(config.get("bigquery_initial_retry_delay_secs")))
-        .setTotalTimeoutSecs(Integer.parseInt(config.get("bigquery_total_timeout_secs")))
+        .setInitialRetryDelaySecs(Integer.parseInt(config.get("initial_retry_delay_seconds")))
+        .setTotalTimeoutSecs(Integer.parseInt(config.get("total_timeout_seconds")))
         .setStorage(storage)
         .build();
   }