diff --git a/docs/connect/index.md b/docs/connect/index.md
index 39bd293..dce9046 100644
--- a/docs/connect/index.md
+++ b/docs/connect/index.md
@@ -29,6 +29,13 @@ In order to connect to CrateDB, your application or driver needs to be
configured with corresponding connection properties. Please note that different
applications and drivers may obtain connection properties in different formats.
+
+
::::::{tab-set}
:::::{tab-item} CrateDB and CrateDB Cloud
@@ -38,33 +45,40 @@ applications and drivers may obtain connection properties in different formats.
:padding: 0
:::{grid-item}
-:columns: 5
+:columns: 4
:margin: 0
:padding: 0
**Connection properties**
:Host: ``.cratedb.net
-:Port: 5432 (PostgreSQL) or 4200 (HTTP)
+:Port: 5432 (PostgreSQL) or
4200 (HTTP)
:User: ``
:Pass: ``
:::
:::{grid-item}
-:columns: 7
+:columns: 8
:margin: 0
:padding: 0
**Connection-string examples**
-A native PostgreSQL connection string.
-`postgresql://:@.cratedb.net/`
+A native PostgreSQL connection string, e.g. for `psql`.
+
+`postgresql://:@.cratedb.net:5432/`
+
+A connection string for JDBC or Apache Flink.
+
+`jdbc:crate://:@.cratedb.net:5432/`
-A connection string for SQLAlchemy or Apache Flink.
-`crate://:@.cratedb.net/?ssl=true`
+A connection string for SQLAlchemy.
+
+`crate://:@.cratedb.net:4200/?ssl=true`
-An HTTP URL to visit Admin UI.
+An HTTP URL to visit Admin UI, or use with `crash`.
+
`https://:@.cratedb.net:4200/`
:::
@@ -80,33 +94,40 @@ An HTTP URL to visit Admin UI.
:padding: 0
:::{grid-item}
-:columns: 5
+:columns: 4
:margin: 0
:padding: 0
**Connection properties**
:Host: localhost
-:Port: 5432 (PostgreSQL) or 4200 (HTTP)
+:Port: 5432 (PostgreSQL) or
4200 (HTTP)
:User: `crate`
:Pass: (empty)
:::
:::{grid-item}
-:columns: 7
+:columns: 8
:margin: 0
:padding: 0
**Connection-string examples**
-A native PostgreSQL connection string.
+A native PostgreSQL connection string, e.g. for `psql`.
+
`postgresql://crate@localhost:5432/`
-A connection string for SQLAlchemy or Apache Flink.
-`crate://crate@localhost/`
+A connection string for JDBC or Apache Flink.
+
+`jdbc:crate://crate@localhost:5432/`
+
+A connection string for SQLAlchemy.
+
+`crate://crate@localhost:4200/`
-An HTTP URL to visit Admin UI.
+An HTTP URL to visit Admin UI, or use with `crash`.
+
`http://crate@localhost:4200/`
:::