diff --git a/serving/src/main/resources/application.yml b/serving/src/main/resources/application.yml
index 053fddfafff..f6eaccf3cd4 100644
--- a/serving/src/main/resources/application.yml
+++ b/serving/src/main/resources/application.yml
@@ -36,11 +36,11 @@ feast:
         # to download the batch features.
         # For example: gs://mybucket/myprefix
         # Please omit the trailing slash in the URI.
-        staging-location: gs://mybucket/myprefix
+        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 cd372511c0a..0edcf67806b 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));
@@ -73,9 +73,9 @@ public static HistoricalRetriever create(Map<String, String> config) {
         .setBigquery(bigquery)
         .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")))
+        .setJobStagingLocation(config.get("staging_location"))
+        .setInitialRetryDelaySecs(Integer.parseInt(config.get("initial_retry_delay_seconds")))
+        .setTotalTimeoutSecs(Integer.parseInt(config.get("total_timeout_seconds")))
         .setStorage(storage)
         .build();
   }