diff --git a/Cargo.toml b/Cargo.toml
index 6732028ae..2a821a5c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -106,7 +106,7 @@ anyhow = { version = "1.0", features = ["backtrace"] }
 bytes = "1.4"
 clokwerk = "0.4"
 derive_more = { version = "1", features = ["full"] }
-itertools = "0.14.0"
+itertools = "0.14"
 lazy_static = "1.4"
 nom = "7.1.3"
 once_cell = "1.17.1"
diff --git a/Dockerfile.debug b/Dockerfile.debug
index f76f21e30..51facae9e 100644
--- a/Dockerfile.debug
+++ b/Dockerfile.debug
@@ -23,7 +23,7 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0"
 
 WORKDIR /parseable
 COPY . .
-RUN cargo build --features debug
+RUN cargo build
 
 # final stage
 FROM docker.io/debian:bookworm-slim
diff --git a/helm-releases/parseable-1.7.3.tgz b/helm-releases/parseable-1.7.3.tgz
new file mode 100644
index 000000000..ac946404a
Binary files /dev/null and b/helm-releases/parseable-1.7.3.tgz differ
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 12290a6ad..2edece5d2 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: parseable
 description: Helm chart for Parseable Server
 type: application
-version: 1.7.2
-appVersion: "v1.7.2"
+version: 1.7.3
+appVersion: "v1.7.3"
 icon: "https://raw.githubusercontent.com/parseablehq/.github/main/images/logo.svg"
 maintainers:
   - name: Parseable Team
diff --git a/helm/values.yaml b/helm/values.yaml
index 148ab702a..b3b2afb63 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,7 +1,7 @@
 parseable:
   image:
     repository: containers.parseable.com/parseable/parseable
-    tag: "v1.7.2"
+    tag: "v1.7.3"
     pullPolicy: Always
   ## object store can be local-store, s3-store, blob-store or gcs-store.
   store: local-store
diff --git a/index.yaml b/index.yaml
index 4e2dd1a79..7b757c058 100644
--- a/index.yaml
+++ b/index.yaml
@@ -32,9 +32,33 @@ entries:
     - https://charts.parseable.com/helm-releases/operator-0.0.1.tgz
     version: 0.0.1
   parseable:
+  - apiVersion: v2
+    appVersion: v1.7.3
+    created: "2025-01-19T22:18:38.579260678+05:30"
+    dependencies:
+    - condition: vector.enabled
+      name: vector
+      repository: https://helm.vector.dev
+      version: 0.20.1
+    - condition: fluent-bit.enabled
+      name: fluent-bit
+      repository: https://fluent.github.io/helm-charts
+      version: 0.48.0
+    description: Helm chart for Parseable Server
+    digest: fc669cc120a54edca6cd54df139fefd3e5db70357db9778c0e3d0a177bf9420a
+    icon: https://raw.githubusercontent.com/parseablehq/.github/main/images/logo.svg
+    maintainers:
+    - email: hi@parseable.com
+      name: Parseable Team
+      url: https://parseable.com
+    name: parseable
+    type: application
+    urls:
+    - https://charts.parseable.com/helm-releases/parseable-1.7.3.tgz
+    version: 1.7.3
   - apiVersion: v2
     appVersion: v1.7.2
-    created: "2025-01-12T16:28:41.454399817+05:30"
+    created: "2025-01-19T22:18:38.573528159+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -58,7 +82,7 @@ entries:
     version: 1.7.2
   - apiVersion: v2
     appVersion: v1.7.1
-    created: "2025-01-12T16:28:41.450379755+05:30"
+    created: "2025-01-19T22:18:38.566789328+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -82,7 +106,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: v1.7.0
-    created: "2025-01-12T16:28:41.445824845+05:30"
+    created: "2025-01-19T22:18:38.558786821+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -105,7 +129,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.44118527+05:30"
+    created: "2025-01-19T22:18:38.552604504+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -128,7 +152,7 @@ entries:
     version: 1.6.8
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.436984541+05:30"
+    created: "2025-01-19T22:18:38.545928129+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -151,7 +175,7 @@ entries:
     version: 1.6.7
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.432577064+05:30"
+    created: "2025-01-19T22:18:38.539352737+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -174,7 +198,7 @@ entries:
     version: 1.6.6
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.429107494+05:30"
+    created: "2025-01-19T22:18:38.532973044+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -197,7 +221,7 @@ entries:
     version: 1.6.5
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.426341345+05:30"
+    created: "2025-01-19T22:18:38.524605273+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -220,7 +244,7 @@ entries:
     version: 1.6.4
   - apiVersion: v2
     appVersion: v1.6.3
-    created: "2025-01-12T16:28:41.423083923+05:30"
+    created: "2025-01-19T22:18:38.518022746+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -243,7 +267,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: v1.6.2
-    created: "2025-01-12T16:28:41.420383606+05:30"
+    created: "2025-01-19T22:18:38.510032438+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -266,7 +290,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: v1.6.1
-    created: "2025-01-12T16:28:41.417714091+05:30"
+    created: "2025-01-19T22:18:38.504074682+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -289,7 +313,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: v1.6.0
-    created: "2025-01-12T16:28:41.413887535+05:30"
+    created: "2025-01-19T22:18:38.49785744+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -312,7 +336,7 @@ entries:
     version: 1.6.0
   - apiVersion: v2
     appVersion: v1.5.5
-    created: "2025-01-12T16:28:41.411257393+05:30"
+    created: "2025-01-19T22:18:38.490658991+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -335,7 +359,7 @@ entries:
     version: 1.5.5
   - apiVersion: v2
     appVersion: v1.5.4
-    created: "2025-01-12T16:28:41.407963529+05:30"
+    created: "2025-01-19T22:18:38.484591557+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -358,7 +382,7 @@ entries:
     version: 1.5.4
   - apiVersion: v2
     appVersion: v1.5.3
-    created: "2025-01-12T16:28:41.403839411+05:30"
+    created: "2025-01-19T22:18:38.477943269+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -381,7 +405,7 @@ entries:
     version: 1.5.3
   - apiVersion: v2
     appVersion: v1.5.2
-    created: "2025-01-12T16:28:41.399623081+05:30"
+    created: "2025-01-19T22:18:38.469788243+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -404,7 +428,7 @@ entries:
     version: 1.5.2
   - apiVersion: v2
     appVersion: v1.5.1
-    created: "2025-01-12T16:28:41.394389129+05:30"
+    created: "2025-01-19T22:18:38.46214575+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -427,7 +451,7 @@ entries:
     version: 1.5.1
   - apiVersion: v2
     appVersion: v1.5.0
-    created: "2025-01-12T16:28:41.39013918+05:30"
+    created: "2025-01-19T22:18:38.453090306+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -450,7 +474,7 @@ entries:
     version: 1.5.0
   - apiVersion: v2
     appVersion: v1.4.0
-    created: "2025-01-12T16:28:41.386152667+05:30"
+    created: "2025-01-19T22:18:38.444787107+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -473,7 +497,7 @@ entries:
     version: 1.4.1
   - apiVersion: v2
     appVersion: v1.4.0
-    created: "2025-01-12T16:28:41.382427602+05:30"
+    created: "2025-01-19T22:18:38.437352462+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -496,7 +520,7 @@ entries:
     version: 1.4.0
   - apiVersion: v2
     appVersion: v1.3.0
-    created: "2025-01-12T16:28:41.379967359+05:30"
+    created: "2025-01-19T22:18:38.428443431+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -519,7 +543,7 @@ entries:
     version: 1.3.1
   - apiVersion: v2
     appVersion: v1.3.0
-    created: "2025-01-12T16:28:41.376001975+05:30"
+    created: "2025-01-19T22:18:38.42112336+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -542,7 +566,7 @@ entries:
     version: 1.3.0
   - apiVersion: v2
     appVersion: v1.2.0
-    created: "2025-01-12T16:28:41.372257331+05:30"
+    created: "2025-01-19T22:18:38.414669634+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -565,7 +589,7 @@ entries:
     version: 1.2.0
   - apiVersion: v2
     appVersion: v1.1.0
-    created: "2025-01-12T16:28:41.368573985+05:30"
+    created: "2025-01-19T22:18:38.406863375+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -588,7 +612,7 @@ entries:
     version: 1.1.0
   - apiVersion: v2
     appVersion: v1.0.0
-    created: "2025-01-12T16:28:41.364787316+05:30"
+    created: "2025-01-19T22:18:38.399527815+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -611,7 +635,7 @@ entries:
     version: 1.0.0
   - apiVersion: v2
     appVersion: v0.9.0
-    created: "2025-01-12T16:28:41.361053358+05:30"
+    created: "2025-01-19T22:18:38.390829235+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -634,7 +658,7 @@ entries:
     version: 0.9.0
   - apiVersion: v2
     appVersion: v0.8.1
-    created: "2025-01-12T16:28:41.358626031+05:30"
+    created: "2025-01-19T22:18:38.383876541+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -657,7 +681,7 @@ entries:
     version: 0.8.1
   - apiVersion: v2
     appVersion: v0.8.0
-    created: "2025-01-12T16:28:41.355864062+05:30"
+    created: "2025-01-19T22:18:38.377288522+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -680,7 +704,7 @@ entries:
     version: 0.8.0
   - apiVersion: v2
     appVersion: v0.7.3
-    created: "2025-01-12T16:28:41.352685386+05:30"
+    created: "2025-01-19T22:18:38.370059728+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -703,7 +727,7 @@ entries:
     version: 0.7.3
   - apiVersion: v2
     appVersion: v0.7.2
-    created: "2025-01-12T16:28:41.350343723+05:30"
+    created: "2025-01-19T22:18:38.361378685+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -726,7 +750,7 @@ entries:
     version: 0.7.2
   - apiVersion: v2
     appVersion: v0.7.1
-    created: "2025-01-12T16:28:41.346545737+05:30"
+    created: "2025-01-19T22:18:38.354376127+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -749,7 +773,7 @@ entries:
     version: 0.7.1
   - apiVersion: v2
     appVersion: v0.7.0
-    created: "2025-01-12T16:28:41.343885887+05:30"
+    created: "2025-01-19T22:18:38.346080907+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -772,7 +796,7 @@ entries:
     version: 0.7.0
   - apiVersion: v2
     appVersion: v0.6.2
-    created: "2025-01-12T16:28:41.341458058+05:30"
+    created: "2025-01-19T22:18:38.339689852+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -795,7 +819,7 @@ entries:
     version: 0.6.2
   - apiVersion: v2
     appVersion: v0.6.1
-    created: "2025-01-12T16:28:41.33900463+05:30"
+    created: "2025-01-19T22:18:38.333273491+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -818,7 +842,7 @@ entries:
     version: 0.6.1
   - apiVersion: v2
     appVersion: v0.6.0
-    created: "2025-01-12T16:28:41.335970833+05:30"
+    created: "2025-01-19T22:18:38.325938745+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -841,7 +865,7 @@ entries:
     version: 0.6.0
   - apiVersion: v2
     appVersion: v0.5.1
-    created: "2025-01-12T16:28:41.333568215+05:30"
+    created: "2025-01-19T22:18:38.320702104+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -864,7 +888,7 @@ entries:
     version: 0.5.1
   - apiVersion: v2
     appVersion: v0.5.0
-    created: "2025-01-12T16:28:41.331150701+05:30"
+    created: "2025-01-19T22:18:38.315281885+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -887,7 +911,7 @@ entries:
     version: 0.5.0
   - apiVersion: v2
     appVersion: v0.4.4
-    created: "2025-01-12T16:28:41.328117336+05:30"
+    created: "2025-01-19T22:18:38.308649067+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -910,7 +934,7 @@ entries:
     version: 0.4.5
   - apiVersion: v2
     appVersion: v0.4.3
-    created: "2025-01-12T16:28:41.325815129+05:30"
+    created: "2025-01-19T22:18:38.302676879+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -933,7 +957,7 @@ entries:
     version: 0.4.4
   - apiVersion: v2
     appVersion: v0.4.2
-    created: "2025-01-12T16:28:41.323399573+05:30"
+    created: "2025-01-19T22:18:38.296294253+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -956,7 +980,7 @@ entries:
     version: 0.4.3
   - apiVersion: v2
     appVersion: v0.4.1
-    created: "2025-01-12T16:28:41.318778425+05:30"
+    created: "2025-01-19T22:18:38.287947749+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -979,7 +1003,7 @@ entries:
     version: 0.4.2
   - apiVersion: v2
     appVersion: v0.4.0
-    created: "2025-01-12T16:28:41.315128961+05:30"
+    created: "2025-01-19T22:18:38.280799435+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -1002,7 +1026,7 @@ entries:
     version: 0.4.1
   - apiVersion: v2
     appVersion: v0.4.0
-    created: "2025-01-12T16:28:41.311401675+05:30"
+    created: "2025-01-19T22:18:38.273914713+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -1025,7 +1049,7 @@ entries:
     version: 0.4.0
   - apiVersion: v2
     appVersion: v0.3.1
-    created: "2025-01-12T16:28:41.308017894+05:30"
+    created: "2025-01-19T22:18:38.266069875+05:30"
     dependencies:
     - condition: vector.enabled
       name: vector
@@ -1048,7 +1072,7 @@ entries:
     version: 0.3.1
   - apiVersion: v2
     appVersion: v0.3.0
-    created: "2025-01-12T16:28:41.305270896+05:30"
+    created: "2025-01-19T22:18:38.259498944+05:30"
     description: Helm chart for Parseable Server
     digest: ff30739229b727dc637f62fd4481c886a6080ce4556bae10cafe7642ddcfd937
     name: parseable
@@ -1058,7 +1082,7 @@ entries:
     version: 0.3.0
   - apiVersion: v2
     appVersion: v0.2.2
-    created: "2025-01-12T16:28:41.30490598+05:30"
+    created: "2025-01-19T22:18:38.258874532+05:30"
     description: Helm chart for Parseable Server
     digest: 477d0dc2f0c07d4f4c32e105d4bdd70c71113add5c2a75ac5f1cb42aa0276db7
     name: parseable
@@ -1068,7 +1092,7 @@ entries:
     version: 0.2.2
   - apiVersion: v2
     appVersion: v0.2.1
-    created: "2025-01-12T16:28:41.304549759+05:30"
+    created: "2025-01-19T22:18:38.258250511+05:30"
     description: Helm chart for Parseable Server
     digest: 84826fcd1b4c579f301569f43b0309c07e8082bad76f5cdd25f86e86ca2e8192
     name: parseable
@@ -1078,7 +1102,7 @@ entries:
     version: 0.2.1
   - apiVersion: v2
     appVersion: v0.2.0
-    created: "2025-01-12T16:28:41.304221338+05:30"
+    created: "2025-01-19T22:18:38.257735435+05:30"
     description: Helm chart for Parseable Server
     digest: 7a759f7f9809f3935cba685e904c021a0b645f217f4e45b9be185900c467edff
     name: parseable
@@ -1088,7 +1112,7 @@ entries:
     version: 0.2.0
   - apiVersion: v2
     appVersion: v0.1.1
-    created: "2025-01-12T16:28:41.303883287+05:30"
+    created: "2025-01-19T22:18:38.257172544+05:30"
     description: Helm chart for Parseable Server
     digest: 37993cf392f662ec7b1fbfc9a2ba00ec906d98723e38f3c91ff1daca97c3d0b3
     name: parseable
@@ -1098,7 +1122,7 @@ entries:
     version: 0.1.1
   - apiVersion: v2
     appVersion: v0.1.0
-    created: "2025-01-12T16:28:41.30347477+05:30"
+    created: "2025-01-19T22:18:38.256639986+05:30"
     description: Helm chart for Parseable Server
     digest: 1d580d072af8d6b1ebcbfee31c2e16c907d08db754780f913b5f0032b403789b
     name: parseable
@@ -1108,7 +1132,7 @@ entries:
     version: 0.1.0
   - apiVersion: v2
     appVersion: v0.0.8
-    created: "2025-01-12T16:28:41.302489668+05:30"
+    created: "2025-01-19T22:18:38.256001884+05:30"
     description: Helm chart for Parseable Server
     digest: c805254ffa634f96ecec448bcfff9973339aa9487dd8199b21b17b79a4de9345
     name: parseable
@@ -1118,7 +1142,7 @@ entries:
     version: 0.0.8
   - apiVersion: v2
     appVersion: v0.0.7
-    created: "2025-01-12T16:28:41.302253553+05:30"
+    created: "2025-01-19T22:18:38.255337236+05:30"
     description: Helm chart for Parseable Server
     digest: c591f617ed1fe820bb2c72a4c976a78126f1d1095d552daa07c4700f46c4708a
     name: parseable
@@ -1128,7 +1152,7 @@ entries:
     version: 0.0.7
   - apiVersion: v2
     appVersion: v0.0.6
-    created: "2025-01-12T16:28:41.302011848+05:30"
+    created: "2025-01-19T22:18:38.254660454+05:30"
     description: Helm chart for Parseable Server
     digest: f9ae56a6fcd6a59e7bee0436200ddbedeb74ade6073deb435b8fcbaf08dda795
     name: parseable
@@ -1138,7 +1162,7 @@ entries:
     version: 0.0.6
   - apiVersion: v2
     appVersion: v0.0.5
-    created: "2025-01-12T16:28:41.301717639+05:30"
+    created: "2025-01-19T22:18:38.253947451+05:30"
     description: Helm chart for Parseable Server
     digest: 4d6b08a064fba36e16feeb820b77e1e8e60fb6de48dbf7ec8410d03d10c26ad0
     name: parseable
@@ -1148,7 +1172,7 @@ entries:
     version: 0.0.5
   - apiVersion: v2
     appVersion: v0.0.2
-    created: "2025-01-12T16:28:41.301463367+05:30"
+    created: "2025-01-19T22:18:38.253163759+05:30"
     description: Helm chart for Parseable Server
     digest: 38a0a3e4c498afbbcc76ebfcb9cb598fa2ca843a53cc93b3cb4f135b85c10844
     name: parseable
@@ -1158,7 +1182,7 @@ entries:
     version: 0.0.2
   - apiVersion: v2
     appVersion: v0.0.1
-    created: "2025-01-12T16:28:41.301217196+05:30"
+    created: "2025-01-19T22:18:38.251235121+05:30"
     description: Helm chart for Parseable Server
     digest: 1f1142db092b9620ee38bb2294ccbb1c17f807b33bf56da43816af7fe89f301e
     name: parseable
@@ -1187,4 +1211,4 @@ entries:
     urls:
     - https://charts.parseable.io/helm-releases/parseable-operator-0.0.1.tgz
     version: 0.0.1
-generated: "2025-01-12T16:28:41.300757697+05:30"
+generated: "2025-01-19T22:18:38.250170903+05:30"
diff --git a/src/cli.rs b/src/cli.rs
index 25bfc8a3e..dc34123dc 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -289,35 +289,8 @@ pub struct Options {
     )]
     pub ingestor_endpoint: String,
 
-    // OIDC Configuration
-    #[arg(
-        long,
-        long = "oidc-client",
-        env = "P_OIDC_CLIENT_ID",
-        requires = "oidc",
-        group = "oidc",
-        help = "Client id for OIDC provider"
-    )]
-    oidc_client_id: Option<String>,
-
-    #[arg(
-        long,
-        env = "P_OIDC_CLIENT_SECRET",
-        requires = "oidc",
-        group = "oidc",
-        help = "Client secret for OIDC provider"
-    )]
-    oidc_client_secret: Option<String>,
-
-    #[arg(
-        long,
-        env = "P_OIDC_ISSUER",
-        value_parser = validation::url,
-        requires = "oidc",
-        group = "oidc",
-        help = "OIDC provider's host address"
-    )]
-    oidc_issuer: Option<Url>,
+    #[command(flatten)]
+    oidc: Option<OidcConfig>,
 
     // Audit logging
     #[arg(
@@ -346,6 +319,37 @@ pub struct Options {
     pub connector: Option<ConnectorConfig>,
 }
 
+#[derive(Parser, Debug)]
+pub struct OidcConfig {
+    #[arg(
+        long = "oidc-client",
+        name = "oidc-client",
+        env = "P_OIDC_CLIENT_ID",
+        required = false,
+        help = "Client id for OIDC provider"
+    )]
+    pub client_id: String,
+
+    #[arg(
+        long = "oidc-client-secret",
+        name = "oidc-client-secret",
+        env = "P_OIDC_CLIENT_SECRET",
+        required = false,
+        help = "Client secret for OIDC provider"
+    )]
+    pub secret: String,
+
+    #[arg(
+        long = "oidc-issuer",
+        name = "oidc-issuer",
+        env = "P_OIDC_ISSUER",
+        required = false,
+        value_parser = validation::url,
+        help = "OIDC provider's host address"
+    )]
+    pub issuer: Url,
+}
+
 impl Options {
     pub fn local_stream_data_path(&self, stream_name: &str) -> PathBuf {
         self.local_staging_path.join(stream_name)
@@ -360,28 +364,24 @@ impl Options {
     }
 
     pub fn openid(&self) -> Option<OpenidConfig> {
-        match (
-            &self.oidc_client_id,
-            &self.oidc_client_secret,
-            &self.oidc_issuer,
-        ) {
-            (Some(id), Some(secret), Some(issuer)) => {
-                let origin = if let Some(url) = self.domain_address.clone() {
-                    oidc::Origin::Production(url)
-                } else {
-                    oidc::Origin::Local {
-                        socket_addr: self.address.clone(),
-                        https: self.tls_cert_path.is_some() && self.tls_key_path.is_some(),
-                    }
-                };
-                Some(OpenidConfig {
-                    id: id.clone(),
-                    secret: secret.clone(),
-                    issuer: issuer.clone(),
-                    origin,
-                })
+        let OidcConfig {
+            secret,
+            client_id,
+            issuer,
+        } = self.oidc.as_ref()?;
+        let origin = if let Some(url) = self.domain_address.clone() {
+            oidc::Origin::Production(url)
+        } else {
+            oidc::Origin::Local {
+                socket_addr: self.address.clone(),
+                https: self.tls_cert_path.is_some() && self.tls_key_path.is_some(),
             }
-            _ => None,
-        }
+        };
+        Some(OpenidConfig {
+            id: client_id.clone(),
+            secret: secret.clone(),
+            issuer: issuer.clone(),
+            origin,
+        })
     }
 }
diff --git a/src/handlers/http/mod.rs b/src/handlers/http/mod.rs
index 00b7e50e8..471383600 100644
--- a/src/handlers/http/mod.rs
+++ b/src/handlers/http/mod.rs
@@ -56,7 +56,7 @@ pub fn metrics_path() -> String {
 }
 
 pub(crate) fn cross_origin_config() -> Cors {
-    if !CONFIG.options.cors || cfg!(feature = "debug") {
+    if !CONFIG.options.cors || cfg!(debug_assertions) {
         Cors::permissive().block_on_origin_mismatch(false)
     } else {
         Cors::default().block_on_origin_mismatch(false)