diff --git a/.dockerignore b/.dockerignore
index cee41da..ee04980 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,15 @@
-
-node_modules
-dist
-.git
-.env
-.DS_Store
-backend.log
-ngrok.log
-backend-go/server.exe
-backend-go/server
+node_modules/
+dist/
+.git/
+.gitignore
+.env
+.DS_Store
+*.log
+*.pid
+frontend.pid
+backend.pid
+nul
+backend-go/
+data/
+cache/
+backend-rust/target/
diff --git a/backend-rust/Cargo.lock b/backend-rust/Cargo.lock
index c40d3a8..29c38c0 100644
--- a/backend-rust/Cargo.lock
+++ b/backend-rust/Cargo.lock
@@ -289,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "libc"
diff --git a/backend-rust/Cargo.toml b/backend-rust/Cargo.toml
index df56744..8702145 100644
--- a/backend-rust/Cargo.toml
+++ b/backend-rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "backend-rust"
 version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [[bin]]
 name = "backend-rust"
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f53c9f..85207d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,24 @@
 services:
   spotify-clone:
+<<<<<<< HEAD
     image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v3
+=======
+    image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v5
+>>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
     container_name: spotify-clone
     restart: unless-stopped
     ports:
       - "3110:8080"
     environment:
       - PORT=8080
+<<<<<<< HEAD
     volumes:
       - ./data:/tmp/spotify-clone-downloads
+=======
+      - RUST_ENV=production
+    volumes:
+      - ./data:/app/data
+>>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
       - ./cache:/tmp/spotify-clone-cache
     logging:
       driver: "json-file"