diff --git a/file-proxy/src/main/resources/application.conf b/file-proxy/src/main/resources/application.conf
index 18160dc07b..945fcd1fc6 100644
--- a/file-proxy/src/main/resources/application.conf
+++ b/file-proxy/src/main/resources/application.conf
@@ -15,11 +15,11 @@ akka.http.server.request-timeout = 4888888 seconds
 hmda {
   publication {
     years {
-      dynamic = "2017,2018,2019,2020,2021,2022,2023,2024"
+      dynamic = "2022,2023,2024,2025"
       dynamic = ${?DYNAMIC_YEARS}
       snapshot = "2017,2018,2019,2020,2021,2023,2024"
       snapshot = ${?SNAPSHOT_YEARS}
-      irs = "2017,2018,2019,2020,2021,2022,2023,2024"
+      irs = "2017,2018,2019,2020,2021,2022,2023,2024,2025"
       irs = ${?IRS_YEARS}
       cm = "file-proxy-publication-config"
       cm = ${?HMDA_PUBLICATION_YEARS_CM}
diff --git a/file-proxy/src/main/scala/hmda/uli/api/http/ProxyHttpApi.scala b/file-proxy/src/main/scala/hmda/uli/api/http/ProxyHttpApi.scala
index 0d60c3b006..53634de985 100644
--- a/file-proxy/src/main/scala/hmda/uli/api/http/ProxyHttpApi.scala
+++ b/file-proxy/src/main/scala/hmda/uli/api/http/ProxyHttpApi.scala
@@ -82,7 +82,7 @@ private class ProxyHttpApi(log: Logger)(implicit ec: ExecutionContext, system: A
           path("csv" / "header") {
             (extractUri & get) { uri =>
               checkYearAvailable(publicationYears(DYNAMIC_PUB_KEY), year) {
-                val s3Key = s"modified-lar/$year/header/${lei}_header.csv"
+                val s3Key = s"modified-lar/$year/${lei}_header.csv"
                 streamingS3Route(s3Key)
               }
             }
@@ -100,7 +100,7 @@ private class ProxyHttpApi(log: Logger)(implicit ec: ExecutionContext, system: A
           path("txt" / "header") {
             (extractUri & get) { uri =>
               checkYearAvailable(publicationYears(DYNAMIC_PUB_KEY), year) {
-                val s3Key = s"modified-lar/$year/header/${lei}_header.txt"
+                val s3Key = s"modified-lar/$year/${lei}_header.txt"
                 streamingS3Route(s3Key)
               }
             }
diff --git a/kubernetes/config-maps/data-publisher-pgtables-configmap.yaml b/kubernetes/config-maps/data-publisher-pgtables-configmap.yaml
deleted file mode 100644
index 7a6878688d..0000000000
--- a/kubernetes/config-maps/data-publisher-pgtables-configmap.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: data-publisher-pgtables-configmap
-data:
-  publishertable.tsTableName2018: "transmittalsheet2018"
-  publishertable.larTableName2018: "loanapplicationregister2018"
-  publishertable.mlarTableName2018: "modifiedlar2018"
-  publishertable.panelTableName2018: "institutions2018"
-  publishertable.tsTableName2019: "transmittalsheet2019"
-  publishertable.larTableName2019: "loanapplicationregister2019"
-  publishertable.mlarTableName2019: "modifiedlar2019"
-  publishertable.panelTableName2019: "institutions2019"
-  publishertable.tsTableName2020: "transmittalsheet2020"
-  publishertable.larTableName2020: "loanapplicationregister2020"
-  publishertable.mlarTableName2020: "modifiedlar2020"
-  publishertable.panelTableName2020: "institutions2020"
-  publishertable.emailTable: "institutions_emails_2018"
-  publishertable.larTableName2020Q1: "lar2020_q1"
-  publishertable.larTableName2020Q2: "lar2020_q2"
-  publishertable.larTableName2020Q3: "lar2020_q3"
\ No newline at end of file
diff --git a/kubernetes/config-maps/dynamic-schedule-config.yaml b/kubernetes/config-maps/dynamic-schedule-config.yaml
index bd89c45b0f..c049e3a2bf 100644
--- a/kubernetes/config-maps/dynamic-schedule-config.yaml
+++ b/kubernetes/config-maps/dynamic-schedule-config.yaml
@@ -9,12 +9,12 @@ metadata:
 
 data:
   COMBINED_MLAR_PUBLIC_SCHEDULE_CRON: 0 00 16 ? * SUN *
-  COMBINED_MLAR_PUBLIC_SCHEDULE_YEARS: 2023,2024
+  COMBINED_MLAR_PUBLIC_SCHEDULE_YEARS: 2023,2024,2025
   LAR_LOAN_LIMIT_SCHEDULE_CRON: 0 10 5 ? * MON *
   LAR_LOAN_LIMIT_SCHEDULE_YEARS: 2023,2024
   LAR_PUBLIC_SCHEDULE_CRON: 0 00 10 ? * SUN *
   LAR_PUBLIC_SCHEDULE_YEARS: 2023,2024
-  LAR_QUARTERLY_SCHEDULE_CRON: 0 0 0 23 4 ? 2079
+  LAR_QUARTERLY_SCHEDULE_CRON: 0 20 6 * * ?
   LAR_QUARTERLY_SCHEDULE_YEARS: "2026"
   LAR_SCHEDULE_CRON: 0 00 14 ? * SUN *
   LAR_SCHEDULE_YEARS: 2023,2024
@@ -28,7 +28,7 @@ data:
   SPECIFIC_TS_SCHEDULE_YEARS: "2025"
   TS_PUBLIC_SCHEDULE_CRON: 0 00 8 ? * SUN *
   TS_PUBLIC_SCHEDULE_YEARS: 2023,2024
-  TS_QUARTERLY_SCHEDULE_CRON: 0 0 0 23 4 ? 2079
+  TS_QUARTERLY_SCHEDULE_CRON: 0 20 6 * * ?
   TS_QUARTERLY_SCHEDULE_YEARS: "2026"
   TS_SCHEDULE_CRON: 0 00 7 ? * SUN *
   TS_SCHEDULE_YEARS: 2023,2024