diff --git a/playbooks/roles/base-server/vars/Debian.yaml b/playbooks/roles/base-server/vars/Debian.yaml
index ebacb104c2..bc89370a3c 100644
--- a/playbooks/roles/base-server/vars/Debian.yaml
+++ b/playbooks/roles/base-server/vars/Debian.yaml
@@ -1,6 +1,7 @@
 distro_packages:
   - dnsutils
   - emacs-nox
+  - yaml-mode
   - iputils-ping
   - vim-nox
   - unattended-upgrades
diff --git a/playbooks/roles/base-server/vars/Ubuntu.trusty.yaml b/playbooks/roles/base-server/vars/Ubuntu.trusty.yaml
index 949aabd6f0..f88022c010 100644
--- a/playbooks/roles/base-server/vars/Ubuntu.trusty.yaml
+++ b/playbooks/roles/base-server/vars/Ubuntu.trusty.yaml
@@ -1,6 +1,7 @@
 distro_packages:
   - dnsutils
   - emacs23-nox
+  - yaml-mode
   - iputils-ping
   - vim-nox
   - unattended-upgrades
diff --git a/playbooks/roles/base-server/vars/Ubuntu.xenial.yaml b/playbooks/roles/base-server/vars/Ubuntu.xenial.yaml
index 93d87364d2..f6ea54757c 100644
--- a/playbooks/roles/base-server/vars/Ubuntu.xenial.yaml
+++ b/playbooks/roles/base-server/vars/Ubuntu.xenial.yaml
@@ -1,6 +1,7 @@
 distro_packages:
   - dnsutils
   - emacs-nox
+  - yaml-mode
   - iputils-ping
   - vim-nox
   - unattended-upgrades