diff --git a/Updates/4876_TDB-0166_CDB-4463_generic_run_on_relayscript.sql b/Updates/4876_TDB-0166_CDB-4463_generic_run_on_relayscript.sql
new file mode 100644
index 0000000000..2906cd9fdf
--- /dev/null
+++ b/Updates/4876_TDB-0166_CDB-4463_generic_run_on_relayscript.sql
@@ -0,0 +1,7 @@
+DELETE FROM `dbscripts_on_relay` WHERE `id` IN (30598,30511,30504,30505);
+INSERT INTO `dbscripts_on_relay` (`id`, `delay`, `priority`, `command`, `datalong`, `datalong2`, `datalong3`, `buddy_entry`, `search_radius`, `data_flags`, `dataint`, `dataint2`, `dataint3`, `dataint4`, `datafloat`, `x`, `y`, `z`, `o`, `speed`, `condition_id`, `comments`) VALUES
+(30598, 0, 0, 25, 1, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'GENERIC - Run Mode On'), -- 30599 GENERIC - set Idle
+(30511, 0, 0, 21, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'GENERIC - Set Active Object Off'), -- 30510 GENERIC - active Self
+(30504, 0, 0, 35, 10, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'GENERIC - Send AI Event 10 (E) to Self'), -- 30502 GENERIC - Send AI Event 8 (C) to Self
+(30505, 0, 0, 35, 11, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'GENERIC - Send AI Event 11 (F) to Self'); -- 30503 GENERIC - Send AI Event 9 (D) to Self
+
diff --git a/Updates/Instances/531_temple_of_ahnqiraj.sql b/Updates/Instances/531_temple_of_ahnqiraj.sql
index a6b983f0e0..9eaaf30d00 100644
--- a/Updates/Instances/531_temple_of_ahnqiraj.sql
+++ b/Updates/Instances/531_temple_of_ahnqiraj.sql
@@ -1532,6 +1532,9 @@ INSERT INTO `creature_spawn_entry` (`guid`, `entry`) VALUES
 (@CGUID+108, 15246),(@CGUID+108, 15250), -- Qiraji Mindslayer, Qiraji Slayer
 (@CGUID+109, 15246),(@CGUID+109, 15250); -- Qiraji Mindslayer, Qiraji Slayer
 
+REPLACE INTO `creature_spawn_data_template` (`entry`, `RelayId`, `Name`) VALUES (1523001, 30598, 'Vekniss Warrior (15230) - RelayScript (30598)');
+REPLACE INTO `creature_spawn_data` (`guid`, `id`) SELECT `guid`, 1523001 FROM `creature` WHERE `guid` BETWEEN @CGUID+7 AND @CGUID+12;
+
 -- ===========
 -- GAMEOBJECTS
 -- ===========