diff --git a/.drone.yml b/.drone.yml
index d9cf65e..7a4b8c2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,6 +21,14 @@ steps:
       - cd frontend
       - npm ci --silent
       - npm run build
+      - npm run lint || echo "ESLint warnings found"
+
+  - name: frontend-security
+    image: node:20-alpine
+    commands:
+      - cd frontend
+      - npm ci --silent
+      - npm audit --audit-level=moderate || echo "Security warnings found"
 
 ---
 kind: pipeline
@@ -47,7 +55,9 @@ steps:
       repo: registry.nevetime.ru/mc-panel-backend
       tags:
         - latest
-        - ${DRONE_BUILD_NUMBER}
+        - "${DRONE_BUILD_NUMBER}"
+        - "${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH}"
       auto_tag: true
       dockerfile: backend/Dockerfile
       context: backend
@@ -63,7 +73,9 @@ steps:
       repo: registry.nevetime.ru/mc-panel-frontend
       tags:
         - latest
-        - ${DRONE_BUILD_NUMBER}
+        - "${DRONE_BUILD_NUMBER}"
+        - "${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH}"
       auto_tag: true
       dockerfile: frontend/Dockerfile
       context: frontend
@@ -71,3 +83,54 @@ steps:
         from_secret: docker_username
       password:
         from_secret: docker_password
+      build_args:
+        - BUILD_DATE=${DRONE_BUILD_CREATED}
+        - VCS_REF=${DRONE_COMMIT_SHA}
+        - VERSION=${DRONE_TAG:-${DRONE_BRANCH}}
+    when:
+      event:
+        - push
+        - tag
+
+---
+kind: pipeline
+type: docker
+name: build-monolith
+
+trigger:
+  branch:
+    - main
+    - master
+    - develop
+  event:
+    - push
+    - tag
+
+depends_on:
+  - code-quality
+
+steps:
+  - name: build-monolith-image
+    image: plugins/docker
+    settings:
+      registry: registry.nevetime.ru
+      repo: registry.nevetime.ru/mc-panel
+      tags:
+        - latest
+        - "${DRONE_COMMIT_SHA:0:8}"
+        - "${DRONE_BRANCH}"
+      auto_tag: true
+      dockerfile: Dockerfile
+      context: .
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - BUILD_DATE=${DRONE_BUILD_CREATED}
+        - VCS_REF=${DRONE_COMMIT_SHA}
+        - VERSION=${DRONE_TAG:-${DRONE_BRANCH}}
+    when:
+      event:
+        - push
+        - tag