diff --git a/README.md b/README.md
index 414babc..bd0f1c1 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ Basic manual compilation and run:
         </li>
         <li>
         Mqtt broker:
-            <pre>user@user-laptop:~$ cd oktopus/backend/services/mochi/ && go run cmd/main.go -redis "127.0.0.1:6379"</pre>
+            <pre>user@user-laptop:~$ cd oktopus/backend/services/mqtt/ && go run cmd/main.go -redis "127.0.0.1:6379"</pre>
         </li>
         <li>
         TR-369 controller:
diff --git a/backend/services/http_file_server/.env b/backend/services/file_server/.env
similarity index 100%
rename from backend/services/http_file_server/.env
rename to backend/services/file_server/.env
diff --git a/backend/services/http_file_server/.gitignore b/backend/services/file_server/.gitignore
similarity index 100%
rename from backend/services/http_file_server/.gitignore
rename to backend/services/file_server/.gitignore
diff --git a/backend/services/http_file_server/go.mod b/backend/services/file_server/go.mod
similarity index 100%
rename from backend/services/http_file_server/go.mod
rename to backend/services/file_server/go.mod
diff --git a/backend/services/http_file_server/go.sum b/backend/services/file_server/go.sum
similarity index 100%
rename from backend/services/http_file_server/go.sum
rename to backend/services/file_server/go.sum
diff --git a/backend/services/http_file_server/main.go b/backend/services/file_server/main.go
similarity index 100%
rename from backend/services/http_file_server/main.go
rename to backend/services/file_server/main.go
diff --git a/backend/services/mochi/.gitignore b/backend/services/mqtt/.gitignore
similarity index 100%
rename from backend/services/mochi/.gitignore
rename to backend/services/mqtt/.gitignore
diff --git a/backend/services/mochi/cmd/auth.json b/backend/services/mqtt/cmd/auth.json
similarity index 100%
rename from backend/services/mochi/cmd/auth.json
rename to backend/services/mqtt/cmd/auth.json
diff --git a/backend/services/mochi/cmd/main.go b/backend/services/mqtt/cmd/main.go
similarity index 100%
rename from backend/services/mochi/cmd/main.go
rename to backend/services/mqtt/cmd/main.go
diff --git a/backend/services/mochi/cmd/run.sh b/backend/services/mqtt/cmd/run.sh
similarity index 100%
rename from backend/services/mochi/cmd/run.sh
rename to backend/services/mqtt/cmd/run.sh
diff --git a/backend/services/mochi/go.mod b/backend/services/mqtt/go.mod
similarity index 100%
rename from backend/services/mochi/go.mod
rename to backend/services/mqtt/go.mod
diff --git a/backend/services/mochi/go.sum b/backend/services/mqtt/go.sum
similarity index 100%
rename from backend/services/mochi/go.sum
rename to backend/services/mqtt/go.sum
diff --git a/deploy/compose/docker-compose.yaml b/deploy/compose/docker-compose.yaml
index 6cdf0f8..8ef0e27 100644
--- a/deploy/compose/docker-compose.yaml
+++ b/deploy/compose/docker-compose.yaml
@@ -1,22 +1,33 @@
 services:
 
-  oktopustr369:
-      image: 'golang:1.21.4'
-      container_name: oktopustr369
-      tty: true
-      stdin_open: true
-      volumes:
-      - ../:/app/oktopus
-      command: bash -c "cd /app/oktopus/backend/services/controller && go run cmd/oktopus/main.go -mongo mongodb://172.16.235.2:27017 -a 172.16.235.4 -p 1883 -ws_addr 172.16.235.8"
-      ports:
-      - 8000:8000
-      depends_on:
-      - mongodb
-      - mochi
-      - websockets
-      networks:
-        usp_network:
-          ipv4_address: 172.16.235.7
+  controller:
+    image: 'golang:1.21.4'
+    container_name: controlller
+    tty: true
+    stdin_open: true
+    volumes:
+    - ../:/app/oktopus
+    command: bash -c "cd /app/oktopus/backend/services/controller && go run cmd/oktopus/main.go -mongo mongodb://172.16.235.2:27017 -a 172.16.235.4 -p 1883 -ws_addr 172.16.235.8"
+    ports:
+    - 8000:8000
+    depends_on:
+    - mongodb
+    - mqtt
+    - websockets
+    networks:
+      usp_network:
+        ipv4_address: 172.16.235.7
+  
+  nats:
+    image: 'nats:latest'
+    container_name: nats
+    ports:
+      - 4222:4222
+      - 8222:8222
+    command: -n oktopus -m 8222 -js
+    networks:
+      usp_network:
+        ipv4_address: 172.16.235.9
 
   mongodb:
     image: mongo
@@ -32,14 +43,14 @@ services:
       usp_network:
         ipv4_address: 172.16.235.3
 
-  mochi:
+  mqtt:
     image: 'golang:1.21.4'
-    container_name: mochi
+    container_name: mqtt
     tty: true
     stdin_open: true
     volumes:
     - ../:/app/oktopus
-    command: bash -c "cd /app/oktopus/backend/services/mochi/cmd/ && go run main.go -redis 'redis:6379' -info :8081"
+    command: bash -c "cd /app/oktopus/backend/services/mqtt/cmd/ && go run main.go -redis 'redis:6379' -info :8081"
     ports:
     - 1883:1883
     depends_on: