diff --git a/charts/kamu-api-server/Chart.yaml b/charts/kamu-api-server/Chart.yaml
index 3ab9748..faf10a0 100644
--- a/charts/kamu-api-server/Chart.yaml
+++ b/charts/kamu-api-server/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kamu-api-server
 description: API server component of the Kamu Compute Node
 type: application
-version: 0.17.1
-appVersion: "0.17.1"
+version: 0.18.0
+appVersion: "0.18.0"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png
 sources:
diff --git a/charts/kamu-api-server/templates/deployment.yaml b/charts/kamu-api-server/templates/deployment.yaml
index 7a407b8..575825c 100644
--- a/charts/kamu-api-server/templates/deployment.yaml
+++ b/charts/kamu-api-server/templates/deployment.yaml
@@ -46,8 +46,10 @@ spec:
           env:
             - name: RUST_BACKTRACE
               value: "1"
-            - name: KAMU_PROTOCOL_SCHEME
-              value: {{ .Values.app.apiExternalHttpScheme | quote }}
+            - name: KAMU_BASE_URL_REST
+              value: {{ .Values.app.apiBaseUrlRest | quote }}
+            - name: KAMU_BASE_URL_FLIGHTSQL
+              value: {{ .Values.app.apiBaseUrlFlightsql | quote }}
             - name: KAMU_AUTH_GITHUB_CLIENT_ID
               value: {{ .Values.app.authGithubClientId | quote }}
             - name: KAMU_AUTH_GITHUB_CLIENT_SECRET
diff --git a/charts/kamu-api-server/values.schema.json b/charts/kamu-api-server/values.schema.json
index 8ebe3e3..d4fbb2b 100644
--- a/charts/kamu-api-server/values.schema.json
+++ b/charts/kamu-api-server/values.schema.json
@@ -7,10 +7,11 @@
       "required": [
         "config",
         "datasetRepositoryUrl",
-        "apiExternalHttpScheme",
         "authGithubClientId",
         "authGithubClientSecret",
-        "jwtSecret"
+        "jwtSecret",
+        "apiBaseUrlRest",
+        "apiBaseUrlFlightsql"
       ],
       "properties": {
         "config": {
@@ -22,8 +23,13 @@
           "type": "string",
           "format": "uri"
         },
-        "apiExternalHttpScheme": {
-          "type": "string"
+        "apiBaseUrlRest": {
+          "type": "string",
+          "format": "uri"
+        },
+        "apiBaseUrlFlightsql": {
+          "type": "string",
+          "format": "uri"
         },
         "authGithubClientId": {
           "type": "string"
@@ -61,4 +67,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/charts/kamu-api-server/values.yaml b/charts/kamu-api-server/values.yaml
index 59f2362..fd5bc29 100644
--- a/charts/kamu-api-server/values.yaml
+++ b/charts/kamu-api-server/values.yaml
@@ -11,8 +11,8 @@ app:
   # Example: "s3://repo.example.com.us-west-2/"
   datasetRepositoryUrl: ""
 
-  # Specify "https" if the application is deployed behind a TLS-terminating reverse proxy, "http" otherwise
-  apiExternalHttpScheme: "https"
+  apiBaseUrlRest: ""
+  apiBaseUrlFlightsql: ""
 
   # TODO: Move into secrets
   authGithubClientId: ""
diff --git a/charts/kamu-web-ui/Chart.yaml b/charts/kamu-web-ui/Chart.yaml
index e190438..2df953f 100644
--- a/charts/kamu-web-ui/Chart.yaml
+++ b/charts/kamu-web-ui/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kamu-web-ui
 description: Web frontend component of the Kamu Compute Node
 type: application
-version: 0.17.0
-appVersion: "0.17.0"
+version: 0.17.1
+appVersion: "0.17.1"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png
 sources: