diff --git a/devbox/devbox.local/cli/devbox b/devbox/devbox.local/cli/devbox
index e1f9b61..e140fdb 100644
--- a/devbox/devbox.local/cli/devbox
+++ b/devbox/devbox.local/cli/devbox
@@ -823,6 +823,7 @@ if [[ $USE_LOCAL_COMPONENT_VAL == true  ]]; then
       export CENTRAL_STORAGE_IMAGE_TAG="$CENTRAL_STORAGE_TAG"
       export AUTHENTICATION_IMAGE_TAG="$AUTHENTICATION_TAG"
       export NOTIFICATION_IMAGE_TAG="$NOTIFICATION_TAG"
+      export CHAT_IMAGE_TAG="$CHAT_TAG"
 
       # Check if gitea_data_backup.tar.gz exists at current script directory, if not exit
       if [[ ! -f "gitea_data_backup.tar.gz" ]]; then
diff --git a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
index 511db6d..dff71bd 100644
--- a/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
+++ b/devbox/devbox.local/cli/docker-compose.dev.arm64.new.yaml
@@ -251,7 +251,7 @@ services:
         target: /app/log/payment
   chat:
     container_name: chat
-    image: freeleaps/chat:${NOTIFICATION_IMAGE_TAG:-latest-linux-arm64}
+    image: freeleaps/chat:${CHAT_IMAGE_TAG:-latest-linux-arm64}
     platform: linux/${ARCH:-arm64}
     restart: always
     depends_on: