diff --git a/trino/README.md b/trino/README.md
index 2d1ef0a..2dfc5e0 100644
--- a/trino/README.md
+++ b/trino/README.md
@@ -348,8 +348,8 @@ The `lakekeeper` scope controls whether the JWT token includes the audience clai
 - Web UI OAuth2: User login via browser (Authorization Code Flow)
 - Iceberg REST Catalog OAuth2: Service-to-service authentication (Client Credentials Flow)
 - The `lakekeeper` scope controls the audience claim:
-  - With scope: `scope=openid profile lakekeeper` → JWT includes `"aud": "lakekeeper"`
-  - Without scope: `scope=openid profile` → JWT does not include Lakekeeper audience
+    - With scope: `scope=openid profile lakekeeper` → JWT includes `"aud": "lakekeeper"`
+    - Without scope: `scope=openid profile` → JWT does not include Lakekeeper audience
 - The `lakekeeper` scope is only used for Trino→Lakekeeper communication, not for user authentication
 
 #### Example Usage
diff --git a/trino/justfile b/trino/justfile
index b04dd20..a262b51 100644
--- a/trino/justfile
+++ b/trino/justfile
@@ -16,9 +16,10 @@ export TRINO_WORKER_CPU := env("TRINO_WORKER_CPU", "2")
 export TRINO_WORKER_JVM_HEAP := env("TRINO_WORKER_JVM_HEAP", "4G")
 export TRINO_WORKER_COUNT := env("TRINO_WORKER_COUNT", "2")
 export TRINO_POSTGRES_ENABLED := env("TRINO_POSTGRES_ENABLED", "true")
-export TRINO_MINIO_ENABLED := env("TRINO_MINIO_ENABLED", "")
+export TRINO_ICEBERG_ENABLED := env("TRINO_ICEBERG_ENABLED", "")
 export POSTGRES_NAMESPACE := env("POSTGRES_NAMESPACE", "postgres")
 export MINIO_NAMESPACE := env("MINIO_NAMESPACE", "minio")
+export LAKEKEEPER_NAMESPACE := env("LAKEKEEPER_NAMESPACE", "lakekeeper")
 
 [private]
 default:
@@ -264,12 +265,12 @@ install:
 
     just setup-postgres-catalog
 
-    if [ -z "${TRINO_MINIO_ENABLED}" ]; then
+    if [ -z "${TRINO_ICEBERG_ENABLED}" ]; then
         if gum confirm "Enable Iceberg catalog with Lakekeeper and MinIO?"; then
             just enable-iceberg-catalog
-            TRINO_MINIO_ENABLED="true"
+            TRINO_ICEBERG_ENABLED="true"
         else
-            TRINO_MINIO_ENABLED="false"
+            TRINO_ICEBERG_ENABLED="false"
         fi
     fi
 
@@ -303,13 +304,13 @@ upgrade:
 
     echo "Upgrading Trino..."
 
-    if [ -z "${TRINO_MINIO_ENABLED}" ]; then
+    if [ -z "${TRINO_ICEBERG_ENABLED}" ]; then
         if kubectl get secret trino-minio-secret -n ${TRINO_NAMESPACE} &>/dev/null; then
-            TRINO_MINIO_ENABLED="true"
-            echo "MinIO storage: enabled"
+            TRINO_ICEBERG_ENABLED="true"
+            echo "Iceberg catalog: enabled"
         else
-            TRINO_MINIO_ENABLED="false"
-            echo "MinIO storage: disabled"
+            TRINO_ICEBERG_ENABLED="false"
+            echo "Iceberg catalog: disabled"
         fi
     fi
 
diff --git a/trino/trino-values.gomplate.yaml b/trino/trino-values.gomplate.yaml
index e1321b4..4ddd5f6 100644
--- a/trino/trino-values.gomplate.yaml
+++ b/trino/trino-values.gomplate.yaml
@@ -92,7 +92,7 @@ catalogs:
     connector.name=tpch
     tpch.splits-per-node=4
 
-{{- if .Env.TRINO_MINIO_ENABLED }}
+{{- if .Env.TRINO_ICEBERG_ENABLED }}
   iceberg: |
     connector.name=iceberg
     iceberg.catalog.type=rest
@@ -312,7 +312,7 @@ env:
         name: trino-postgres-secret
         key: password
 {{- end }}
-{{- if .Env.TRINO_MINIO_ENABLED }}
+{{- if .Env.TRINO_ICEBERG_ENABLED }}
   - name: MINIO_ACCESS_KEY
     valueFrom:
       secretKeyRef: