diff --git a/frontend/.woodpecker.yaml b/.woodpecker.yaml
similarity index 54%
rename from frontend/.woodpecker.yaml
rename to .woodpecker.yaml
index e4cfaa3..47f62a2 100644
--- a/frontend/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -13,13 +13,26 @@ steps:
       - export SHORT_SHA=${CI_COMMIT_SHA:0:7}
       - echo "TAGS=latest,$TAG_DATE-$SHORT_SHA" > .tags.env
 
-  - name: docker
+  - name: build-frontend
     image: woodpeckerci/plugin-docker
     settings:
       repo: harbor.dvirlabs.com/my-apps/navix-frontend
       tag_file: .tags.env
-      dockerfile: Dockerfile
-      context: .
+      dockerfile: frontend/Dockerfile
+      context: frontend
+      registry: harbor.dvirlabs.com
+      username:
+        from_secret: harbor_user
+      password:
+        from_secret: harbor_password
+
+  - name: build-backend
+    image: woodpeckerci/plugin-docker
+    settings:
+      repo: harbor.dvirlabs.com/my-apps/navix-backend
+      tag_file: .tags.env
+      dockerfile: backend/Dockerfile
+      context: backend
       registry: harbor.dvirlabs.com
       username:
         from_secret: harbor_user
diff --git a/backend/.woodpecker.yaml b/backend/.woodpecker.yaml
deleted file mode 100644
index b713f94..0000000
--- a/backend/.woodpecker.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-when:
-  event:
-    - push
-    - pull_request
-  branch:
-    - master
-
-steps:
-  - name: tag
-    image: alpine
-    commands:
-      - export TAG_DATE=$(date +%Y%m%d)
-      - export SHORT_SHA=${CI_COMMIT_SHA:0:7}
-      - echo "TAGS=latest,$TAG_DATE-$SHORT_SHA" > .tags.env
-
-  - name: docker
-    image: woodpeckerci/plugin-docker
-    settings:
-      repo: harbor.dvirlabs.com/my-apps/navix-backend
-      tag_file: .tags.env
-      dockerfile: Dockerfile
-      context: .
-      registry: harbor.dvirlabs.com
-      username:
-        from_secret: harbor_user
-      password:
-        from_secret: harbor_password