diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
index dbe8b2abc..ed7c81828 100644
--- a/modules/ROOT/content-nav.adoc
+++ b/modules/ROOT/content-nav.adoc
@@ -61,6 +61,7 @@ AuraDB Start
 ** xref:auradb/managing-databases/monitoring.adoc[]
 ** xref:auradb/managing-databases/advanced-metrics.adoc[]
 ** xref:auradb/managing-databases/migration-readiness.adoc[]
+** xref:auradb/managing-databases/custom-endpoints.adoc[]
 
 
 * xref:auradb/connecting-applications/overview.adoc[Connecting applications]
diff --git a/modules/ROOT/images/classic-instance-endpoint.png b/modules/ROOT/images/classic-instance-endpoint.png
new file mode 100644
index 000000000..0f1ca61af
Binary files /dev/null and b/modules/ROOT/images/classic-instance-endpoint.png differ
diff --git a/modules/ROOT/images/main-endpoints.png b/modules/ROOT/images/main-endpoints.png
new file mode 100644
index 000000000..dcced1ef2
Binary files /dev/null and b/modules/ROOT/images/main-endpoints.png differ
diff --git a/modules/ROOT/pages/auradb/managing-databases/custom-endpoints.adoc b/modules/ROOT/pages/auradb/managing-databases/custom-endpoints.adoc
new file mode 100644
index 000000000..71ba2e796
--- /dev/null
+++ b/modules/ROOT/pages/auradb/managing-databases/custom-endpoints.adoc
@@ -0,0 +1,30 @@
+[[aura-custom-endpoints]]
+= Custom endpoints
+:description: This section describes custom endpoints.
+
+Custom endpoints can be used for database management and migration.
+
+You can create custom endpoints for your instances directly from the console.
+This allows you to establish connection to a database using this endpoint instead of the `<dbid>`.
+
+[.shadow]
+image::main-endpoints.png[width=800]
+
+*Custom Endpoints* can be found under *Security* in the sidebar of the console.
+
+Use the *Create custom endpoint* button to define your endpoint.
+Choose an appropriate name for the endpoint (it can only contain lowercase letters, numbers, and hyphens) and select which instance to assign the endpoint to.
+
+Once a custom endpoint has been assigned to an instance, it will be listed along with existing custom endpoints in the menu in the Project settings.
+They can be managed both from this menu as well as from the instance card.
+
+[.shadow]
+image::classic-instance-endpoint.png[width=600]
+
+A custom endpoint can be configured to a different instance or deleted.
+
+[NOTE]
+====
+Once a custom endpoint is created (and thus assigned) or re-assigned to an instance, you have to wait three hours before you can make any further changes to it.
+If you re-assign an endpoint, you have the option to undo the re-assignment at any time without waiting.
+====
\ No newline at end of file