diff --git a/config/config.exs b/config/config.exs
index ae52259..729dbea 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -45,17 +45,6 @@ config :commanded_ecto_projections,
 
 config :flop, repo: PolicyService.Repo
 
-config :policy_service, :zitadel,
-  issuer: System.get_env("ZITADEL_ISSUER", "https://id.corredorconnect.com"),
-  client_id: System.get_env("ZITADEL_CLIENT_ID"),
-  client_secret: System.get_env("ZITADEL_CLIENT_SECRET"),
-  roles_claim: "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles",
-  required_scopes: [
-    "openid",
-    "profile",
-    "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles"
-  ]
-
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{config_env()}.exs"
diff --git a/config/runtime.exs b/config/runtime.exs
index 3dfe318..0fe0f27 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -41,16 +41,6 @@ config :cors_plug,
   origin: cors_origin
 
 # Zitadel Configuration
-config :policy_service, :zitadel,
-  issuer: System.get_env("ZITADEL_ISSUER", "https://id.corredorconnect.com"),
-  client_id: System.get_env("ZITADEL_CLIENT_ID"),
-  client_secret: System.get_env("ZITADEL_CLIENT_SECRET"),
-  roles_claim: "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles",
-  required_scopes: [
-    "openid",
-    "profile",
-    "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles"
-  ]
 
 # ## Using releases
 #
@@ -108,4 +98,15 @@ if config_env() == :prod do
       port: String.to_integer(System.get_env("PORT", "4000"))
     ],
     secret_key_base: secret_key_base
+
+  config :policy_service, :zitadel,
+    issuer: System.get_env("ZITADEL_ISSUER", "https://id.corredorconect.com"),
+    client_id: System.get_env("ZITADEL_CLIENT_ID"),
+    client_secret: System.get_env("ZITADEL_CLIENT_SECRET"),
+    roles_claim: "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles",
+    required_scopes: [
+      "openid",
+      "profile",
+      "urn:zitadel:iam:org:project:#{System.get_env("ZITADEL_PROJECT_ID")}:roles"
+    ]
 end
diff --git a/lib/policy_service/application.ex b/lib/policy_service/application.ex
index 96a0edd..5a22bc4 100644
--- a/lib/policy_service/application.ex
+++ b/lib/policy_service/application.ex
@@ -3,7 +3,7 @@ defmodule PolicyService.Application do
   # for more information on OTP Applications
   @moduledoc false
 
-  @zitadel Application.fetch_env!(:policy_service, :zitadel)
+  @zitadel Application.get_env(:policy_service, :zitadel)
 
   use Application
 
diff --git a/lib/policy_service_web/router.ex b/lib/policy_service_web/router.ex
index 7e49879..b9e0102 100644
--- a/lib/policy_service_web/router.ex
+++ b/lib/policy_service_web/router.ex
@@ -4,7 +4,7 @@ defmodule PolicyServiceWeb.Router do
   alias PolicyServiceWeb.PolicyController
   alias PolicyServiceWeb.HealthController
 
-  @zitadel Application.fetch_env!(:policy_service, :zitadel)
+  @zitadel Application.get_env(:policy_service, :zitadel)
 
   pipeline :api do
     plug OpenApiSpex.Plug.PutApiSpec, module: PolicyServiceWeb.ApiSpec
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index 13a0bc3..953f420 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -86,7 +86,6 @@ controllers:
               secretKeyRef:
                 name: '{{ include "bjw-s.common.lib.chart.names.fullname" $ }}-apiapp-client-secret'
                 key: clientSecret
-
           ZITADEL_PROJECT_ID:
             valueFrom:
               secretKeyRef: