diff --git a/src/main/resources/db/migration/V0_7_7__update.sql b/src/main/resources/db/migration/V0_7_7__update.sql
index 164eaa0f9..56c1d2f04 100644
--- a/src/main/resources/db/migration/V0_7_7__update.sql
+++ b/src/main/resources/db/migration/V0_7_7__update.sql
@@ -1,4 +1,13 @@
-ALTER TABLE `chargebox`
+ALTER TABLE reservation
+DROP FOREIGN KEY `FK_chargeBoxId_r`,
+DROP FOREIGN KEY `FK_idTag_r`;
+ALTER TABLE connector
+DROP FOREIGN KEY `FK_chargeBoxId_c`;
+ALTER TABLE transaction
+DROP FOREIGN KEY `FK_idTag_t`;
+ALTER TABLE user
+DROP FOREIGN KEY `FK_user_parentIdTag`;
+ALTER TABLE chargebox
 CHANGE COLUMN `chargeBoxId` `chargeBoxId` VARCHAR(255) NOT NULL COMMENT '' ,
 CHANGE COLUMN `endpoint_address` `endpoint_address` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `ocppProtocol` `ocppProtocol` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
@@ -13,76 +22,57 @@ CHANGE COLUMN `imsi` `imsi` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `meterType` `meterType` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `meterSerialNumber` `meterSerialNumber` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `diagnosticsStatus` `diagnosticsStatus` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
-
-
-ALTER TABLE `connector`
-DROP FOREIGN KEY `FK_chargeBoxId_c`;
-ALTER TABLE `connector`
-CHANGE COLUMN `chargeBoxId` `chargeBoxId` VARCHAR(255) NOT NULL COMMENT '' ;
-ALTER TABLE `connector`
-ADD CONSTRAINT `FK_chargeBoxId_c`
-FOREIGN KEY (`chargeBoxId`)
-REFERENCES `chargebox` (`chargeBoxId`)
-  ON DELETE CASCADE
-  ON UPDATE NO ACTION;
-
-
-ALTER TABLE `connector_metervalue`
+ALTER TABLE connector_metervalue
 CHANGE COLUMN `value` `value` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `readingContext` `readingContext` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `format` `format` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `measurand` `measurand` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `location` `location` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `unit` `unit` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
-
-
-ALTER TABLE `connector_status`
+ALTER TABLE connector_status
 CHANGE COLUMN `status` `status` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `errorCode` `errorCode` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `errorInfo` `errorInfo` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `vendorErrorCode` `vendorErrorCode` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
-
-
-ALTER TABLE `reservation`
-DROP FOREIGN KEY `FK_chargeBoxId_r`,
-DROP FOREIGN KEY `FK_idTag_r`;
-ALTER TABLE `reservation`
+ALTER TABLE user
+CHANGE COLUMN `idTag` `idTag` VARCHAR(255) NOT NULL COMMENT '' ,
+CHANGE COLUMN `parentIdTag` `parentIdTag` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
+ALTER TABLE user
+ADD CONSTRAINT FK_user_parentIdTag
+FOREIGN KEY (`parentIdTag`)
+REFERENCES `user` (`idTag`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION;
+ALTER TABLE reservation
 CHANGE COLUMN `idTag` `idTag` VARCHAR(255) NOT NULL COMMENT '' ,
 CHANGE COLUMN `chargeBoxId` `chargeBoxId` VARCHAR(255) NOT NULL COMMENT '' ,
 CHANGE COLUMN `status` `status` VARCHAR(255) NOT NULL COMMENT '' ;
-ALTER TABLE `reservation`
-ADD CONSTRAINT `FK_chargeBoxId_r`
+ALTER TABLE reservation
+ADD CONSTRAINT FK_chargeBoxId_r
 FOREIGN KEY (`chargeBoxId`)
 REFERENCES `chargebox` (`chargeBoxId`)
   ON DELETE CASCADE
   ON UPDATE NO ACTION,
-ADD CONSTRAINT `FK_idTag_r`
+ADD CONSTRAINT FK_idTag_r
 FOREIGN KEY (`idTag`)
 REFERENCES `user` (`idTag`)
   ON DELETE CASCADE
   ON UPDATE NO ACTION;
-
-ALTER TABLE `transaction`
-DROP FOREIGN KEY `FK_idTag_t`;
-ALTER TABLE `transaction`
+ALTER TABLE connector
+CHANGE COLUMN `chargeBoxId` `chargeBoxId` VARCHAR(255) NOT NULL COMMENT '' ;
+ALTER TABLE connector
+ADD CONSTRAINT FK_chargeBoxId_c
+FOREIGN KEY (`chargeBoxId`)
+REFERENCES `chargebox` (`chargeBoxId`)
+  ON DELETE CASCADE
+  ON UPDATE NO ACTION;
+ALTER TABLE transaction
 CHANGE COLUMN `idTag` `idTag` VARCHAR(255) NOT NULL COMMENT '' ,
 CHANGE COLUMN `startValue` `startValue` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ,
 CHANGE COLUMN `stopValue` `stopValue` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
-ALTER TABLE `transaction`
-ADD CONSTRAINT `FK_idTag_t`
+ALTER TABLE transaction
+ADD CONSTRAINT FK_idTag_t
 FOREIGN KEY (`idTag`)
 REFERENCES `user` (`idTag`)
   ON DELETE CASCADE
-  ON UPDATE NO ACTION;
-
-ALTER TABLE `user`
-DROP FOREIGN KEY `FK_user_parentIdTag`;
-ALTER TABLE `user`
-CHANGE COLUMN `idTag` `idTag` VARCHAR(255) NOT NULL COMMENT '' ,
-CHANGE COLUMN `parentIdTag` `parentIdTag` VARCHAR(255) NULL DEFAULT NULL COMMENT '' ;
-ALTER TABLE `user`
-ADD CONSTRAINT `FK_user_parentIdTag`
-FOREIGN KEY (`parentIdTag`)
-REFERENCES `user` (`idTag`)
-  ON DELETE NO ACTION
-  ON UPDATE NO ACTION;
+  ON UPDATE NO ACTION;
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V0_8_6__update.sql b/src/main/resources/db/migration/V0_8_6__update.sql
index 2dfcf0f3f..a6c46c6ce 100644
--- a/src/main/resources/db/migration/V0_8_6__update.sql
+++ b/src/main/resources/db/migration/V0_8_6__update.sql
@@ -19,20 +19,64 @@ LOCK TABLES
   reservation WRITE,
   settings WRITE,
   `transaction` WRITE,
-  `user` WRITE;
+  `user` WRITE,
+  `schema_version` WRITE; 
 
 SET FOREIGN_KEY_CHECKS = 0;
 
-ALTER TABLE charge_box CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE address CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE connector CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE connector_meter_value CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE connector_status CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE ocpp_tag CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE reservation CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE settings CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE `transaction` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 ALTER TABLE `user` CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+ALTER TABLE settings CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+ALTER TABLE connector_status CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+ALTER TABLE connector_meter_value CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+ALTER TABLE address CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+ALTER TABLE `transaction` 
+DROP FOREIGN KEY `FK_transaction_ocpp_tag_id_tag` ,
+CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+ALTER TABLE reservation 
+DROP FOREIGN KEY `FK_reservation_charge_box_cbid` ,
+DROP FOREIGN KEY `FK_reservation_ocpp_tag_id_tag`,
+CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+ALTER TABLE ocpp_tag 
+DROP FOREIGN KEY `FK_ocpp_tag_parent_id_tag` ,
+CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+ALTER TABLE connector 
+DROP FOREIGN KEY `FK_connector_charge_box_cbid` ,
+CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+ALTER TABLE charge_box  CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+
+
+ALTER TABLE `transaction`
+ADD CONSTRAINT `FK_transaction_ocpp_tag_id_tag`
+FOREIGN KEY (`id_tag`)
+REFERENCES `ocpp_tag` (`id_tag`)
+  ON DELETE CASCADE
+  ON UPDATE NO ACTION;
+ 
+ALTER TABLE `reservation`
+ADD CONSTRAINT `FK_reservation_charge_box_cbid`
+FOREIGN KEY (`charge_box_id`)
+REFERENCES `charge_box` (`charge_box_id`)
+  ON DELETE CASCADE
+  ON UPDATE NO ACTION;
+ 
+ALTER TABLE `ocpp_tag`
+ADD CONSTRAINT `FK_ocpp_tag_parent_id_tag`
+FOREIGN KEY (`parent_id_tag`)
+REFERENCES `ocpp_tag` (`id_tag`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION;
+ 
+ALTER TABLE `connector`
+ADD CONSTRAINT `FK_connector_charge_box_cbid`
+FOREIGN KEY (`charge_box_id`)
+REFERENCES `charge_box` (`charge_box_id`)
+  ON DELETE CASCADE
+  ON UPDATE NO ACTION;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
@@ -48,7 +92,8 @@ REPAIR TABLE
   reservation,
   settings,
   `transaction`,
-  `user`;
+  `user`,
+ `schema_version`;
 
 OPTIMIZE TABLE
   address,
@@ -60,4 +105,5 @@ OPTIMIZE TABLE
   reservation,
   settings,
   `transaction`,
-  `user`;
+  `user`,
+ `schema_version`;