diff --git a/.github/builder-pr.ldptool.cfg b/.github/builder-pr.ldptool.cfg
deleted file mode 100644
index 6b64abf4..00000000
--- a/.github/builder-pr.ldptool.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[ldptool]
-sourcedir = /builder/src/LDP/faq/linuxdoc/,
-    /builder/src/LDP/guide/linuxdoc/,
-    /builder/src/LDP/howto/linuxdoc/,
-    /builder/src/LDP/howto/docbook/,
-    /builder/src/LDP/guide/docbook/,
-    /builder/src/LDP/ref/docbook/,
-    /builder/src/LDP/faq/docbook/
diff --git a/.github/builder.ldptool.cfg b/.github/builder.ldptool.cfg
index 4e28c01e..6b64abf4 100644
--- a/.github/builder.ldptool.cfg
+++ b/.github/builder.ldptool.cfg
@@ -1,8 +1,8 @@
 [ldptool]
-sourcedir = /home/runner/work/LDP/LDP/LDP/faq/linuxdoc/,
-    /home/runner/work/LDP/LDP/LDP/guide/linuxdoc/,
-    /home/runner/work/LDP/LDP/LDP/howto/linuxdoc/,
-    /home/runner/work/LDP/LDP/LDP/howto/docbook/,
-    /home/runner/work/LDP/LDP/LDP/guide/docbook/,
-    /home/runner/work/LDP/LDP/LDP/ref/docbook/,
-    /home/runner/work/LDP/LDP/LDP/faq/docbook/
+sourcedir = /builder/src/LDP/faq/linuxdoc/,
+    /builder/src/LDP/guide/linuxdoc/,
+    /builder/src/LDP/howto/linuxdoc/,
+    /builder/src/LDP/howto/docbook/,
+    /builder/src/LDP/guide/docbook/,
+    /builder/src/LDP/ref/docbook/,
+    /builder/src/LDP/faq/docbook/
diff --git a/.github/drone.yml b/.github/drone.yml
index edc37665..98171c4a 100644
--- a/.github/drone.yml
+++ b/.github/drone.yml
@@ -10,22 +10,46 @@ workspace:
   path: /builder/src
    
 steps:
-- name: Martin's builder
+- name: Martin's builder - Pull Request only (partial build)
   image: tldp/builder:latest
   volumes:
-  - name: LDPPRs
-    path: /builder/PRs
+  - name: LDP
+    path: /LDP
+  when:
+    event:
+      include:
+      - pull_request
   commands:
   - ldptool --dump-cfg
-  - rm -rf /builder/PRs/*
-  - mkdir -p /builder/PRs/BUILD
-  - mkdir -p /builder/PRs/MAIN
-  - ldptool --loglevel info --builddir /builder/PRs/BUILD --configfile .github/builder-pr.ldptool.cfg --pubdir /builder/PRs/MAIN --list
-  - ldptool --loglevel info --builddir /builder/PRs/BUILD --configfile .github/builder-pr.ldptool.cfg --pubdir /builder/PRs/MAIN --publish
+  - rm -rf /LDP/PR
+  - mkdir -p /LDP/PR
+  - mkdir -p /builder/src/BUILD
+  - rsync -av /LDP/en /LDP/PR
+  - ldptool --loglevel info --builddir /builder/src/BUILD --configfile .github/builder.ldptool.cfg --pubdir /builder/PR/en --list
+  - ldptool --loglevel info --builddir /builder/src/BUILD --configfile .github/builder.ldptool.cfg --pubdir /builder/PR/en --publish
+
+steps:
+- name: Martin's builder - all revieved commits (full build)
+  image: tldp/builder:latest
+  volumes:
+  - name: LDP
+    path: /LDP
+  when:
+    event:
+      exclude:
+      - pull_request
+  commands:
+  - ldptool --dump-cfg
+  - rm -rf /LDP/en
+  - mkdir -p /builder/src/BUILD
+  - ldptool --loglevel info --builddir /builder/src/BUILD --configfile .github/builder.ldptool.cfg --pubdir /LDP/en --list
+  - ldptool --loglevel info --builddir /builder/src/BUILD --configfile .github/builder.ldptool.cfg --pubdir /LDP/en --publish
+  - git rev-parse HEAD > /LDP/last-commit-id.txt
+  - date > /LDP/build-date.txt
 
 volumes:
-- name: LDPPRs
+- name: LDP
   host:
-    path: /LDP/PRs
+    path: /LDP
 
 # the happy end.