diff --git a/salt/qubes-builder/README.md b/salt/qubes-builder/README.md
index d5ab4096..ea27c38c 100644
--- a/salt/qubes-builder/README.md
+++ b/salt/qubes-builder/README.md
@@ -50,6 +50,12 @@ sudo qubesctl --skip-dom0 --targets=qubes-builder state.apply qubes-builder.conf
 ```
 <!-- pkg:end:post-install -->
 
+If you plan to write for a long time and analyze logs on the builder qube, it
+is recommended to install some development goodies:
+```sh
+sudo qubesctl --skip-dom0 --targets=tpl-qubes-builder state.apply qubes-builder.install-dev
+```
+
 ## Access Control
 
 The policy is based on `qubes-builderv2/rpc/50-qubesbuilder.policy`.
diff --git a/salt/qubes-builder/install-dev.sls b/salt/qubes-builder/install-dev.sls
new file mode 100644
index 00000000..52fa90f6
--- /dev/null
+++ b/salt/qubes-builder/install-dev.sls
@@ -0,0 +1,30 @@
+{#
+SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+{% if grains['nodename'] != 'dom0' -%}
+
+include:
+  - utils.tools.common.update
+  - dotfiles.copy-vim
+  - dotfiles.copy-tmux
+
+"{{ slsdotpath }}-installed-dev":
+  pkg.installed:
+    - require:
+      - sls: utils.tools.common.update
+    - install_recommends: False
+    - skip_suggestions: True
+    - pkgs:
+      - vim-enhanced
+      - tmux
+      - xclip
+      - bash-completion
+      - man-db
+      - tree
+      - ripgrep
+      - fzf
+
+{% endif -%}
diff --git a/salt/qubes-builder/install-dev.top b/salt/qubes-builder/install-dev.top
new file mode 100644
index 00000000..2a78a41d
--- /dev/null
+++ b/salt/qubes-builder/install-dev.top
@@ -0,0 +1,9 @@
+{#
+SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+#}
+
+base:
+  'tpl-qubes-builder':
+    - qubes-builder.install-dev
diff --git a/salt/qubes-builder/install.sls b/salt/qubes-builder/install.sls
index 750a049b..5a01ba47 100644
--- a/salt/qubes-builder/install.sls
+++ b/salt/qubes-builder/install.sls
@@ -1,5 +1,5 @@
 {#
-SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
+SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
 
 SPDX-License-Identifier: AGPL-3.0-or-later
 #}
@@ -27,10 +27,6 @@ include:
     - install_recommends: False
     - skip_suggestions: True
     - pkgs:
-      ## Goodies
-      - rpmautospec
-      - rpmlint
-      - vim-enhanced
       ## Minimal template dependencies
       - qubes-core-agent-networking
       - qubes-core-agent-passwordless-root