diff --git a/.woodpecker.yml b/.woodpecker.yml
deleted file mode 100644
index d1ab0b8..0000000
--- a/.woodpecker.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-when:
-  - event: [push, manual]
-    branch: main
-
-steps:
-  - name: build-api
-    image: docker:24-dind
-    commands:
-      - docker build -t registry.mcrn.ar/unt/api:latest -f ctrl/Dockerfile.api .
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-
-  - name: build-ui
-    image: docker:24-dind
-    commands:
-      - docker build -t registry.mcrn.ar/unt/ui:latest -f ctrl/Dockerfile.ui .
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
new file mode 100644
index 0000000..d15345e
--- /dev/null
+++ b/.woodpecker/build.yml
@@ -0,0 +1,28 @@
+# UNT (NOVA) Pipeline
+
+when:
+  - event: push
+  - event: manual
+
+steps:
+  - name: build-api
+    image: plugins/docker
+    settings:
+      repo: registry.mcrn.ar/unt/api
+      registry: registry.mcrn.ar
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+      dockerfile: ctrl/Dockerfile.api
+      context: .
+
+  - name: build-ui
+    image: plugins/docker
+    settings:
+      repo: registry.mcrn.ar/unt/ui
+      registry: registry.mcrn.ar
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+      dockerfile: ctrl/Dockerfile.ui
+      context: .