diff --git a/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py b/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py
index 51cadab8b36..31b5d5e173e 100644
--- a/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py
+++ b/commons/c2cgeoportal_commons/alembic/main/78fd093c8393_add_api_s_intrfaces.py
@@ -69,6 +69,11 @@ def upgrade():
             name=interface_name, schema=schema
         ))
         if results:
+            op.execute(
+                "DELETE it.* FROM {schema}.interface_theme it "
+                "INNER JOIN {schema}.interface i ON it.interface_id = i.id WHERE i.name='{name}'".format(
+                name=interface_name, schema=schema
+            ))
             op.execute("DELETE FROM {schema}.interface WHERE name='{name}'".format(
                 name=interface_name, schema=schema
             ))
@@ -97,6 +102,11 @@ def downgrade():
             name=interface_name, schema=schema
         ))
         if results:
+            op.execute(
+                "DELETE it.* FROM {schema}.interface_theme it "
+                "INNER JOIN {schema}.interface i ON it.interface_id = i.id WHERE i.name='{name}'".format(
+                name=interface_name, schema=schema
+            ))
             op.execute("DELETE FROM {schema}.interface WHERE name='{name}'".format(
                 name=interface_name, schema=schema
             ))
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl
index 05103f16340..476a0832199 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl
@@ -12,9 +12,11 @@ Information
 
 2. The WMTS capabilities is now generated on runtime.
 
-3. If not already done the 'api' and 'iframe_api' will be created, and the 'edit' and 'routing' interface
-   will be removed. After the database upgrade you can run the following request to fill e.-g. the api's
-   interfaces with the desktop interface:
+3. If not already done the 'edit' and 'routing' interface will be removed, If you don't want that,
+   you should rename the interfaces befor aplying the alembic scripts.
+
+4. If not already done the 'api' and 'iframe_api' will be created. After the database upgrade you can run
+   the following request to fill e.-g. the api's interfaces with the desktop interface:
 
     INSERT INTO main.interface_layer (interface_id, layer_id)
     SELECT <api_interface_id>, layer_id FROM main.interface_layer WHERE interface_id = <other_interface_id>;