diff --git a/.woodpecker/pr.yml b/.woodpecker/pr.yml
index 7fb2d0e..de83631 100644
--- a/.woodpecker/pr.yml
+++ b/.woodpecker/pr.yml
@@ -12,19 +12,9 @@ clone:
       lfs: false
 
 steps:
-  - name: restore
+  - name: build-and-test
     image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - dotnet restore
-
-  - name: build
-    image: mcr.microsoft.com/dotnet/sdk:10.0
-    commands:
-      - dotnet build --no-restore -c Release
-    depends_on: [restore]
-
-  - name: test
-    image: mcr.microsoft.com/dotnet/sdk:10.0
-    commands:
-      - dotnet test --no-build -c Release --logger "console;verbosity=detailed"
-    depends_on: [build]
+      - dotnet build -c Release
+      - dotnet test -c Release --logger "console;verbosity=detailed"
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
index 61344fe..30f6eaa 100644
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -15,22 +15,12 @@ clone:
       tags: true
 
 steps:
-  - name: restore
+  - name: build-and-test
     image: mcr.microsoft.com/dotnet/sdk:10.0
     commands:
       - dotnet restore
-
-  - name: build
-    image: mcr.microsoft.com/dotnet/sdk:10.0
-    commands:
-      - dotnet build --no-restore -c Release
-    depends_on: [restore]
-
-  - name: test
-    image: mcr.microsoft.com/dotnet/sdk:10.0
-    commands:
-      - dotnet test --no-build -c Release --logger "console;verbosity=detailed"
-    depends_on: [build]
+      - dotnet build -c Release
+      - dotnet test -c Release --logger "console;verbosity=detailed"
 
   # Determine next version based on conventional commits
   - name: version
@@ -87,7 +77,7 @@ steps:
         # Save version for other steps
         echo "$NEW_VERSION" > .version
         echo "v${NEW_VERSION}" > .tag
-    depends_on: [test]
+    depends_on: [build-and-test]
 
   # Package NuGet
   - name: package
@@ -95,7 +85,9 @@ steps:
     commands:
       - VERSION=$(cat .version)
       - echo "Packaging version $VERSION"
-      - dotnet pack PaperlessMCP/PaperlessMCP.csproj --no-build -c Release -o ./artifacts /p:Version=$VERSION /p:PackageVersion=$VERSION
+      - dotnet restore
+      - dotnet build -c Release
+      - dotnet pack PaperlessMCP/PaperlessMCP.csproj -c Release -o ./artifacts /p:Version=$VERSION /p:PackageVersion=$VERSION
       - ls -la ./artifacts/
     depends_on: [version]