diff --git a/docs/usage.rst b/docs/usage.rst
index f1e4e5f41e73dd802f11e2062921543d3b5340c3..7861744b25c9f9c36168dbd205cc0255f4101a91 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -47,15 +47,15 @@ Pre-requisites
 
 For the set-up outlined in this usage guide you'll need the following:
 
-* One server where Ansible will be installed at. Debian Buster will
+* One server where Ansible will be installed at. Debian Bullseye will
   be installed on top of this server. The server will be set-up
   manually (this is currently out of scope for the *Majic Ansible
   Roles* automated set-up).
 * Three servers where the services will be set-up. All servers must be able to
   communicate over network with each-other, the Ansible servers, and with
-  Internet. Debian Buster will be installed on top of this server as part of the
+  Internet. Debian Bullseye will be installed on top of this server as part of the
   usage instructions.
-* Debian Buster network install CD.
+* Debian Bullseye network install CD.
 * All servers should be on the same network.
 * IP addresses for all servers should be known.
 * Netmask for all servers should be known.
@@ -131,8 +131,11 @@ packages, and to prepare the environment a bit on the Ansible server:
 
      apt-get install -y virtualenv virtualenvwrapper git python3-pip python3-dev libffi-dev libssl-dev
 
+2. Set-up loading of ``virtualenvwrapper`` via Bash completions (using the ``root`` account)::
 
-2. Set-up the virtual environment (using the ``ansible`` account):
+     ln -s /usr/share/bash-completion/completions/virtualenvwrapper /etc/bash_completion.d/virtualenvwrapper
+
+3. Set-up the virtual environment (using the ``ansible`` account):
 
    .. warning::
       If you are already logged-in as user ``ansible`` in the server, you will
@@ -425,7 +428,7 @@ You have your preseed files now, so you can go ahead and install the
 servers ``comms.example.com``, ``www.example.com``, and
 ``bak.example.com`` using them with network install CD. Have a look at
 `Debian instructions
-<https://www.debian.org/releases/buster/amd64/apb.en.html>`_ for
+<https://www.debian.org/releases/bullseye/amd64/apb.en.html>`_ for
 more details.
 
 If you need to, you can easily serve the preseed files from the Ansible server
@@ -592,7 +595,7 @@ Let's take care of this common configuration right away:
           password: "{{ 'admin' | password_hash('sha512') }}"
 
       common_packages:
-        - emacs25-nox
+        - emacs-nox
 
       ca_certificates:
         truststore: "{{ lookup('file', '~/mysite/tls/truststore.pem') }}"