diff --git a/.woodpecker.yml b/.woodpecker.yml
index c62ff76..3f737ca 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,5 +1,46 @@
 steps:
   build:
+    image: golang:1.22.5-alpine3.20
+    commands:
+      - cd src/udi
+      - go build -a -installsuffix nocgo -o udi main.go
+      - cp udi ../..
+
+  scan:
+    image: quay.io/wollud1969/woodpecker-helper:0.5.1
+    environment:
+      TRIVY_TOKEN:
+        from_secret: trivy_token
+      TRIVY_URL:
+        from_secret: trivy_url
+      DTRACK_API_KEY:
+        from_secret: dtrack_api_key
+      DTRACK_API_URL:
+        from_secret: dtrack_api_url
+    commands:
+      - HOME=/home/`id -nu`
+      - |
+        trivy fs \
+              --server $TRIVY_URL \
+              --token $TRIVY_TOKEN \
+              --format cyclonedx \
+              --scanners license \
+              --output sbom.xml \
+              .        
+      - cat /tmp/sbom.xml
+      - |
+        curl -X "POST" \
+             -H "Content-Type: multipart/form-data" \
+             -H "X-Api-Key: $DTRACK_API_KEY" \
+             -F "autoCreate=true" \
+             -F "projectName=$CI_REPO" \
+             -F "projectVersion=$CI_COMMIT_SHA" \
+             -F "bom=@sbom.xml"\
+             "$DTRACK_API_URL/api/v1/bom"        
+    when:
+      - event: [push, tag]
+
+  dockerize:
     image: plugins/kaniko
     settings:
       repo: ${FORGE_NAME}/${CI_REPO}
@@ -14,39 +55,6 @@ steps:
     when:
       - event: [push, tag]
 
-  generate_sbom:
-    image: aquasec/trivy:latest
-    environment:
-      TRIVY_TOKEN:
-        from_secret: trivy_token
-      TRIVY_URL:
-        from_secret: trivy_url
-    commands:
-      - trivy fs --server $TRIVY_URL --token $TRIVY_TOKEN --format cyclonedx --scanners license --output /woodpecker/sbom.xml .
-    when:
-      - event: [push, tag]
-
-  upload_sbom:
-    image: quay.io/wollud1969/woodpecker-helper:0.5.1
-    environment:
-      DTRACK_API_KEY:
-        from_secret: dtrack_api_key
-      DTRACK_API_URL:
-        from_secret: dtrack_api_url
-    commands:
-      - cat /woodpecker/sbom.xml
-      - |
-        curl -X "POST" \
-             -H "Content-Type: multipart/form-data" \
-             -H "X-Api-Key: $DTRACK_API_KEY" \
-             -F "autoCreate=true" \
-             -F "projectName=$CI_REPO" \
-             -F "projectVersion=$CI_COMMIT_SHA" \
-             -F "bom=@/woodpecker/sbom.xml"\
-             "$DTRACK_API_URL/api/v1/bom"
-    when:
-      - event: [push, tag]
-
   deploy:
     image: quay.io/wollud1969/woodpecker-helper:0.5.1
     environment:
diff --git a/Dockerfile b/Dockerfile
index 082e4fb..fe4be88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,8 @@
-FROM golang:1.22.5-alpine3.20 as builder
-
-RUN mkdir -p /go/src
-COPY ./src/ /go/src
-WORKDIR /go/src/udi
-RUN go build -a -installsuffix nocgo -o udi main.go
-
-
 FROM scratch
 
 ENV UDI_CONF ""
 
-COPY --from=builder /go/src/udi ./
+COPY udi ./
+
 ENTRYPOINT ["./udi"]