diff --git a/data/sql/updates/pending_db_world/rev_1715344535575710504.sql b/data/sql/updates/pending_db_world/rev_1715344535575710504.sql
new file mode 100644
index 0000000000..82314d74b7
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1715344535575710504.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `spell_script_names` WHERE `spell_id` = 37098;
+INSERT INTO `spell_script_names` VALUES (37098,'spell_nightbane_rain_of_bones');
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 9393086c73..2db084dde3 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -19,6 +19,9 @@
 #include "GameObjectScript.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "SpellScriptLoader.h"
+#include "SpellAuraEffects.h"
 #include "TaskScheduler.h"
 #include "karazhan.h"
 
@@ -76,14 +79,12 @@ struct boss_nightbane : public BossAI
     boss_nightbane(Creature* creature) : BossAI(creature, DATA_NIGHTBANE)
     {
         _intro = true;
-        _skeletonCount = 5;
         _movePhase = 0;
     }
 
     void Reset() override
     {
         BossAI::Reset();
-        _skeletonscheduler.CancelAll();
 
         me->SetSpeed(MOVE_RUN, 2.0f);
         me->SetDisableGravity(_intro);
@@ -155,22 +156,10 @@ struct boss_nightbane : public BossAI
 
     void ScheduleFly()
     {
-        _skeletonSpawnCounter = 0;
-
         scheduler.Schedule(2s, GROUP_FLYING, [this](TaskContext)
         {
             DoResetThreatList();
             DoCastVictim(SPELL_RAIN_OF_BONES);
-            _skeletonscheduler.Schedule(50ms, [this](TaskContext context)
-            {
-                //spawns skeletons every second until skeletonCount is reached
-                if(_skeletonSpawnCounter < _skeletonCount)
-                {
-                    DoCastVictim(SPELL_SUMMON_SKELETON, true);
-                    _skeletonSpawnCounter++;
-                    context.Repeat(2s);
-                }
-            });
         }).Schedule(20s, GROUP_FLYING, [this](TaskContext context)
         {
             DoCastRandomTarget(SPELL_DISTRACTING_ASH);
@@ -344,7 +333,6 @@ struct boss_nightbane : public BossAI
             return;
 
         scheduler.Update(diff);
-        _skeletonscheduler.Update(diff);
 
         //  Phase 1 "GROUND FIGHT"
         if (Phase == 1)
@@ -362,15 +350,11 @@ struct boss_nightbane : public BossAI
 private:
     uint32 Phase;
 
-    TaskScheduler _skeletonscheduler;
-
     bool _intro;
     bool _flying;
     bool _movement;
 
     uint32 _movePhase;
-    uint8 _skeletonCount;
-    uint8 _skeletonSpawnCounter;
 };
 
 class go_blackened_urn : public GameObjectScript
@@ -396,8 +380,31 @@ public:
     }
 };
 
+// 37098 - Rain of Bones
+class spell_nightbane_rain_of_bones : public AuraScript
+{
+    PrepareAuraScript(spell_nightbane_rain_of_bones);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_SUMMON_SKELETON });
+    }
+
+    void OnTrigger(AuraEffect const* aurEff)
+    {
+        if (aurEff->GetTickNumber() % 5 == 0)
+            GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_SKELETON, true);
+    }
+
+    void Register() override
+    {
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_nightbane_rain_of_bones::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
+    }
+};
+
 void AddSC_boss_nightbane()
 {
     RegisterKarazhanCreatureAI(boss_nightbane);
+    RegisterSpellScript(spell_nightbane_rain_of_bones);
     new go_blackened_urn();
 }