diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index d99ba82878c..7dd7b657708 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -47,14 +47,6 @@ jobs:
         with:
           install: true
 
-      - name: Cache Docker layers
-        uses: actions/cache@main
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-x86-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-x86-
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
@@ -109,14 +101,6 @@ jobs:
         with:
           install: true
 
-      - name: Cache Docker layers
-        uses: actions/cache@main
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-arm-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-arm-
-
       - name: Build
         uses: docker/build-push-action@v3.2.0
         with:
diff --git a/data-otservbr-global/scripts/lib/monster_functions.lua b/data-otservbr-global/scripts/lib/monster_functions.lua
index cdb56c5e177..0b362de27a9 100644
--- a/data-otservbr-global/scripts/lib/monster_functions.lua
+++ b/data-otservbr-global/scripts/lib/monster_functions.lua
@@ -1,7 +1,7 @@
 function Monster:handleCobraOnSpawn()
 	if Game.getStorageValue(Global.Storage.CobraFlask) >= os.time() then
-		monster:setHealth(monster:getMaxHealth() * 0.75)
-		monster:getPosition():sendMagicEffect(CONST_ME_GREEN_RINGS)
+		self:setHealth(self:getMaxHealth() * 0.75)
+		self:getPosition():sendMagicEffect(CONST_ME_GREEN_RINGS)
 	else
 		Game.setStorageValue(Global.Storage.CobraFlask, -1)
 	end
diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm
index ef159ba142f..2fca1b525a0 100644
--- a/docker/Dockerfile.arm
+++ b/docker/Dockerfile.arm
@@ -1,5 +1,5 @@
 # Stage 1: Download all dependencies
-FROM ubuntu:23.04 AS dependencies
+FROM ubuntu:24.04 AS dependencies
 
 RUN apt-get update && apt-get install -y --no-install-recommends cmake git \
 	unzip build-essential ca-certificates curl zip unzip tar \
@@ -30,7 +30,7 @@ WORKDIR /srv
 RUN export VCPKG_ROOT=/opt/vcpkg/ && VCPKG_FORCE_SYSTEM_BINARIES=1 cmake --preset linux-release && cmake --build --preset linux-release
 
 # Stage 3: load data and execute
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 
 VOLUME [ "/data" ]
 
diff --git a/docker/Dockerfile.x86 b/docker/Dockerfile.x86
index 3b035ecfd37..9e75c1078dd 100644
--- a/docker/Dockerfile.x86
+++ b/docker/Dockerfile.x86
@@ -1,5 +1,5 @@
 # Stage 1: Download all dependencies
-FROM ubuntu:23.04 AS dependencies
+FROM ubuntu:24.04 AS dependencies
 
 RUN apt-get update && apt-get install -y --no-install-recommends cmake git \
 	unzip build-essential ca-certificates curl zip unzip tar \
@@ -30,7 +30,7 @@ WORKDIR /srv
 RUN export VCPKG_ROOT=/opt/vcpkg/ && cmake --preset linux-release && cmake --build --preset linux-release
 
 # Stage 3: load data and execute
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 VOLUME [ "/data" ]
 
 COPY --from=build /srv/build/linux-release/bin/canary /bin/canary
diff --git a/src/game/game.cpp b/src/game/game.cpp
index e91bf608064..3196910e172 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -72,7 +72,7 @@
 
 #include <appearances.pb.h>
 
-std::vector<std::shared_ptr<Creature>> checkCreatureLists[EVENT_CREATURECOUNT];
+std::vector<std::weak_ptr<Creature>> checkCreatureLists[EVENT_CREATURECOUNT];
 
 namespace InternalGame {
 	void sendBlockEffect(BlockType_t blockType, CombatType_t combatType, const Position &targetPos, const std::shared_ptr<Creature> &source) {
@@ -6466,16 +6466,15 @@ void Game::addCreatureCheck(const std::shared_ptr<Creature> &creature) {
 
 	creature->creatureCheck.store(true);
 
-	if (creature->inCheckCreaturesVector.load()) {
+	if (creature->inCheckCreaturesVector.exchange(true)) {
 		// already in a vector
 		return;
 	}
 
-	creature->inCheckCreaturesVector.store(true);
-
-	creature->safeCall([this, creature] {
-		checkCreatureLists[uniform_random(0, EVENT_CREATURECOUNT - 1)].emplace_back(creature);
-	});
+	g_dispatcher().addEvent([this, index = uniform_random(0, EVENT_CREATURECOUNT - 1), creature] {
+		checkCreatureLists[index].emplace_back(creature);
+	},
+	                        "Game::addCreatureCheck");
 }
 
 void Game::removeCreatureCheck(const std::shared_ptr<Creature> &creature) {
@@ -6489,15 +6488,18 @@ void Game::checkCreatures() {
 	metrics::method_latency measure(__METRICS_METHOD_NAME__);
 	static size_t index = 0;
 
-	std::erase_if(checkCreatureLists[index], [this](const std::shared_ptr<Creature> creature) {
-		if (creature->creatureCheck && creature->isAlive()) {
-			creature->onThink(EVENT_CREATURE_THINK_INTERVAL);
-			creature->onAttacking(EVENT_CREATURE_THINK_INTERVAL);
-			creature->executeConditions(EVENT_CREATURE_THINK_INTERVAL);
-			return false;
+	std::erase_if(checkCreatureLists[index], [this](const std::weak_ptr<Creature> &weak) {
+		if (const auto creature = weak.lock()) {
+			if (creature->creatureCheck && creature->isAlive()) {
+				creature->onThink(EVENT_CREATURE_THINK_INTERVAL);
+				creature->onAttacking(EVENT_CREATURE_THINK_INTERVAL);
+				creature->executeConditions(EVENT_CREATURE_THINK_INTERVAL);
+				return false;
+			}
+
+			creature->inCheckCreaturesVector = false;
 		}
 
-		creature->inCheckCreaturesVector = false;
 		return true;
 	});
 
diff --git a/src/game/scheduling/task.hpp b/src/game/scheduling/task.hpp
index c01dbe2f676..6cd9eef342d 100644
--- a/src/game/scheduling/task.hpp
+++ b/src/game/scheduling/task.hpp
@@ -75,6 +75,7 @@ class Task {
 			"Game::createInfluencedMonsters",
 			"Game::updateCreatureWalk",
 			"Game::updateForgeableMonsters",
+			"Game::addCreatureCheck",
 			"GlobalEvents::think",
 			"LuaEnvironment::executeTimerEvent",
 			"Modules::executeOnRecvbyte",