diff --git a/roles/debian/tasks/build-env.yml b/roles/debian/tasks/build-env.yml
new file mode 100644
index 0000000..d192bc6
--- /dev/null
+++ b/roles/debian/tasks/build-env.yml
@@ -0,0 +1,16 @@
+---
+- name: Install build environment packages
+  become: true
+  apt:
+    name: '{{ packages }}'
+    state: present
+    force_apt_get: yes
+  vars:
+    packages:
+      - build-essential
+      - debhelper
+      - debootstrap
+      - devscripts
+      - dh-make
+      - fakeroot
+      - pbuilder
diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml
index 7a4d7a9..e18e082 100644
--- a/roles/debian/tasks/main.yml
+++ b/roles/debian/tasks/main.yml
@@ -2,6 +2,7 @@
 - include: packages-cli.yml
 - include: packages-gui.yml
   when: gui == true
+- include: build-env.yml
 - include: modules.yml
 - include: ssh.yml
 - include: solokeys.yml
diff --git a/roles/debian/tasks/packages-cli.yml b/roles/debian/tasks/packages-cli.yml
index cb5f98e..d629de8 100644
--- a/roles/debian/tasks/packages-cli.yml
+++ b/roles/debian/tasks/packages-cli.yml
@@ -10,19 +10,14 @@
       - apt-file
       - ansible
       - asciidoctor
-      - build-essential
       - clang
       - clang-format
       - console-data
       - curl
       - dc
-      - debhelper
-      - devscripts
-      - dh-make
       - dnsutils
       - exfat-fuse
       - exfat-utils
-      - fakeroot
       - git
       - gnupg
       - groff
diff --git a/roles/home-cli/files/pbuilderrc b/roles/home-cli/files/pbuilderrc
new file mode 100644
index 0000000..746a34c
--- /dev/null
+++ b/roles/home-cli/files/pbuilderrc
@@ -0,0 +1,4 @@
+AUTO_DEBSIGN=${AUTO_DEBSIGN:-no}
+HOOKDIR=/var/cache/pbuilder/hooks
+DISTRIBUTION=${DISTRIBUTION:-stable}
+DEBOOTSTRAPOPTS=( '--variant=buildd' )
diff --git a/roles/home-cli/tasks/dotfiles.yml b/roles/home-cli/tasks/dotfiles.yml
index e4d074d..fc7d42c 100644
--- a/roles/home-cli/tasks/dotfiles.yml
+++ b/roles/home-cli/tasks/dotfiles.yml
@@ -19,3 +19,7 @@
   copy:
     src: openpgp.asc
     dest: "{{ ansible_env.HOME }}/.config/openpgp.asc"
+- name: Copy .pbuilderrc
+  copy:
+    src: pbuilderrc
+    dest: "{{ ansible_env.HOME }}/.pbuilderrc"