diff --git a/source/images/zoneswitchsunstone.png b/source/images/zoneswitchsunstone.png
index 65ee232c7..56b8cfd8e 100644
Binary files a/source/images/zoneswitchsunstone.png and b/source/images/zoneswitchsunstone.png differ
diff --git a/source/installation_and_configuration/data_center_federation/config.rst b/source/installation_and_configuration/data_center_federation/config.rst
index e568a0a8a..def9c9c4f 100644
--- a/source/installation_and_configuration/data_center_federation/config.rst
+++ b/source/installation_and_configuration/data_center_federation/config.rst
@@ -16,7 +16,6 @@ In this document, each configuration step starts with **Master** or **Slave** to
 
 .. important:: The federation can be set up with MySQL/MariaDB or SQLite as backends, but you can't mix them across Zones. MySQL/MariaDB is recommended for production deployments.
 
-.. important:: FireEdge, the next-generation server for the Sunstone GUI, currently does not support switching zones in a federation environment. Please connect directly to the zone that you wish to work on. Likewise, take into account that the FireEdge functionality enabled in Sunstone will not be available if you switch to a remote zone from within Sunstone.
 
 Step 1. Configure the OpenNebula Federation Master Zone
 ================================================================================
@@ -113,6 +112,19 @@ Step 2. Adding a New Federation Slave Zone
 
 - **Slave**: Start OpenNebula.
 
+- **Slave**: In each Slave node you must place the configuration so that it is able to know which zone it represents. for this you must modify the ``/etc/one/fireedge-server.conf`` file with the zone information.
+
+.. code-block:: bash
+
+    default_zone:
+        id: 100 //ID
+        name: 'Slave' // NAME
+        endpoint: 'http://<slave-ip>:2633/RPC2' //ENDPOINT
+
+.. note:: In case the default :ref:`PORT <fireedge_conf>` of the FireEdge (Master or Slave) is changed, it is required that the zone that this fireedge represents has the ``FIREEDGE_ENDPOINT`` field added with the endpoint that the other FireEdge receives HTTPS requests.
+
+- **Slave**: Start FireEdge.
+
 The Zone should be now configured and ready to use.
 
 Step 3. Adding HA to a Federation Slave Zone (Optional)