diff --git a/db_management/db_online.rst b/db_management/db_online.rst
index 67c6960c5..6ace71f87 100644
--- a/db_management/db_online.rst
+++ b/db_management/db_online.rst
@@ -24,14 +24,14 @@ Several actions are available:
 .. image:: media/db_buttons.png
     :align: center
 
-* Upgrade
+* :ref:`Upgrade <upgrade_button>`
     Upgrade your database to the latest Odoo version to enjoy cutting-edge
     features
 * :ref:`Duplicate <duplicate_online>`
     Make an exact copy of your database, if you want
     to try out new apps or new flows without compromising
     your daily operations
-* Rename
+* :ref:`Rename <rename_online_database>`
     Rename your database (and its URL)
 * **Backup**
     Download an instant backup of your database; note that we
@@ -45,6 +45,36 @@ Several actions are available:
     Access our `support page <https://www.odoo.com/help>`__
     with the correct database already selected
 
+.. _upgrade_button:
+
+Upgrade
+=======
+
+Make sure to be connected to the database you want to upgrade and access to the
+database management page. On the line of the database you want to upgrade, click
+on the "Upgrade" button.
+
+.. image:: media/upgrade1.png
+    :align: center
+
+By clicking on the "Test upgrade" button an upgrade request will be generated.
+If our automated system does not encounter any problem, you will receive a
+"Test" version of your upgraded database.
+
+.. image:: media/test_upgrade.png
+    :align: center
+
+.. note :: If our automatic system detect an issue during the creation of your
+    test database, our dedicated team will have to work on it. You will be
+    notified by email and the process will take up to 4 weeks.
+
+You will have the possibility to test it for 1 month. When you will be ready,
+and be sure that there are no problem compared to your actual version, you can
+click again on the Upgrade button, and confirm by clicking on Upgrade (the button
+with the little rocket!) to definitely switch to the upgraded version of Odoo.
+
+.. image:: media/upgrade.png
+    :align: center
 
 .. _duplicate_online:
 
@@ -87,6 +117,19 @@ database.
     .. image:: media/dup_expires.png
         :align: center
 
+.. _rename_online_database:
+
+Rename a Database
+===================
+
+To rename your database, make sure you are connected to the database you want
+to rename, access the `database management page <https://www.odoo.com/my/databases>`__
+and click **Rename**. You will have to give a new name to your database,
+then click **Rename Database**.
+
+.. image:: media/rename.png
+    :align: center
+
 .. _delete_online_database:
 
 Deleting a Database
@@ -119,5 +162,9 @@ reload automatically.
 .. note::
     * If you need to re-use this database name, it will be immediately available.
 
-    * If you want to delete your Account, please contact 
+    * It is not possible to delete a database if it is expired or linked
+      to a Subscription. In these cases contact
+      `Odoo Support <https://www.odoo.com/help>`__
+
+    * If you want to delete your Account, please contact
       `Odoo Support <https://www.odoo.com/help>`__
diff --git a/db_management/media/rename.png b/db_management/media/rename.png
new file mode 100644
index 000000000..1c596478b
Binary files /dev/null and b/db_management/media/rename.png differ
diff --git a/db_management/media/test_upgrade.png b/db_management/media/test_upgrade.png
new file mode 100644
index 000000000..00a533fef
Binary files /dev/null and b/db_management/media/test_upgrade.png differ
diff --git a/db_management/media/upgrade.png b/db_management/media/upgrade.png
new file mode 100644
index 000000000..c645262a7
Binary files /dev/null and b/db_management/media/upgrade.png differ
diff --git a/db_management/media/upgrade1.png b/db_management/media/upgrade1.png
new file mode 100644
index 000000000..8a5db5eb7
Binary files /dev/null and b/db_management/media/upgrade1.png differ