diff --git a/data/sql/updates/pending_db_world/rev_1621246170226501700.sql b/data/sql/updates/db_world/2021_05_25_01.sql
similarity index 63%
rename from data/sql/updates/pending_db_world/rev_1621246170226501700.sql
rename to data/sql/updates/db_world/2021_05_25_01.sql
index c09322e9e..1f8d4e506 100644
--- a/data/sql/updates/pending_db_world/rev_1621246170226501700.sql
+++ b/data/sql/updates/db_world/2021_05_25_01.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_05_25_00 -> 2021_05_25_01
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_00 2021_05_25_01 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621246170226501700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621246170226501700');
 
 -- These cages shouldn't really despawn
@@ -9,3 +25,12 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (18628700, 9, 2, 0, 0, 0, 100, 0, 300000, 300000, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackhoof Cage - Script - Reset Go'),
 (18628700, 9, 3, 0, 0, 0, 100, 0, 500, 500, 0, 0, 0, 104, 48, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackhoof Cage - Script - Set Flag'),
 (18628700, 9, 4, 0, 0, 0, 100, 0, 64500, 64500, 0, 0, 0, 104, 32, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Blackhoof Cage - Script - Set Flag');
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1621252516106793022.sql b/data/sql/updates/db_world/2021_05_25_02.sql
similarity index 61%
rename from data/sql/updates/pending_db_world/rev_1621252516106793022.sql
rename to data/sql/updates/db_world/2021_05_25_02.sql
index 6cf0b5b27..e4dece1d7 100644
--- a/data/sql/updates/pending_db_world/rev_1621252516106793022.sql
+++ b/data/sql/updates/db_world/2021_05_25_02.sql
@@ -1,3 +1,19 @@
+-- DB update 2021_05_25_01 -> 2021_05_25_02
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_01';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_01 2021_05_25_02 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621252516106793022'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
 INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621252516106793022');
 
 -- https://github.com/azerothcore/azerothcore-wotlk/issues/5902
@@ -19,3 +35,12 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (@PATH, 8, -748.391, 1469.193, 18.1120, 2.840, 20000, 0, 0, 100, 0),
 (@PATH, 9, -722.820, 1506.920, 12.6463, 0, 0, 0, 0, 100, 0),
 (@PATH, 10, -693.943, 1542.735, 16.3801 , 0, 0, 0, 0, 100, 0);
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_05_25_03.sql b/data/sql/updates/db_world/2021_05_25_03.sql
new file mode 100644
index 000000000..fd85e921e
--- /dev/null
+++ b/data/sql/updates/db_world/2021_05_25_03.sql
@@ -0,0 +1,30 @@
+-- DB update 2021_05_25_02 -> 2021_05_25_03
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_02';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_02 2021_05_25_03 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621271952210432100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621271952210432100');
+
+UPDATE `quest_poi` SET `MapID`= 1, `WorldMapAreaId`= 17 WHERE `QuestID`= 7944 AND `id`= 0;
+
+UPDATE `quest_poi_points` SET `X`= -732, `Y`= -2219 WHERE `QuestID`= 7944 AND `Idx1`= 0 AND `Idx2`= 0;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_05_25_04.sql b/data/sql/updates/db_world/2021_05_25_04.sql
new file mode 100644
index 000000000..a7a60958b
--- /dev/null
+++ b/data/sql/updates/db_world/2021_05_25_04.sql
@@ -0,0 +1,35 @@
+-- DB update 2021_05_25_03 -> 2021_05_25_04
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_03';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_03 2021_05_25_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621414710329639831'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621414710329639831');
+
+SET @SHIVER_BLADE := 5182;
+SET @GESHARAHAN := 3398;
+
+DELETE FROM `reference_loot_template` where `Item` = @SHIVER_BLADE;
+
+DELETE FROM `creature_loot_template` WHERE `Entry` = @GESHARAHAN AND `Item` = @SHIVER_BLADE;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(@GESHARAHAN, @SHIVER_BLADE, 0, 72.12, 0, 1, 0, 1, 1, "Gesharahan - Shiver Blade");
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_05_25_05.sql b/data/sql/updates/db_world/2021_05_25_05.sql
new file mode 100644
index 000000000..a8f22b432
--- /dev/null
+++ b/data/sql/updates/db_world/2021_05_25_05.sql
@@ -0,0 +1,37 @@
+-- DB update 2021_05_25_04 -> 2021_05_25_05
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_04';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_04 2021_05_25_05 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621426406097836315'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621426406097836315');
+
+SET @REF_TIGERSTRIKE_MANTLE := 24053;
+
+-- 4287 - Scarlet Gallant
+-- 4291 - Scarlet Diviner
+-- 4296 - Scarlet Adept
+-- 4299 - Scarlet Chaplain
+-- 4306 - Scarlet Torturer
+-- 4540 - Scarlet Monk
+DELETE FROM `creature_loot_template` 
+WHERE `Reference` = @REF_TIGERSTRIKE_MANTLE AND `entry` IN (4287, 4291, 4296, 4299, 4306, 4540);
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2021_05_25_06.sql b/data/sql/updates/db_world/2021_05_25_06.sql
new file mode 100644
index 000000000..11ec680f0
--- /dev/null
+++ b/data/sql/updates/db_world/2021_05_25_06.sql
@@ -0,0 +1,30 @@
+-- DB update 2021_05_25_05 -> 2021_05_25_06
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2021_05_25_05';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2021_05_25_05 2021_05_25_06 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1621496626209255481'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621496626209255481');
+
+UPDATE `gameobject` 
+SET `position_x` = 455.827, `position_y` = -628.813, `position_z` = 167
+WHERE `guid` = 30079;
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1621271952210432100.sql b/data/sql/updates/pending_db_world/rev_1621271952210432100.sql
deleted file mode 100644
index f0a662526..000000000
--- a/data/sql/updates/pending_db_world/rev_1621271952210432100.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621271952210432100');
-
-UPDATE `quest_poi` SET `MapID`= 1, `WorldMapAreaId`= 17 WHERE `QuestID`= 7944 AND `id`= 0;
-
-UPDATE `quest_poi_points` SET `X`= -732, `Y`= -2219 WHERE `QuestID`= 7944 AND `Idx1`= 0 AND `Idx2`= 0;
diff --git a/data/sql/updates/pending_db_world/rev_1621414710329639831.sql b/data/sql/updates/pending_db_world/rev_1621414710329639831.sql
deleted file mode 100644
index 11ac85c90..000000000
--- a/data/sql/updates/pending_db_world/rev_1621414710329639831.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621414710329639831');
-
-SET @SHIVER_BLADE := 5182;
-SET @GESHARAHAN := 3398;
-
-DELETE FROM `reference_loot_template` where `Item` = @SHIVER_BLADE;
-
-DELETE FROM `creature_loot_template` WHERE `Entry` = @GESHARAHAN AND `Item` = @SHIVER_BLADE;
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(@GESHARAHAN, @SHIVER_BLADE, 0, 72.12, 0, 1, 0, 1, 1, "Gesharahan - Shiver Blade");
diff --git a/data/sql/updates/pending_db_world/rev_1621426406097836315.sql b/data/sql/updates/pending_db_world/rev_1621426406097836315.sql
deleted file mode 100644
index 5b4617eff..000000000
--- a/data/sql/updates/pending_db_world/rev_1621426406097836315.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621426406097836315');
-
-SET @REF_TIGERSTRIKE_MANTLE := 24053;
-
--- 4287 - Scarlet Gallant
--- 4291 - Scarlet Diviner
--- 4296 - Scarlet Adept
--- 4299 - Scarlet Chaplain
--- 4306 - Scarlet Torturer
--- 4540 - Scarlet Monk
-DELETE FROM `creature_loot_template` 
-WHERE `Reference` = @REF_TIGERSTRIKE_MANTLE AND `entry` IN (4287, 4291, 4296, 4299, 4306, 4540);
diff --git a/data/sql/updates/pending_db_world/rev_1621496626209255481.sql b/data/sql/updates/pending_db_world/rev_1621496626209255481.sql
deleted file mode 100644
index 302340aae..000000000
--- a/data/sql/updates/pending_db_world/rev_1621496626209255481.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1621496626209255481');
-
-UPDATE `gameobject` 
-SET `position_x` = 455.827, `position_y` = -628.813, `position_z` = 167
-WHERE `guid` = 30079;