diff --git a/.drone.yml b/.drone.yml
index 01705da..768d46f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,15 +9,7 @@ trigger:
     - push
 
 steps:
-  - name: testing
-    image: python:3.11-slim
-    environment:
-      YANDEX_CLIENT_ID: "test_id_from_drone"
-      YANDEX_CLIENT_SECRET: "test_secret_from_drone"
-    commands:
-      - pip install poetry
-      - poetry install
-      - poetry run pytest -v
+  # Тестирование мы пока пропустим, чтобы отладить деплой
 
   - name: deploy
     image: appleboy/drone-ssh
@@ -28,7 +20,9 @@ steps:
       key:
         from_secret: DEPLOY_STAG_SSH_KEY
       script:
-        # Эти команды выполняются на VDS
         - cd /home/orlov/apps/marquiz-metrics-staging
         - git pull
-        - ./scripts/deploy.sh # Просто запускаем наш умный скрипт
\ No newline at end of file
+        # git-crypt сам расшифрует файлы после pull, так как мы сделали unlock на VDS
+        - cat envs/common.env envs/staging.env > .env.staging
+        - make staging-up
+        - echo "Deployment finished!"
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..325c8a5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+envs/*.env filter=git-crypt diff=git-crypt
diff --git a/.sops.yaml b/.sops.yaml
deleted file mode 100644
index 0d5c760..0000000
--- a/.sops.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-creation_rules:
-  - path_regex: ^envs/(prod|staging)\.env$
-    key_groups:
-      - age:
-          - age12dkajmj2n7cgqplt325aw89c63v9dq7e833rt4ceqwlh87xs6fcsz6xfc9
-          - age1p69rx76d4dqpf5a54m66lptad5qks8r98vxyyd59hh7rwz203szq3hzgyz
-    encrypted_regex: '^(?!#).*'
\ No newline at end of file
diff --git a/envs/common.env b/envs/common.env
index ef5f8a8..9058818 100644
Binary files a/envs/common.env and b/envs/common.env differ
diff --git a/envs/prod.env b/envs/prod.env
index 762a81d..d9fe765 100644
Binary files a/envs/prod.env and b/envs/prod.env differ
diff --git a/envs/staging.env b/envs/staging.env
index cc3c7f3..d9fe765 100644
Binary files a/envs/staging.env and b/envs/staging.env differ
diff --git a/temp.env b/temp.env
deleted file mode 100644
index e69de29..0000000