diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index a0f47e3..3687f13 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -6,6 +6,7 @@ services:
     image: mathwave/sprint-repo:queues
     networks:
       - queues-development
+      - queues-mongo-development
     environment:
       MONGO_HOST: "mongo.develop.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_DEV
@@ -20,6 +21,27 @@ services:
         parallelism: 1
         order: start-first
 
+  storage:
+    image: mongo:6.0.2
+    networks:
+      - queues-mongo-development
+    volumes:
+      - /sprint-data/queues-mongo:/data/db
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: mongo
+      MONGO_INITDB_ROOT_PASSWORD: password
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      placement:
+        constraints: [node.labels.stage == development]
+      update_config:
+        parallelism: 1
+        order: start-first 
+
 networks:
   queues-development:
     external: true
+  queues-mongo-development:
+    driver: overlay
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index b091579..7a9f041 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -6,6 +6,7 @@ services:
     image: mathwave/sprint-repo:queues
     networks:
       - queues
+      - queues-mongo-production
     environment:
       MONGO_HOST: "mongo.sprinthub.ru"
       MONGO_PASSWORD: $MONGO_PASSWORD_PROD
@@ -20,6 +21,27 @@ services:
         parallelism: 1
         order: start-first
 
+  storage:
+    image: mongo:6.0.2
+    networks:
+      - queues-mongo-production
+    volumes:
+      - /sprint-data/queues-mongo:/data/db
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: mongo
+      MONGO_INITDB_ROOT_PASSWORD: password
+    deploy:
+      mode: replicated
+      restart_policy:
+        condition: any
+      placement:
+        constraints: [node.labels.stage == development]
+      update_config:
+        parallelism: 1
+        order: start-first 
+
 networks:
   queues:
     external: true
+  queues-mongo-production:
+    driver: overlay
diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml
index 843315a..0c8a40c 100644
--- a/.gitea/workflows/deploy-dev.yaml
+++ b/.gitea/workflows/deploy-dev.yaml
@@ -26,6 +26,13 @@ jobs:
     steps:
       - name: push
         run: docker push mathwave/sprint-repo:queues
+  create_dir:
+    name: Create dir
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: create_dir
+        run: mkdir /sprint-data/queues-mongo || true
   deploy-dev:
     name: Deploy dev
     runs-on: [prod]
@@ -41,4 +48,4 @@ jobs:
         env:
           MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
           REDIS_PASSWORD_DEV: ${{ secrets.REDIS_PASSWORD_DEV }}
-        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra-development
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml queues-development
diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml
index 4ce27eb..ef145a4 100644
--- a/.gitea/workflows/deploy-prod.yaml
+++ b/.gitea/workflows/deploy-prod.yaml
@@ -26,6 +26,13 @@ jobs:
     steps:
       - name: push
         run: docker push mathwave/sprint-repo:queues
+  create_dir:
+    name: Create dir
+    runs-on: [ prod ]
+    needs: build
+    steps:
+      - name: create_dir
+        run: mkdir /sprint-data/queues-mongo || true
   deploy-prod:
     name: Deploy prod
     runs-on: [prod]
@@ -41,4 +48,4 @@ jobs:
         env:
           MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
           REDIS_PASSWORD_PROD: ${{ secrets.REDIS_PASSWORD_PROD }}
-        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml infra
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml queues