diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 37f2af9b7..b3611ade6 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -57,6 +57,7 @@ jobs:
           DOCKER_CLIENT_TIMEOUT: 400
           COMPOSE_HTTP_TIMEOUT: 400
         run: |
+          export CACHEBUST=$EPOCHSECONDS
           export DOCKER_USER_ID=$(id -u)
           export DOCKER_GROUP_ID=$(id -u)
           # pull the images first to load the docker cache layers
diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile
index 97aed784e..2919700ed 100644
--- a/apps/docker/Dockerfile
+++ b/apps/docker/Dockerfile
@@ -283,6 +283,7 @@ ENV DATAPATH=/azerothcore/env/dist/data
 ENV DATAPATH_ZIP=/tmp/data.zip
 
 RUN mkdir -p "$DATAPATH"
+ARG CACHEBUST=1
 RUN --mount=type=bind,target=/azerothcore-temp,readwrite --mount=type=cache,target=/azerothcore/env/dist/data /azerothcore-temp/acore.sh client-data && chown -R $DOCKER_USER:$DOCKER_USER /azerothcore
 
 USER $DOCKER_USER
diff --git a/docker-compose.yml b/docker-compose.yml
index 416d424a5..e4d428244 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -364,6 +364,7 @@ services:
         USER_ID: ${DOCKER_USER_ID:-1000}
         GROUP_ID: ${DOCKER_GROUP_ID:-1000}
         DOCKER_USER: ${DOCKER_USER:-acore}
+        CACHEBUST: ${CACHEBUST:-1}
       <<: *cache-from
     volumes:
       - ${DOCKER_VOL_CLIENT_DATA_PROD:-ac-client-data-prod}:/azerothcore/env/dist/data:ro