diff --git a/getting-started/README.md b/getting-started/README.md
index 4257e2bad0..32a7376509 100644
--- a/getting-started/README.md
+++ b/getting-started/README.md
@@ -33,12 +33,10 @@ this directory. Each example has detailed instructions.
 - [Spark](spark): An example that uses an in-memory metastore, automatically bootstrapped, with
   Apache Spark and a Jupyter notebook.
 
-- [Trino](trino): An example that uses Trino with Polaris.
-
 - [Telemetry](telemetry): An example that includes Prometheus and Jaeger to collect metrics and
   traces from Apache Polaris. This example automatically creates a `polaris_demo` catalog.
 
 - [Eclipselink](eclipselink): An example that uses an Eclipselink metastore and a Postgres
   database. The realm is bootstrapped with the Polaris Admin tool. This example also creates a
-  `polaris_demo` catalog, and offers the ability to run Spark SQL queries. Finally, it shows how to
+  `polaris_quickstart` catalog, and offers the ability to run Spark SQL and Trino queries. Finally, it shows how to
   attach a debugger to the Polaris server.
diff --git a/getting-started/assets/cloud_providers/deploy-aws.sh b/getting-started/assets/cloud_providers/deploy-aws.sh
new file mode 100644
index 0000000000..c943eb69b8
--- /dev/null
+++ b/getting-started/assets/cloud_providers/deploy-aws.sh
@@ -0,0 +1,78 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+EC2_INSTANCE_ID=$(cat /var/lib/cloud/data/instance-id)
+
+DESCRIBE_INSTANCE=$(aws ec2 describe-instances \
+    --instance-ids $EC2_INSTANCE_ID \
+    --query 'Reservations[*].Instances[*].{Instance:InstanceId,VPC:VpcId,AZ:Placement.AvailabilityZone}' \
+    --output json)
+
+CURRENT_VPC=$(echo $DESCRIBE_INSTANCE | jq -r .[0].[0]."VPC")
+
+CURRENT_REGION=$(echo $DESCRIBE_INSTANCE | jq -r .[0].[0]."AZ" | sed 's/.$//')
+
+ALL_SUBNETS=$(aws ec2 describe-subnets \
+  --region $CURRENT_REGION \
+  --query 'Subnets[*].{SubnetId:SubnetId}' \
+  --output json \
+  | jq -r '[.[]["SubnetId"]] | join(" ")')
+
+RANDOM_SUFFIX=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 8)
+SUBNET_GROUP_NAME="polaris-db-subnet-group-$RANDOM_SUFFIX"
+INSTANCE_NAME="polaris-backend-test-$RANDOM_SUFFIX"
+
+aws rds create-db-subnet-group \
+  --db-subnet-group-name $SUBNET_GROUP_NAME \
+  --db-subnet-group-description "Apache Polaris Quickstart DB Subnet Group" \
+  --subnet-ids $ALL_SUBNETS
+
+DB_INSTANCE_INFO=$(aws rds create-db-instance \
+  --db-instance-identifier $INSTANCE_NAME \
+  --db-instance-class db.t3.micro \
+  --engine postgres \
+  --master-username postgres \
+  --master-user-password postgres \
+  --db-name POLARIS \
+  --db-subnet-group-name $SUBNET_GROUP_NAME \
+  --allocated-storage 10)
+
+DB_ARN=$(echo $DB_INSTANCE_INFO | jq -r '.["DBInstance"]["DBInstanceArn"]')
+
+DESCRIBE_DB=$(aws rds describe-db-instances --db-instance-identifier $DB_ARN)
+
+until echo $DESCRIBE_DB | jq -e '.["DBInstances"][0] | has("Endpoint")';
+do
+  echo "sleeping 10s to wait for Postgres DB provisioning..."
+  sleep 10
+  DESCRIBE_DB=$(aws rds describe-db-instances --db-instance-identifier $DB_ARN)
+done
+
+POSTGRES_ADDR=$(echo $DESCRIBE_DB | jq -r '.["DBInstances"][0]["Endpoint"]' | jq -r '"\(.Address):\(.Port)"')
+
+FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR/{realm}" | sed 's/[&/\]/\\&/g')
+sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+
+./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
+       -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+       -Dquarkus.container-image.tag=postgres-latest \
+       -Dquarkus.container-image.build=true \
+       --no-build-cache
+
+docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
diff --git a/getting-started/assets/cloud_providers/deploy-azure.sh b/getting-started/assets/cloud_providers/deploy-azure.sh
new file mode 100644
index 0000000000..76ee85432b
--- /dev/null
+++ b/getting-started/assets/cloud_providers/deploy-azure.sh
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+CURRENT_REGION=$(curl -H Metadata:true "http://169.254.169.254/metadata/instance?api-version=2021-02-01" | jq -r '.compute.location')
+CURRENT_RESOURCE_GROUP=$(curl -H Metadata:true "http://169.254.169.254/metadata/instance?api-version=2021-02-01" | jq -r '.compute.resourceGroupName')
+RANDOM_SUFFIX=$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 8)
+INSTANCE_NAME="polaris-backend-test-$RANDOM_SUFFIX"
+
+CREATE_DB_RESPONSE=$(az postgres flexible-server create -l $CURRENT_REGION -g $CURRENT_RESOURCE_GROUP -n $INSTANCE_NAME -u postgres -p postgres -y)
+
+az postgres flexible-server db create -g $CURRENT_RESOURCE_GROUP -s $INSTANCE_NAME -d POLARIS
+
+POSTGRES_ADDR=$(echo $CREATE_DB_RESPONSE | jq -r '.host')
+
+FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR:5432/{realm}" | sed 's/[&/\]/\\&/g')
+sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+
+./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
+       -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+       -Dquarkus.container-image.tag=postgres-latest \
+       -Dquarkus.container-image.build=true \
+       --no-build-cache
+
+docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
diff --git a/getting-started/assets/cloud_providers/deploy-gcp.sh b/getting-started/assets/cloud_providers/deploy-gcp.sh
new file mode 100644
index 0000000000..5da93b5585
--- /dev/null
+++ b/getting-started/assets/cloud_providers/deploy-gcp.sh
@@ -0,0 +1,50 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+CURRENT_ZONE=$(curl -H "Metadata-Flavor: Google" "http://169.254.169.254/computeMetadata/v1/instance/zone" | awk -F/ '{print $NF}')
+CURRENT_REGION=$(echo $CURRENT_ZONE | sed 's/-[a-z]$//')
+VM_INSTANCE_NAME=$(curl -H "Metadata-Flavor: Google" "http://169.254.169.254/computeMetadata/v1/instance/name")
+RANDOM_SUFFIX=$(head /dev/urandom | tr -dc 'a-z0-9' | head -c 8)
+DB_INSTANCE_NAME="polaris-backend-test-$RANDOM_SUFFIX"
+
+INSTANCE_IP=$(gcloud compute instances describe $VM_INSTANCE_NAME --zone=$CURRENT_ZONE --format="get(networkInterfaces[0].accessConfigs[0].natIP)")
+
+
+gcloud sql instances create $DB_INSTANCE_NAME \
+  --database-version=POSTGRES_17 \
+  --region=$CURRENT_REGION \
+  --tier=db-perf-optimized-N-4 \
+  --edition=ENTERPRISE_PLUS \
+  --root-password=postgres \
+  --authorized-networks="$INSTANCE_IP/32"
+
+gcloud sql databases create POLARIS --instance=$DB_INSTANCE_NAME
+
+POSTGRES_ADDR=$(gcloud sql instances describe $DB_INSTANCE_NAME --format="get(ipAddresses[0].ipAddress)")
+
+FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR:5432/{realm}" | sed 's/[&/\]/\\&/g')
+sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+
+./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-admin:assemble \
+       -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+       -Dquarkus.container-image.tag=postgres-latest \
+       -Dquarkus.container-image.build=true \
+       --no-build-cache
+
+docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
diff --git a/getting-started/assets/eclipselink/persistence.xml b/getting-started/assets/eclipselink/persistence.xml
index e569a91832..54fb795a39 100644
--- a/getting-started/assets/eclipselink/persistence.xml
+++ b/getting-started/assets/eclipselink/persistence.xml
@@ -32,8 +32,7 @@
     <class>org.apache.polaris.jpa.models.ModelSequenceId</class>
     <shared-cache-mode>NONE</shared-cache-mode>
     <properties>
-      <property name="jakarta.persistence.jdbc.url"
-        value="jdbc:postgresql://postgres:5432/{realm}"/>
+      <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgres:5432/{realm}"/>
       <property name="jakarta.persistence.jdbc.user" value="postgres"/>
       <property name="jakarta.persistence.jdbc.password" value="postgres"/>
       <property name="jakarta.persistence.schema-generation.database.action" value="create"/>
diff --git a/getting-started/assets/polaris/create-catalog.sh b/getting-started/assets/polaris/create-catalog.sh
index f069c66376..b7b8e0f51d 100755
--- a/getting-started/assets/polaris/create-catalog.sh
+++ b/getting-started/assets/polaris/create-catalog.sh
@@ -33,7 +33,7 @@ echo
 echo "Obtained access token: ${token}"
 
 echo
-echo Creating a catalog named polaris_demo...
+echo Creating a catalog named quickstart_catalog...
 
 curl -s -H "Authorization: Bearer ${token}" \
    -H 'Accept: application/json' \
@@ -41,16 +41,16 @@ curl -s -H "Authorization: Bearer ${token}" \
    http://polaris:8181/api/management/v1/catalogs \
    -d '{
      "catalog": {
-       "name": "polaris_demo",
+       "name": "quickstart_catalog",
        "type": "INTERNAL",
        "readOnly": false,
        "properties": {
-         "default-base-location": "file:///tmp/polaris/"
+         "default-base-location": "file:///var/tmp/quickstart_catalog/"
        },
        "storageConfigInfo": {
          "storageType": "FILE",
          "allowedLocations": [
-           "file:///tmp"
+           "file:///var/tmp"
          ]
        }
      }
diff --git a/getting-started/eclipselink/README.md b/getting-started/eclipselink/README.md
index dd6abf7c29..0f41d8da15 100644
--- a/getting-started/eclipselink/README.md
+++ b/getting-started/eclipselink/README.md
@@ -38,7 +38,7 @@ This example requires `jq` to be installed on your machine.
 2. Start the docker compose group by running the following command from the root of the repository:
 
     ```shell
-    docker compose -f getting-started/eclipselink/docker-compose.yml up
+    docker compose -f getting-started/eclipselink/docker-compose-postgres.yml -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up
     ```
 
 3. Using spark-sql: attach to the running spark-sql container:
@@ -71,5 +71,23 @@ This example requires `jq` to be installed on your machine.
 
     ```shell
     curl -v http://127.0.0.1:8181/api/management/v1/principal-roles -H "Authorization: Bearer $POLARIS_TOKEN"
-    curl -v http://127.0.0.1:8181/api/catalog/v1/config?warehouse=polaris_demo -H "Authorization: Bearer $POLARIS_TOKEN"
+    curl -v http://127.0.0.1:8181/api/management/v1/catalogs/polaris_demo -H "Authorization: Bearer $POLARIS_TOKEN"
     ```
+
+6. Using Trino CLI: To access the Trino CLI, run this command:
+```
+docker exec -it eclipselink-trino-1 trino
+```
+Note, `trino-trino-1` is the name of the Docker container.
+
+Example Trino queries:
+```
+SHOW CATALOGS;
+SHOW SCHEMAS FROM iceberg;
+SHOW TABLES FROM iceberg.information_schema;
+DESCRIBE iceberg.information_schema.tables;
+
+CREATE SCHEMA iceberg.tpch;
+CREATE TABLE iceberg.tpch.test_polaris AS SELECT 1 x;
+SELECT * FROM iceberg.tpch.test_polaris;
+```
diff --git a/getting-started/eclipselink/docker-compose-bootstrap-db.yml b/getting-started/eclipselink/docker-compose-bootstrap-db.yml
new file mode 100644
index 0000000000..6e1ab80751
--- /dev/null
+++ b/getting-started/eclipselink/docker-compose-bootstrap-db.yml
@@ -0,0 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+services:
+  polaris-bootstrap:
+    # IMPORTANT: the image MUST contain the Postgres JDBC driver and EclipseLink dependencies, see README for instructions
+    image: apache/polaris-admin-tool:postgres-latest
+    environment:
+      polaris.persistence.type: eclipse-link
+      polaris.persistence.eclipselink.configuration-file: /deployments/config/eclipselink/persistence.xml
+    volumes:
+      - ../assets/eclipselink/:/deployments/config/eclipselink
+    command:
+      - "bootstrap"
+      - "--realm=POLARIS"
+      - "--credential=POLARIS,root,s3cr3t"
\ No newline at end of file
diff --git a/getting-started/eclipselink/docker-compose-postgres.yml b/getting-started/eclipselink/docker-compose-postgres.yml
new file mode 100644
index 0000000000..1e86a8c0ea
--- /dev/null
+++ b/getting-started/eclipselink/docker-compose-postgres.yml
@@ -0,0 +1,45 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+services:
+  postgres:
+    image: postgres:17.4
+    ports:
+      - "5432:5432"
+    # set shared memory limit when using docker-compose
+    shm_size: 128mb
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: POLARIS
+      POSTGRES_INITDB_ARGS: "--encoding UTF8 --data-checksums"
+    volumes:
+      # Bind local conf file to a convenient location in the container
+      - type: bind
+        source: ./postgresql.conf
+        target: /etc/postgresql/postgresql.conf
+    command:
+      - "postgres"
+      - "-c"
+      - "config_file=/etc/postgresql/postgresql.conf"
+    healthcheck:
+      test: "pg_isready -U postgres"
+      interval: 5s
+      timeout: 2s
+      retries: 15
\ No newline at end of file
diff --git a/getting-started/eclipselink/docker-compose.yml b/getting-started/eclipselink/docker-compose.yml
index 252ea53d64..4861675991 100644
--- a/getting-started/eclipselink/docker-compose.yml
+++ b/getting-started/eclipselink/docker-compose.yml
@@ -29,11 +29,6 @@ services:
       - "8182:8182"
       # Optional, allows attaching a debugger to the Polaris JVM
       - "5005:5005"
-    depends_on:
-      polaris-bootstrap:
-        condition: service_completed_successfully
-      postgres:
-        condition: service_healthy
     environment:
       JAVA_DEBUG: "true"
       JAVA_DEBUG_PORT: "*:5005"
@@ -48,22 +43,7 @@ services:
       interval: 2s
       timeout: 10s
       retries: 10
-
-  polaris-bootstrap:
-    # IMPORTANT: the image MUST contain the Postgres JDBC driver and EclipseLink dependencies, see README for instructions
-    image: apache/polaris-admin-tool:postgres-latest
-    depends_on:
-      postgres:
-        condition: service_healthy
-    environment:
-      polaris.persistence.type: eclipse-link
-      polaris.persistence.eclipselink.configuration-file: /deployments/config/eclipselink/persistence.xml
-    volumes:
-      - ../assets/eclipselink/:/deployments/config/eclipselink
-    command:
-      - "bootstrap"
-      - "--realm=POLARIS"
-      - "--credential=POLARIS,root,s3cr3t"
+      start_period: 10s
 
   polaris-setup:
     image: alpine/curl
@@ -74,37 +54,8 @@ services:
       - ../assets/polaris/:/polaris
     entrypoint: '/bin/sh -c "chmod +x /polaris/create-catalog.sh && /polaris/create-catalog.sh"'
 
-  postgres:
-    image: postgres:17.4
-    ports:
-      - "5432:5432"
-    # set shared memory limit when using docker-compose
-    shm_size: 128mb
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: POLARIS
-      POSTGRES_INITDB_ARGS: "--encoding UTF8 --data-checksums"
-    volumes:
-      # Bind local conf file to a convenient location in the container
-      - type: bind
-        source: ./postgresql.conf
-        target: /etc/postgresql/postgresql.conf
-    command:
-      - "postgres"
-      - "-c"
-      - "config_file=/etc/postgresql/postgresql.conf"
-    healthcheck:
-      test: "pg_isready -U postgres"
-      interval: 5s
-      timeout: 2s
-      retries: 15
-
   spark-sql:
     image: apache/spark:3.5.5-java17-python3
-    depends_on:
-      polaris-setup:
-        condition: service_completed_successfully
     stdin_open: true
     tty: true
     ports:
@@ -119,7 +70,7 @@ services:
       --conf, "spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions",
       --conf, "spark.sql.catalog.polaris=org.apache.iceberg.spark.SparkCatalog",
       --conf, "spark.sql.catalog.polaris.type=rest",
-      --conf, "spark.sql.catalog.polaris.warehouse=polaris_demo",
+      --conf, "spark.sql.catalog.polaris.warehouse=quickstart_catalog",
       --conf, "spark.sql.catalog.polaris.uri=http://polaris:8181/api/catalog",
       --conf, "spark.sql.catalog.polaris.credential=root:s3cr3t",
       --conf, "spark.sql.catalog.polaris.scope=PRINCIPAL_ROLE:ALL",
@@ -127,3 +78,12 @@ services:
       --conf, "spark.sql.catalogImplementation=in-memory",
       --conf, "spark.driver.extraJavaOptions=-Divy.cache.dir=/tmp -Divy.home=/tmp"
     ]
+
+  trino:
+    image: trinodb/trino:latest
+    stdin_open: true
+    tty: true
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./trino-config/catalog:/etc/trino/catalog
diff --git a/getting-started/trino/trino-config/catalog/iceberg.properties b/getting-started/eclipselink/trino-config/catalog/iceberg.properties
similarity index 95%
rename from getting-started/trino/trino-config/catalog/iceberg.properties
rename to getting-started/eclipselink/trino-config/catalog/iceberg.properties
index 1cd0a0e7a2..28c3c61faa 100644
--- a/getting-started/trino/trino-config/catalog/iceberg.properties
+++ b/getting-started/eclipselink/trino-config/catalog/iceberg.properties
@@ -23,6 +23,6 @@ iceberg.rest-catalog.uri=http://polaris:8181/api/catalog
 iceberg.rest-catalog.security=OAUTH2
 iceberg.rest-catalog.oauth2.credential=root:s3cr3t
 iceberg.rest-catalog.oauth2.scope=PRINCIPAL_ROLE:ALL
-iceberg.rest-catalog.warehouse=polaris
+iceberg.rest-catalog.warehouse=quickstart_catalog
 # Required to support local filesystem: https://trino.io/docs/current/object-storage.html#configuration
 fs.hadoop.enabled=true
diff --git a/getting-started/trino/README.md b/getting-started/trino/README.md
deleted file mode 100644
index 6b6acf1ef4..0000000000
--- a/getting-started/trino/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
- 
-   http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-# Getting Started with Trino and Apache Polaris
-
-This getting started guide provides a `docker-compose` file to set up [Trino](https://trino.io/) with Apache Polaris. Apache Polaris is configured as an Iceberg REST Catalog in Trino. 
-
-## Build Polaris Image
-Build Polaris Image while Docker is running
-```
-./gradlew \
-    :polaris-quarkus-server:assemble \
-    :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
-    -Dquarkus.container-image.build=true
-```
-
-## Run the `docker-compose` file
-To start the `docker-compose` file, run this command from the repo's root directory:
-```
-docker-compose -f getting-started/trino/docker-compose.yml up 
-```
-
-## Run Trino queries via Trino CLI
-To access the Trino CLI, run this command:
-```
-docker exec -it trino-trino-1 trino
-```
-Note, `trino-trino-1` is the name of the Docker container.
-
-Example Trino queries:
-```
-SHOW CATALOGS;
-SHOW SCHEMAS FROM iceberg;
-SHOW TABLES FROM iceberg.information_schema;
-DESCRIBE iceberg.information_schema.tables;
-
-CREATE SCHEMA iceberg.tpch;
-CREATE TABLE iceberg.tpch.test_polaris AS SELECT 1 x;
-SELECT * FROM iceberg.tpch.test_polaris;
-```
-
-## Note
-The Polaris in this example is started with realm `default-realm` and root credentials: `root:s3cr3t`.
-
-An example catalog is created in Apache Polaris using the `curl` command. See `create-polaris-catalog.sh` for details.
diff --git a/getting-started/trino/create-polaris-catalog.sh b/getting-started/trino/create-polaris-catalog.sh
deleted file mode 100644
index e08e1c5f88..0000000000
--- a/getting-started/trino/create-polaris-catalog.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-if ! output=$(curl -X POST -H "Polaris-Realm: default-realm" "http://polaris:8181/api/catalog/v1/oauth/tokens" \
-  -d "grant_type=client_credentials" \
-  -d "client_id=root" \
-  -d "client_secret=s3cr3t" \
-  -d "scope=PRINCIPAL_ROLE:ALL"); then
-  logred "Error: Failed to retrieve bearer token"
-  exit 1
-fi
-
-token=$(echo "$output" | awk -F\" '{print $4}')
-
-if [ "$token" == "unauthorized_client" ]; then
-  logred "Error: Failed to retrieve bearer token"
-  exit 1
-fi
-
-PRINCIPAL_TOKEN=$token
-
-# Use local filesystem by default
-curl -i -X POST -H "Authorization: Bearer $PRINCIPAL_TOKEN" -H 'Accept: application/json' -H 'Content-Type: application/json' \
-  http://polaris:8181/api/management/v1/catalogs \
-  -d '{
-        "catalog": {
-          "name": "polaris",
-          "type": "INTERNAL",
-          "readOnly": false,
-          "properties": {
-            "default-base-location": "file:///tmp/polaris/"
-          },
-          "storageConfigInfo": {
-            "storageType": "FILE",
-            "allowedLocations": [
-              "file:///tmp"
-            ]
-          }
-        }
-      }'
-
-# Add TABLE_WRITE_DATA to the catalog's catalog_admin role since by default it can only manage access and metadata
-curl -i -X PUT -H "Authorization: Bearer $PRINCIPAL_TOKEN" -H 'Accept: application/json' -H 'Content-Type: application/json' \
-  http://polaris:8181/api/management/v1/catalogs/polaris/catalog-roles/catalog_admin/grants \
-  -d '{"type": "catalog", "privilege": "TABLE_WRITE_DATA"}'
diff --git a/getting-started/trino/docker-compose.yml b/getting-started/trino/docker-compose.yml
deleted file mode 100644
index fd438f0094..0000000000
--- a/getting-started/trino/docker-compose.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-services:
-  polaris:
-    image: apache/polaris:latest
-    ports:
-      - "8181:8181"
-      - "8182"
-    environment:
-      AWS_REGION: us-west-2
-      AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
-      AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
-      GOOGLE_APPLICATION_CREDENTIALS: $GOOGLE_APPLICATION_CREDENTIALS
-      AZURE_TENANT_ID: $AZURE_TENANT_ID
-      AZURE_CLIENT_ID: $AZURE_CLIENT_ID
-      AZURE_CLIENT_SECRET: $AZURE_CLIENT_SECRET
-      POLARIS_BOOTSTRAP_CREDENTIALS: default-realm,root,s3cr3t
-      polaris.realm-context.realms: default-realm
-      quarkus.otel.sdk.disabled: "true"
-
-    healthcheck:
-      test: ["CMD", "curl", "http://localhost:8182/healthcheck"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-
-  create-polaris-catalog:
-    image: curlimages/curl
-    depends_on:
-      polaris:
-        condition: service_healthy
-    volumes:
-      - ./create-polaris-catalog.sh:/create-polaris-catalog.sh
-    command: ["/bin/sh", "/create-polaris-catalog.sh"]
-
-  trino:
-    image: trinodb/trino:latest
-    ports:
-      - "8080:8080"
-    volumes:
-      - ./trino-config/catalog:/etc/trino/catalog
diff --git a/site/content/in-dev/unreleased/_index.md b/site/content/in-dev/unreleased/_index.md
index 19100e7123..b4e147ecda 100644
--- a/site/content/in-dev/unreleased/_index.md
+++ b/site/content/in-dev/unreleased/_index.md
@@ -37,7 +37,7 @@ These pages refer to the current state of the main branch, which is still under
 Functionalities can be changed, removed or added without prior notice.
 {{< /alert >}}
 
-Check out the [Quick Start]({{% ref "quickstart" %}}) page to get started.
+Check out the [Quickstart]({{% ref "getting-started" %}}) page to get started.
 
 <!--
 Testing the `releaseVersion` shortcode here: version is: {{< releaseVersion >}}
diff --git a/site/content/in-dev/unreleased/getting-started/_index.md b/site/content/in-dev/unreleased/getting-started/_index.md
new file mode 100644
index 0000000000..d4f13e6f63
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/_index.md
@@ -0,0 +1,25 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+title: 'Getting Started'
+type: docs
+weight: 101
+build:
+  render: never
+---
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/deploying-polaris/_index.md b/site/content/in-dev/unreleased/getting-started/deploying-polaris/_index.md
new file mode 100644
index 0000000000..32fd5dafd6
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/deploying-polaris/_index.md
@@ -0,0 +1,27 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Deploying Polaris on Cloud Providers
+type: docs
+weight: 300
+---
+
+We will now demonstrate how to deploy Polaris locally, as well as with all supported Cloud Providers: Amazon Web Services (AWS), Azure, and Google Cloud Platform (GCP).
+
+Locally, Polaris can be deployed using both Docker and local build. On the cloud, this tutorial will deploy Polaris using Docker only - but local builds can also be executed.
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-aws.md b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-aws.md
new file mode 100644
index 0000000000..266cea1c0d
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-aws.md
@@ -0,0 +1,54 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Deploying Polaris on Amazon Web Services (AWS)
+type: docs
+weight: 310
+---
+
+Build and launch Polaris using the AWS Startup Script at the location provided in the command below. This script will start an [Amazon RDS for PostgreSQL](https://aws.amazon.com/rds/postgresql/) instance, which will be used as the backend Postgres instance holding all Polaris data.
+Additionally, Polaris will be bootstrapped to use this database and Docker containers will be spun up for Spark SQL and Trino.
+
+The requirements to run the script below are:
+* There must be at least two subnets created in the VPC and region in which your EC2 instance reside. The span of subnets MUST include at least 2 availability zones (AZs) within the same region. 
+* The AWS identity that you will use to run this script must have the following AWS permissions:
+  * "ec2:DescribeInstances"
+  * "rds:CreateDBInstance"
+  * "rds:DescribeDBInstances"
+  * "rds:CreateDBSubnetGroup"
+
+```shell
+chmod +x getting-started/assets/cloud_providers/deploy-aws.sh
+./getting-started/assets/cloud_providers/deploy-aws.sh
+```
+
+Also, set the following static credentials for interacting with the Polaris server in the following exercises: 
+
+```shell
+export CLIENT_ID=root
+export CLIENT_SECRET=s3cr3t
+```
+
+To shut down the Polaris server, run the following commands:
+
+```shell
+docker compose -f getting-started/eclipselink/docker-compose.yml down
+```
+
+To deploy Polaris in a production setting, please review further recommendations at the [Configuring Polaris for Production]({{% relref "../../configuring-polaris-for-production" %}}) page.
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-azure.md b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-azure.md
new file mode 100644
index 0000000000..6acaac7d0e
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-azure.md
@@ -0,0 +1,50 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Deploying Polaris on Azure
+type: docs
+weight: 320
+---
+
+Build and launch Polaris using the AWS Startup Script at the location provided in the command below. This script will start an [Azure Database for PostgreSQL - Flexible Server](https://learn.microsoft.com/en-us/azure/postgresql/flexible-server/overview) instance, which will be used as the backend Postgres instance holding all Polaris data.
+Additionally, Polaris will be bootstrapped to use this database and Docker containers will be spun up for Spark SQL and Trino.
+
+The requirements to run the script below are:
+* Install the AZ CLI, if it is not already installed on the Azure VM. Instructions to download the AZ CLI can be found [here](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli).
+* You must be logged into the AZ CLI. Please run `az account show` to ensure that you are logged in prior to running this script.
+
+```shell
+chmod +x getting-started/assets/cloud_providers/deploy-azure.sh
+./getting-started/assets/cloud_providers/deploy-azure.sh
+```
+
+Also, set the following static credentials for interacting with the Polaris server in the following exercises: 
+
+```shell
+export CLIENT_ID=root
+export CLIENT_SECRET=s3cr3t
+```
+
+To shut down the Polaris server, run the following commands:
+
+```shell
+docker compose -f getting-started/eclipselink/docker-compose.yml down
+```
+
+To deploy Polaris in a production setting, please review further recommendations at the [Configuring Polaris for Production]({{% relref "../../configuring-polaris-for-production" %}}) page.
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-gcp.md b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-gcp.md
new file mode 100644
index 0000000000..7c6e9fbfc0
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/deploying-polaris/quickstart-deploy-gcp.md
@@ -0,0 +1,50 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Deploying Polaris on Google Cloud Platform (GCP)
+type: docs
+weight: 330
+---
+
+Build and launch Polaris using the AWS Startup Script at the location provided in the command below. This script will start a [Cloud SQL for PostgreSQL](https://cloud.google.com/sql/docs/postgres) instance, which will be used as the backend Postgres instance holding all Polaris data.
+Additionally, Polaris will be bootstrapped to use this database and Docker containers will be spun up for Spark SQL and Trino.
+
+The requirements to run the script below are:
+* Install the `gcloud` CLI, if it is not already installed on the GCP VM. Instructions to download the `gcloud` CLI can be found [here](https://cloud.google.com/sdk/docs/install).
+* Ensure the `Cloud SQL Admin API` has been enabled in your project and that your VM's Principal has access to the correct role: `roles/cloudsql.admin`.
+
+```shell
+chmod +x getting-started/assets/cloud_providers/deploy-gcp.sh
+./getting-started/assets/cloud_providers/deploy-gcp.sh
+```
+
+Also, set the following static credentials for interacting with the Polaris server in the following exercises: 
+
+```shell
+export CLIENT_ID=root
+export CLIENT_SECRET=s3cr3t
+```
+
+To shut down the Polaris server, run the following commands:
+
+```shell
+docker compose -f getting-started/eclipselink/docker-compose.yml down
+```
+
+To deploy Polaris in a production setting, please review further recommendations at the [Configuring Polaris for Production]({{% relref "../../configuring-polaris-for-production" %}}) page.
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/install-dependencies.md b/site/content/in-dev/unreleased/getting-started/install-dependencies.md
new file mode 100644
index 0000000000..7341118868
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/install-dependencies.md
@@ -0,0 +1,118 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Installing Dependencies
+type: docs
+weight: 100
+---
+
+This guide serves as an introduction to several key entities that can be managed with Apache Polaris (Incubating), describes how to build and deploy Polaris locally, and finally includes examples of how to use Polaris with Apache Spark&trade;.
+
+# Prerequisites
+
+This guide covers building Polaris, deploying it locally or via [Docker](https://www.docker.com/), and interacting with it using the command-line interface and [Apache Spark](https://spark.apache.org/). Before proceeding with Polaris, be sure to satisfy the relevant prerequisites listed here.
+
+## Git
+
+To get the latest Polaris code, you'll need to clone the repository using [git](https://git-scm.com/). You can install git using [homebrew](https://brew.sh/) on MacOS:
+
+```shell
+brew install git
+```
+
+Please follow instructions from the [Git Documentation](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) for instructions on installing Git on other platforms.
+
+Then, use git to clone the Polaris repo:
+
+```shell
+cd ~
+git clone https://github.com/apache/polaris.git
+```
+
+## Docker
+
+It is recommended to deploy Polaris inside [Docker](https://www.docker.com/) for the Quickstart workflow. Instructions for deploying the Quickstart workflow on the supported Cloud Providers (AWS, Azure, GCP) will be provided only with Docker. However, non-Docker deployment instructions for local deployments can also be followed on Cloud Providers.
+
+Instructions to install Docker can be found on the [Docker website](https://docs.docker.com/engine/install/). Ensure that Docker and the Docker Compose plugin are both installed.
+
+### Docker on MacOS
+Docker can be installed using [homebrew](https://brew.sh/):
+
+```shell
+brew install --cask docker
+```
+
+There could be a [Docker permission issues](https://github.com/apache/polaris/pull/971) related to seccomp configuration. To resolve these issues, set the `seccomp` profile to "unconfined" when running a container. For example:
+
+```shell
+docker run --security-opt seccomp=unconfined apache/polaris:latest
+```
+
+Note: Setting the seccomp profile to "unconfined" disables the default system call filtering, which may pose security risks. Use this configuration with caution, especially in production environments.
+
+### Docker on Amazon Linux
+Docker can be installed using a modification to the CentOS instructions. For example:
+
+```shell
+sudo dnf update -y
+# Remove old version
+sudo dnf remove -y docker docker-client docker-client-latest docker-common docker-latest docker-latest-logrotate docker-logrotate docker-engine
+# Install dnf plugin
+sudo dnf -y install dnf-plugins-core
+# Add CentOS repository
+sudo dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+# Adjust release server version in the path as it will not match with Amazon Linux 2023
+sudo sed -i 's/$releasever/9/g' /etc/yum.repos.d/docker-ce.repo
+# Install as usual
+sudo dnf -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+```
+
+### Confirm Docker Installation
+
+Once installed, make sure that both Docker and the Docker Compose plugin are installed:
+
+```shell
+docker version
+docker compose version
+```
+
+Also make sure Docker is running and is able to run a sample Docker container:
+
+```shell
+docker run hello-world
+```
+
+## Java
+
+If you plan to build Polaris from source yourself or using this tutorial's instructions on a Cloud Provider, you will need to satisfy a few prerequisites first.
+
+Polaris is built using [gradle](https://gradle.org/) and is compatible with Java 21. We recommend the use of [jenv](https://www.jenv.be/) to manage multiple Java versions. For example, to install Java 21 via [homebrew](https://brew.sh/) and configure it with jenv:
+
+```shell
+cd ~/polaris
+brew install openjdk@21 jenv
+jenv add $(brew --prefix openjdk@21)
+jenv local 21
+```
+
+Ensure that `java --version` and `javac` both return non-zero responses.
+
+## jq
+
+Most Polaris Quickstart scripts require `jq`. Follow the instructions from the [jq](https://jqlang.org/download/) website to download this tool.
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/quickstart.md b/site/content/in-dev/unreleased/getting-started/quickstart.md
new file mode 100644
index 0000000000..660ed5ae10
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/quickstart.md
@@ -0,0 +1,123 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Quickstart
+type: docs
+weight: 200
+---
+
+Polaris can be deployed via a docker image or as a standalone process. Before starting, be sure that you've satisfied the relevant prerequisites detailed in the previous page.
+
+## Docker Image
+
+To start using Polaris in Docker, build and launch Polaris, which is packaged with a Postgres instance, Apache Spark, and Trino. 
+
+```shell
+cd ~/polaris
+./gradlew \
+  :polaris-quarkus-server:assemble \
+  :polaris-quarkus-server:quarkusAppPartsBuild \
+  :polaris-quarkus-admin:assemble --rerun \
+  -PeclipseLinkDeps=org.postgresql:postgresql:42.7.4 \
+  -Dquarkus.container-image.tag=postgres-latest \
+  -Dquarkus.container-image.build=true
+docker compose -f getting-started/eclipselink/docker-compose.yml up
+```
+
+You should see output for some time as Polaris, Spark, and Trino build and start up. Eventually, you won’t see any more logs and see some logs relating to Spark, resembling the following:
+
+```
+spark-sql-1          | Spark Web UI available at http://8bc4de8ed854:4040
+spark-sql-1          | Spark master: local[*], Application Id: local-1743745174604
+spark-sql-1          | 25/04/04 05:39:38 WARN SparkSQLCLIDriver: WARNING: Directory for Hive history file: /home/spark does not exist.   History will not be available during this session.
+spark-sql-1          | 25/04/04 05:39:39 WARN RESTSessionCatalog: Iceberg REST client is missing the OAuth2 server URI configuration and defaults to http://polaris:8181/api/catalogv1/oauth/tokens. This automatic fallback will be removed in a future Iceberg release.It is recommended to configure the OAuth2 endpoint using the 'oauth2-server-uri' property to be prepared. This warning will disappear if the OAuth2 endpoint is explicitly configured. See https://github.com/apache/iceberg/issues/10537
+```
+
+Finally, set the following static credentials for interacting with the Polaris server in the following exercises:
+
+```shell
+export CLIENT_ID=root
+export CLIENT_SECRET=s3cr3t
+```
+
+The Docker image pre-configures a sample catalog called `polaris_demo` that uses a local file system.
+
+## Running Polaris as a Standalone Process
+
+You can also start Polaris through Gradle (packaged within the Polaris repository):
+
+```shell
+cd ~/polaris
+# Build the server
+./gradlew clean :polaris-quarkus-server:assemble :polaris-quarkus-server:quarkusAppPartsBuild --rerun
+# Start the server
+./gradlew run
+```
+
+You should see output for some time as Polaris builds and starts up. Eventually, you won’t see any more logs and should see messages that resemble the following:
+
+```
+realm: <realm> root principal credentials: <client-id>:<client-secret>
+INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) polaris-quarkus-service <version> on JVM (powered by Quarkus <version>) started in 2.656s. Listening on: http://localhost:8181. Management interface listening on http://0.0.0.0:8182.
+INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Profile prod activated. Live Coding activated.
+INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Installed features: [...]
+```
+
+At this point, Polaris is running.
+
+When using a Gradle-launched Polaris instance in this tutorial, we'll launch an instance of Polaris that stores entities only in-memory. This means that any entities that you define will be destroyed when Polaris is shut down. It also means that Polaris will automatically bootstrap itself with root credentials. For more information on how to configure Polaris for production usage, see the [docs]({{% relref "../configuring-polaris-for-production" %}}).
+
+When Polaris is launched using an in-memory metastore, the root principal credentials can be found
+in stdout on initial startup. Look for a line that resembles the following:
+
+```
+realm: <realm> root principal credentials: <client-id>:<client-secret>
+```
+
+Be sure to take note of these credentials as we'll be using them below. You can also set these credentials as environment variables for use with the Polaris CLI:
+
+```shell
+export CLIENT_ID=<client-id>
+export CLIENT_SECRET=<client-secret>
+```
+
+### Installing Apache Spark and Trino Locally for Testing
+
+#### Apache Spark
+
+If you want to connect to Polaris with [Apache Spark](https://spark.apache.org/), you'll need to start by cloning Spark. As in the [prerequisites]({{% ref "install-dependencies#git" %}}), make sure [git](https://git-scm.com/) is installed first.
+
+Then, clone Spark and check out a versioned branch. This guide uses [Spark 3.5](https://spark.apache.org/releases/spark-release-3-5-0.html).
+
+```shell
+cd ~
+git clone https://github.com/apache/spark.git
+cd ~/spark
+git checkout branch-3.5
+```
+
+#### Trino
+If you want to connect to Polaris with [Trino](https://trino.io/), it is recommended to set up a test instance of Trino using Docker. As in the [prerequisites]({{% ref "install-dependencies#docker" %}}), make sure [Docker](https://www.docker.com/) is installed first
+
+```shell
+docker run --name trino -d -p 8080:8080 trinodb/trino
+```
+
+## Next Steps
+Congrats, you now have a running instance of Polaris! For further information regarding how to use Polaris, check out the [Using Polaris]({{% ref "using-polaris" %}}) page. 
\ No newline at end of file
diff --git a/site/content/in-dev/unreleased/getting-started/using-polaris.md b/site/content/in-dev/unreleased/getting-started/using-polaris.md
new file mode 100644
index 0000000000..14524e495a
--- /dev/null
+++ b/site/content/in-dev/unreleased/getting-started/using-polaris.md
@@ -0,0 +1,303 @@
+---
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+Title: Using Polaris
+type: docs
+weight: 400
+---
+
+## Defining a Catalog
+
+In Polaris, the [catalog]({{% relref "../entities#catalog" %}}) is the top-level entity that objects like [tables]({{% relref "../entities#table" %}}) and [views]({{% relref "../entities#view" %}}) are organized under. With a Polaris service running, you can create a catalog like so:
+
+```shell
+cd ~/polaris
+
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  catalogs \
+  create \
+  --storage-type s3 \
+  --default-base-location ${DEFAULT_BASE_LOCATION} \
+  --role-arn ${ROLE_ARN} \
+  quickstart_catalog
+```
+
+This will create a new catalog called **quickstart_catalog**. If you are using one of the Getting Started locally-built Docker images, we have already created a catalog named `quickstart_catalog` for you.
+
+The `DEFAULT_BASE_LOCATION` you provide will be the default location that objects in this catalog should be stored in, and the `ROLE_ARN` you provide should be a [Role ARN](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference-arns.html) with access to read and write data in that location. These credentials will be provided to engines reading data from the catalog once they have authenticated with Polaris using credentials that have access to those resources.
+
+If you’re using a storage type other than S3, such as Azure, you’ll provide a different type of credential than a Role ARN. For more details on supported storage types, see the [docs]({{% relref "../entities#storage-type" %}}).
+
+Additionally, if Polaris is running somewhere other than `localhost:8181`, you can specify the correct hostname and port by providing `--host` and `--port` flags. For the full set of options supported by the CLI, please refer to the [docs]({{% relref "../command-line-interface" %}}).
+
+
+### Creating a Principal and Assigning it Privileges
+
+With a catalog created, we can create a [principal]({{% relref "../entities#principal" %}}) that has access to manage that catalog. For details on how to configure the Polaris CLI, see [the section above](#defining-a-catalog) or refer to the [docs]({{% relref "../command-line-interface" %}}).
+
+```shell
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  principals \
+  create \
+  quickstart_user
+
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  principal-roles \
+  create \
+  quickstart_user_role
+
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  catalog-roles \
+  create \
+  --catalog quickstart_catalog \
+  quickstart_catalog_role
+```
+
+Be sure to provide the necessary credentials, hostname, and port as before.
+
+When the `principals create` command completes successfully, it will return the credentials for this new principal. Be sure to note these down for later. For example:
+
+```
+./polaris ... principals create example
+{"clientId": "XXXX", "clientSecret": "YYYY"}
+```
+
+Now, we grant the principal the [principal role]({{% relref "../entities#principal-role" %}}) we created, and grant the [catalog role]({{% relref "../entities#catalog-role" %}}) the principal role we created. For more information on these entities, please refer to the linked documentation.
+
+```shell
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  principal-roles \
+  grant \
+  --principal quickstart_user \
+  quickstart_user_role
+
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  catalog-roles \
+  grant \
+  --catalog quickstart_catalog \
+  --principal-role quickstart_user_role \
+  quickstart_catalog_role
+```
+
+Now, we’ve linked our principal to the catalog via roles like so:
+
+![Principal to Catalog](/img/quickstart/privilege-illustration-1.png "Principal to Catalog")
+
+In order to give this principal the ability to interact with the catalog, we must assign some [privileges]({{% relref "../entities#privilege" %}}). For the time being, we will give this principal the ability to fully manage content in our new catalog. We can do this with the CLI like so:
+
+```shell
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  privileges \
+  catalog \
+  grant \
+  --catalog quickstart_catalog \
+  --catalog-role quickstart_catalog_role \
+  CATALOG_MANAGE_CONTENT
+```
+
+This grants the [catalog privileges]({{% relref "../entities#privilege" %}}) `CATALOG_MANAGE_CONTENT` to our catalog role, linking everything together like so:
+
+![Principal to Catalog with Catalog Role](/img/quickstart/privilege-illustration-2.png "Principal to Catalog with Catalog Role")
+
+`CATALOG_MANAGE_CONTENT` has create/list/read/write privileges on all entities within the catalog. The same privilege could be granted to a namespace, in which case the principal could create/list/read/write any entity under that namespace.
+
+## Using Iceberg & Polaris
+
+At this point, we’ve created a principal and granted it the ability to manage a catalog. We can now use an external engine to assume that principal, access our catalog, and store data in that catalog using [Apache Iceberg](https://iceberg.apache.org/). Polaris is compatible with any [Apache Iceberg](https://iceberg.apache.org/) client that supports the REST API. Depending on the client you plan to use, refer to the respective examples below.
+
+### Connecting with Spark
+
+#### Using a Local Build of Spark
+
+To use a Polaris-managed catalog in [Apache Spark](https://spark.apache.org/), we can configure Spark to use the Iceberg catalog REST API.
+
+This guide uses [Apache Spark 3.5](https://spark.apache.org/releases/spark-release-3-5-0.html), but be sure to find [the appropriate iceberg-spark package for your Spark version](https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark). From a local Spark clone on the `branch-3.5` branch we can run the following:
+
+_Note: the credentials provided here are those for our principal, not the root credentials._
+
+```shell
+bin/spark-sql \
+--packages org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.7.1,org.apache.hadoop:hadoop-aws:3.4.0 \
+--conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions \
+--conf spark.sql.catalog.quickstart_catalog.warehouse=quickstart_catalog \
+--conf spark.sql.catalog.quickstart_catalog.header.X-Iceberg-Access-Delegation=vended-credentials \
+--conf spark.sql.catalog.quickstart_catalog=org.apache.iceberg.spark.SparkCatalog \
+--conf spark.sql.catalog.quickstart_catalog.catalog-impl=org.apache.iceberg.rest.RESTCatalog \
+--conf spark.sql.catalog.quickstart_catalog.uri=http://localhost:8181/api/catalog \
+--conf spark.sql.catalog.quickstart_catalog.credential='XXXX:YYYY' \
+--conf spark.sql.catalog.quickstart_catalog.scope='PRINCIPAL_ROLE:ALL' \
+--conf spark.sql.catalog.quickstart_catalog.token-refresh-enabled=true \
+--conf spark.sql.catalog.quickstart_catalog.client.region=us-west-2
+```
+
+
+Replace `XXXX` and `YYYY` with the client ID and client secret generated when you created the `quickstart_user` principal.
+
+Similar to the CLI commands above, this configures Spark to use the Polaris running at `localhost:8181`. If your Polaris server is running elsewhere, but sure to update the configuration appropriately.
+
+Finally, note that we include the `hadoop-aws` package here. If your table is using a different filesystem, be sure to include the appropriate dependency.
+
+#### Using Spark SQL from a Docker container
+
+Replace the credentials used in the Docker container using the following code:
+
+```shell
+USER_CLIENT_ID="XXXX"
+USER_CLIENT_SECRET="YYYY"
+sed -i "s/^\(.*spark\.sql\.catalog\.polaris\.credential=\).*/\1${USER_CLIENT_ID}:${USER_CLIENT_SECRET}\",/" getting-started/eclipselink/docker-compose.yml
+docker compose -f getting-started/eclipselink/docker-compose.yml up -d
+```
+
+Attach to the running spark-sql container:
+
+```shell
+docker attach $(docker ps -q --filter name=spark-sql)
+```
+
+#### Sample Commands
+
+Once the Spark session starts, we can create a namespace and table within the catalog:
+
+```sql
+USE polaris;
+CREATE NAMESPACE IF NOT EXISTS quickstart_namespace;
+CREATE NAMESPACE IF NOT EXISTS quickstart_namespace.schema;
+USE NAMESPACE quickstart_namespace.schema;
+CREATE TABLE IF NOT EXISTS quickstart_table (id BIGINT, data STRING) USING ICEBERG;
+```
+
+We can now use this table like any other:
+
+```
+INSERT INTO quickstart_table VALUES (1, 'some data');
+SELECT * FROM quickstart_table;
+. . .
++---+---------+
+|id |data     |
++---+---------+
+|1  |some data|
++---+---------+
+```
+
+If at any time access is revoked...
+
+```shell
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  privileges \
+  catalog \
+  revoke \
+  --catalog quickstart_catalog \
+  --catalog-role quickstart_catalog_role \
+  CATALOG_MANAGE_CONTENT
+```
+
+Spark will lose access to the table:
+
+```
+INSERT INTO quickstart_table VALUES (1, 'some data');
+
+org.apache.iceberg.exceptions.ForbiddenException: Forbidden: Principal 'quickstart_user' with activated PrincipalRoles '[]' and activated grants via '[quickstart_catalog_role, quickstart_user_role]' is not authorized for op LOAD_TABLE_WITH_READ_DELEGATION
+```
+
+### Connecting with Trino
+
+Replace the credentials used in the Docker container using the following code:
+
+```shell
+USER_CLIENT_ID="XXXX"
+USER_CLIENT_SECRET="YYYY"
+sed -i "s/^\(iceberg\.rest-catalog\.oauth2\.credential=\).*/\1${USER_CLIENT_ID}:${USER_CLIENT_SECRET}/" getting-started/eclipselink/trino-config/catalog/iceberg.properties
+docker compose -f getting-started/eclipselink/docker-compose.yml down trino
+docker compose -f getting-started/eclipselink/docker-compose.yml up -d
+```
+
+Attach to the running Trino container:
+
+```shell
+docker exec -it eclipselink-trino-1 trino
+```
+
+You may not see Trino's prompt immediately, type ENTER to see it. A few commands that you can try:
+
+```sql
+SHOW CATALOGS;
+SHOW SCHEMAS FROM iceberg;
+CREATE SCHEMA iceberg.quickstart_schema;
+CREATE TABLE iceberg.quickstart_schema.quickstart_table AS SELECT 1 x;
+SELECT * FROM iceberg.quickstart_schema.quickstart_table;
+```
+
+If at any time access is revoked...
+
+```shell
+./polaris \
+  --client-id ${CLIENT_ID} \
+  --client-secret ${CLIENT_SECRET} \
+  privileges \
+  catalog \
+  revoke \
+  --catalog quickstart_catalog \
+  --catalog-role quickstart_catalog_role \
+  CATALOG_MANAGE_CONTENT
+```
+
+Trino will lose access to the table:
+
+```sql
+SELECT * FROM iceberg.quickstart_schema.quickstart_table;
+
+org.apache.iceberg.exceptions.ForbiddenException: Forbidden: Principal 'quickstart_user' with activated PrincipalRoles '[]' and activated grants via '[quickstart_catalog_role, quickstart_user_role]' is not authorized for op LOAD_TABLE_WITH_READ_DELEGATION
+```
+
+### Connecting Using REST APIs
+
+To access Polaris from the host machine, first request an access token:
+
+```shell
+export POLARIS_TOKEN=$(curl -s http://polaris:8181/api/catalog/v1/oauth/tokens \
+   --resolve polaris:8181:127.0.0.1 \
+   --user ${CLIENT_ID}:${CLIENT_SECRET} \
+   -d 'grant_type=client_credentials' \
+   -d 'scope=PRINCIPAL_ROLE:ALL' | jq -r .access_token)
+```
+
+Then, use the access token in the Authorization header when accessing Polaris:
+
+```shell
+curl -v http://127.0.0.1:8181/api/management/v1/principal-roles -H "Authorization: Bearer $POLARIS_TOKEN"
+curl -v http://127.0.0.1:8181/api/management/v1/catalogs/quickstart_catalog -H "Authorization: Bearer $POLARIS_TOKEN"
+```
+
+
diff --git a/site/content/in-dev/unreleased/quickstart.md b/site/content/in-dev/unreleased/quickstart.md
deleted file mode 100644
index 7561ea784a..0000000000
--- a/site/content/in-dev/unreleased/quickstart.md
+++ /dev/null
@@ -1,356 +0,0 @@
----
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-Title: Quick Start
-type: docs
-weight: 100
----
-
-This guide serves as a introduction to several key entities that can be managed with Apache Polaris (Incubating), describes how to build and deploy Polaris locally, and finally includes examples of how to use Polaris with Apache Spark&trade;.
-
-## Prerequisites
-
-This guide covers building Polaris, deploying it locally or via [Docker](https://www.docker.com/), and interacting with it using the command-line interface and [Apache Spark](https://spark.apache.org/). Before proceeding with Polaris, be sure to satisfy the relevant prerequisites listed here.
-
-### Building and Deploying Polaris
-
-To get the latest Polaris code, you'll need to clone the repository using [git](https://git-scm.com/). You can install git using [homebrew](https://brew.sh/):
-
-```shell
-brew install git
-```
-
-Then, use git to clone the Polaris repo:
-
-```shell
-cd ~
-git clone https://github.com/apache/polaris.git
-```
-
-#### With Docker
-
-If you plan to deploy Polaris inside [Docker](https://www.docker.com/), you'll need to install docker itself. For example, this can be done using [homebrew](https://brew.sh/):
-
-```shell
-brew install --cask docker
-```
-
-There could be a [Docker permission issues](https://github.com/apache/polaris/pull/971) related to seccomp configuration. To resolve these issues, set the `seccomp` profile to "unconfined" when running a container. For example:
-
-```shell
-docker run --security-opt seccomp=unconfined apache/polaris:latest
-```
-
-Note: Setting the seccomp profile to "unconfined" disables the default system call filtering, which may pose security risks. Use this configuration with caution, especially in production environments.
-
-Once installed, make sure Docker is running.
-
-#### From Source
-
-If you plan to build Polaris from source yourself, you will need to satisfy a few prerequisites first.
-
-Polaris is built using [gradle](https://gradle.org/) and is compatible with Java 21. We recommend the use of [jenv](https://www.jenv.be/) to manage multiple Java versions. For example, to install Java 21 via [homebrew](https://brew.sh/) and configure it with jenv:
-
-```shell
-cd ~/polaris
-brew install openjdk@21 jenv
-jenv add $(brew --prefix openjdk@21)
-jenv local 21
-```
-
-### Connecting to Polaris
-
-Polaris is compatible with any [Apache Iceberg](https://iceberg.apache.org/) client that supports the REST API. Depending on the client you plan to use, refer to the prerequisites below.
-
-#### With Spark
-
-If you want to connect to Polaris with [Apache Spark](https://spark.apache.org/), you'll need to start by cloning Spark. As [above](#building-and-deploying-polaris), make sure [git](https://git-scm.com/) is installed first. You can install it with [homebrew](https://brew.sh/):
-
-```shell
-brew install git
-```
-
-Then, clone Spark and check out a versioned branch. This guide uses [Spark 3.5](https://spark.apache.org/releases/spark-release-3-5-0.html).
-
-```shell
-cd ~
-git clone https://github.com/apache/spark.git
-cd ~/spark
-git checkout branch-3.5
-```
-
-## Deploying Polaris
-
-Polaris can be deployed via a lightweight docker image or as a standalone process. Before starting, be sure that you've satisfied the relevant [prerequisites](#building-and-deploying-polaris) detailed above.
-
-### Docker Image
-
-To start using Polaris in Docker, launch Polaris while Docker is running:
-
-```shell
-cd ~/polaris
-./gradlew \
-  :polaris-quarkus-server:assemble \
-  :polaris-quarkus-server:quarkusAppPartsBuild --rerun \
-  -Dquarkus.container-image.build=true
-docker run -p 8181:8181 -p 8182:8182 apache/polaris:latest
-```
-
-You should see output for some time as Polaris builds and starts up. Eventually, you won’t see any more logs and should see messages that resemble the following:
-
-```
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Apache Polaris Server <version> on JVM  (powered by Quarkus <version>) started in 2.656s. Listening on: http://localhost:8181. Management interface listening on http://0.0.0.0:8182.
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Profile prod activated.
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Installed features: [...]
-```
-
-### Running Polaris as a Standalone Process
-
-The easiest way to run Polaris locally is to start the Polaris server from the
-`quarkus/server/build` directory (after building Polaris):
-
-```shell
-cd ~/polaris
-# Build the server
-./gradlew \
-  :polaris-quarkus-server:assemble \
-  :polaris-quarkus-server:quarkusAppPartsBuild --rerun
-# Start the server
-java -jar quarkus/server/build/quarkus-app/quarkus-run.jar
-```
-
-You should see output for some time as Polaris builds and starts up. Eventually, you won’t see any more logs and should see messages that resemble the following:
-
-```
-realm: <realm> root principal credentials: <client-id>:<client-secret>
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) polaris-quarkus-service <version> on JVM (powered by Quarkus <version>) started in 2.656s. Listening on: http://localhost:8181. Management interface listening on http://0.0.0.0:8182.
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Profile prod activated. Live Coding activated.
-INFO  [io.quarkus] [,] [,,,] (Quarkus Main Thread) Installed features: [...]
-```
-
-At this point, Polaris is running.
-
-For this tutorial, we'll launch an instance of Polaris that stores entities only in-memory. This means that any entities that you define will be destroyed when Polaris is shut down. It also means that Polaris will automatically bootstrap itself with root credentials. For more information on how to configure Polaris for production usage, see the [docs]({{% ref "configuring-polaris-for-production" %}}).
-
-When Polaris is launched using an in-memory metastore, the root principal credentials can be found
-in stdout on initial startup. Look for a line that resembles the following:
-
-```
-realm: <realm> root principal credentials: <client-id>:<client-secret>
-```
-
-Be sure to take note of these credentials as we'll be using them below. You can also set these credentials as environment variables for use with the Polaris CLI:
-
-```shell
-export CLIENT_ID=<client-id>
-export CLIENT_SECRET=<client-secret>
-```
-
-## Defining a Catalog
-
-In Polaris, the [catalog]({{% ref "entities#catalog" %}}) is the top-level entity that objects like [tables]({{% ref "entities#table" %}}) and [views]({{% ref "entities#view" %}}) are organized under. With a Polaris service running, you can create a catalog like so:
-
-```shell
-cd ~/polaris
-
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  catalogs \
-  create \
-  --storage-type s3 \
-  --default-base-location ${DEFAULT_BASE_LOCATION} \
-  --role-arn ${ROLE_ARN} \
-  quickstart_catalog
-```
-
-This will create a new catalog called **quickstart_catalog**.
-
-The `DEFAULT_BASE_LOCATION` you provide will be the default location that objects in this catalog should be stored in, and the `ROLE_ARN` you provide should be a [Role ARN](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference-arns.html) with access to read and write data in that location. These credentials will be provided to engines reading data from the catalog once they have authenticated with Polaris using credentials that have access to those resources.
-
-If you’re using a storage type other than S3, such as Azure, you’ll provide a different type of credential than a Role ARN. For more details on supported storage types, see the [docs]({{% ref "entities#storage-type" %}}).
-
-Additionally, if Polaris is running somewhere other than `localhost:8181`, you can specify the correct hostname and port by providing `--host` and `--port` flags. For the full set of options supported by the CLI, please refer to the [docs]({{% ref "command-line-interface" %}}).
-
-
-### Creating a Principal and Assigning it Privileges
-
-With a catalog created, we can create a [principal]({{% ref "entities#principal" %}}) that has access to manage that catalog. For details on how to configure the Polaris CLI, see [the section above](#defining-a-catalog) or refer to the [docs]({{% ref "command-line-interface" %}}).
-
-```shell
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  principals \
-  create \
-  quickstart_user
-
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  principal-roles \
-  create \
-  quickstart_user_role
-
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  catalog-roles \
-  create \
-  --catalog quickstart_catalog \
-  quickstart_catalog_role
-```
-
-Be sure to provide the necessary credentials, hostname, and port as before.
-
-When the `principals create` command completes successfully, it will return the credentials for this new principal. Be sure to note these down for later. For example:
-
-```
-./polaris ... principals create example
-{"clientId": "XXXX", "clientSecret": "YYYY"}
-```
-
-Now, we grant the principal the [principal role]({{% ref "entities#principal-role" %}}) we created, and grant the [catalog role]({{% ref "entities#catalog-role" %}}) the principal role we created. For more information on these entities, please refer to the linked documentation.
-
-```shell
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  principal-roles \
-  grant \
-  --principal quickstart_user \
-  quickstart_user_role
-
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  catalog-roles \
-  grant \
-  --catalog quickstart_catalog \
-  --principal-role quickstart_user_role \
-  quickstart_catalog_role
-```
-
-Now, we’ve linked our principal to the catalog via roles like so:
-
-![Principal to Catalog](/img/quickstart/privilege-illustration-1.png "Principal to Catalog")
-
-In order to give this principal the ability to interact with the catalog, we must assign some [privileges]({{% ref "entities#privilege" %}}). For the time being, we will give this principal the ability to fully manage content in our new catalog. We can do this with the CLI like so:
-
-```shell
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  privileges \
-  catalog \
-  grant \
-  --catalog quickstart_catalog \
-  --catalog-role quickstart_catalog_role \
-  CATALOG_MANAGE_CONTENT
-```
-
-This grants the [catalog privileges]({{% ref "entities#privilege" %}}) `CATALOG_MANAGE_CONTENT` to our catalog role, linking everything together like so:
-
-![Principal to Catalog with Catalog Role](/img/quickstart/privilege-illustration-2.png "Principal to Catalog with Catalog Role")
-
-`CATALOG_MANAGE_CONTENT` has create/list/read/write privileges on all entities within the catalog. The same privilege could be granted to a namespace, in which case the principal could create/list/read/write any entity under that namespace.
-
-## Using Iceberg & Polaris
-
-At this point, we’ve created a principal and granted it the ability to manage a catalog. We can now use an external engine to assume that principal, access our catalog, and store data in that catalog using [Apache Iceberg](https://iceberg.apache.org/).
-
-### Connecting with Spark
-
-To use a Polaris-managed catalog in [Apache Spark](https://spark.apache.org/), we can configure Spark to use the Iceberg catalog REST API.
-
-This guide uses [Apache Spark 3.5](https://spark.apache.org/releases/spark-release-3-5-0.html), but be sure to find [the appropriate iceberg-spark package for your Spark version](https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-spark). From a local Spark clone on the `branch-3.5` branch we can run the following:
-
-_Note: the credentials provided here are those for our principal, not the root credentials._
-
-```shell
-bin/spark-shell \
---packages org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.8.1,org.apache.hadoop:hadoop-aws:3.4.0 \
---conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions \
---conf spark.sql.catalog.quickstart_catalog.warehouse=quickstart_catalog \
---conf spark.sql.catalog.quickstart_catalog.header.X-Iceberg-Access-Delegation=vended-credentials \
---conf spark.sql.catalog.quickstart_catalog=org.apache.iceberg.spark.SparkCatalog \
---conf spark.sql.catalog.quickstart_catalog.catalog-impl=org.apache.iceberg.rest.RESTCatalog \
---conf spark.sql.catalog.quickstart_catalog.uri=http://localhost:8181/api/catalog \
---conf spark.sql.catalog.quickstart_catalog.credential='XXXX:YYYY' \
---conf spark.sql.catalog.quickstart_catalog.scope='PRINCIPAL_ROLE:ALL' \
---conf spark.sql.catalog.quickstart_catalog.token-refresh-enabled=true \
---conf spark.sql.catalog.quickstart_catalog.client.region=us-west-2
-```
-
-
-Replace `XXXX` and `YYYY` with the client ID and client secret generated when you created the `quickstart_user` principal.
-
-Similar to the CLI commands above, this configures Spark to use the Polaris running at `localhost:8181`. If your Polaris server is running elsewhere, but sure to update the configuration appropriately.
-
-Finally, note that we include the `hadoop-aws` package here. If your table is using a different filesystem, be sure to include the appropriate dependency.
-
-Once the Spark session starts, we can create a namespace and table within the catalog:
-
-```
-spark.sql("USE quickstart_catalog")
-spark.sql("CREATE NAMESPACE IF NOT EXISTS quickstart_namespace")
-spark.sql("CREATE NAMESPACE IF NOT EXISTS quickstart_namespace.schema")
-spark.sql("USE NAMESPACE quickstart_namespace.schema")
-spark.sql("""
-CREATE TABLE IF NOT EXISTS quickstart_table (
-  id BIGINT, data STRING
-)
-USING ICEBERG
-""")
-```
-
-We can now use this table like any other:
-
-```
-spark.sql("INSERT INTO quickstart_table VALUES (1, 'some data')")
-spark.sql("SELECT * FROM quickstart_table").show(false)
-. . .
-+---+---------+
-|id |data     |
-+---+---------+
-|1  |some data|
-+---+---------+
-```
-
-If at any time access is revoked...
-
-```shell
-./polaris \
-  --client-id ${CLIENT_ID} \
-  --client-secret ${CLIENT_SECRET} \
-  privileges \
-  catalog \
-  revoke \
-  --catalog quickstart_catalog \
-  --catalog-role quickstart_catalog_role \
-  CATALOG_MANAGE_CONTENT
-```
-
-Spark will lose access to the table:
-
-```
-spark.sql("SELECT * FROM quickstart_table").show(false)
-
-org.apache.iceberg.exceptions.ForbiddenException: Forbidden: Principal 'quickstart_user' with activated PrincipalRoles '[]' and activated grants via '[quickstart_catalog_role, quickstart_user_role]' is not authorized for op LOAD_TABLE_WITH_READ_DELEGATION
-```