diff --git a/data/sql/updates/pending_db_world/rev_1629208512724054400.sql b/data/sql/updates/pending_db_world/rev_1629208512724054400.sql
new file mode 100644
index 000000000..c2b0654e0
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1629208512724054400.sql
@@ -0,0 +1,11 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1629208512724054400');
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE (`entry` = 9736);
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 9736);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(9736, 0, 0, 0, 0, 0, 100, 0, 16000, 16000, 16000, 16000, 0, 11, 16497, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Quartermaster Zigris - In Combat - Cast \'Stun Bomb\''),
+(9736, 0, 1, 0, 9, 0, 100, 0, 4, 6, 14000, 16000, 0, 11, 15609, 0, 0, 0, 0, 0, 21, 30, 0, 0, 0, 0, 0, 0, 0, 'Quartermaster Zigris - Within 4-6 Range - Cast \'Hooked Net\''),
+(9736, 0, 2, 3, 9, 0, 100, 0, 10, 30, 2000, 2000, 0, 11, 16496, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Quartermaster Zigris - Within 10-30 Range - Cast \'Shoot\''),
+(9736, 0, 3, 0, 61, 0, 100, 0, 10, 30, 2000, 2000, 0, 21, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Quartermaster Zigris - Within 10-30 Range - Disable Combat Movement'),
+(9736, 0, 4, 0, 9, 0, 100, 0, 0, 10, 300, 300, 0, 21, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Quartermaster Zigris - Within 0-10 Range - Enable Combat Movement');
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
deleted file mode 100644
index 7cab0685c..000000000
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license, you may redistribute it and/or modify it under version 2 of the License, or (at your option), any later version.
- * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- */
-
-#include "blackrock_spire.h"
-#include "ScriptedCreature.h"
-#include "ScriptMgr.h"
-
-enum Spells
-{
-    SPELL_SHOOT                     = 16496,
-    SPELL_STUNBOMB                  = 16497,
-    SPELL_HEALING_POTION            = 15504,
-    SPELL_HOOKEDNET                 = 15609
-};
-
-enum Events
-{
-    EVENT_SHOOT                     = 1,
-    EVENT_STUN_BOMB                 = 2
-};
-
-class quartermaster_zigris : public CreatureScript
-{
-public:
-    quartermaster_zigris() : CreatureScript("quartermaster_zigris") { }
-
-    struct boss_quatermasterzigrisAI : public BossAI
-    {
-        boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) { }
-
-        void Reset() override
-        {
-            _Reset();
-        }
-
-        void EnterCombat(Unit* /*who*/) override
-        {
-            _EnterCombat();
-            events.ScheduleEvent(EVENT_SHOOT,      1000);
-            events.ScheduleEvent(EVENT_STUN_BOMB, 16000);
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            _JustDied();
-        }
-
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
-
-            events.Update(diff);
-
-            if (me->HasUnitState(UNIT_STATE_CASTING))
-                return;
-
-            while (uint32 eventId = events.ExecuteEvent())
-            {
-                switch (eventId)
-                {
-                    case EVENT_SHOOT:
-                        DoCastVictim(SPELL_SHOOT);
-                        events.ScheduleEvent(EVENT_SHOOT, 500);
-                        break;
-                    case EVENT_STUN_BOMB:
-                        DoCastVictim(SPELL_STUNBOMB);
-                        events.ScheduleEvent(EVENT_STUN_BOMB, 14000);
-                        break;
-                }
-            }
-            DoMeleeAttackIfReady();
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetBlackrockSpireAI<boss_quatermasterzigrisAI>(creature);
-    }
-};
-
-void AddSC_boss_quatermasterzigris()
-{
-    new quartermaster_zigris();
-}
diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
index 00f437d05..1600fb882 100644
--- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
@@ -28,7 +28,6 @@ void AddSC_boss_overlordwyrmthalak();
 void AddSC_boss_shadowvosh();
 void AddSC_boss_thebeast();
 void AddSC_boss_warmastervoone();
-void AddSC_boss_quatermasterzigris();
 void AddSC_boss_pyroguard_emberseer();
 void AddSC_boss_gyth();
 void AddSC_boss_rend_blackhand();
@@ -165,7 +164,6 @@ void AddEasternKingdomsScripts()
     AddSC_boss_shadowvosh();
     AddSC_boss_thebeast();
     AddSC_boss_warmastervoone();
-    AddSC_boss_quatermasterzigris();
     AddSC_boss_pyroguard_emberseer();
     AddSC_boss_gyth();
     AddSC_boss_rend_blackhand();