diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3428fbf5980527ff40ccb49db2b38da51133befc..205bedaf0b86d05a8f87ffcf368d6024d2fd57cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,11 @@ docs:
   stage: "build"
   script:
     - "nix-shell --run 'nix-build docs.nix'"
+    - "cp --recursive --no-preserve=mode result/docs/. docs/build/"
+  artifacts:
+    paths:
+      - "docs/build/"
+    expose_as: "documentation"
 
 unit-tests:
   stage: "test"
diff --git a/README.rst b/README.rst
index d9e3e310ec775cbaec28019360befbcb535db9f6..d3d9f088db4f8b976f3f55852715762280bb93c0 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,6 @@ Documentation
 
 There is documentation for:
 
-* Users: ``docs/user/README.rst``
 * Operators/Admins: ``docs/ops/README.rst``
 * Developers: ``docs/dev/README.rst``
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 6ae149f7ce9845d877c953f3e095edba02455765..eb6b59ec783b8aa6dfb3227ca51fe47e5f1b6bc7 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -11,7 +11,6 @@ Howdy!  We separated the documentation into parts addressing different audiences
 .. toctree::
    :maxdepth: 2
 
-   Users <user/README>
    Administrators <ops/README>
    Developers <dev/README>
 
diff --git a/docs/source/user/README.rst b/docs/source/user/README.rst
deleted file mode 100644
index 2a6e4b912cb6dfafb250149eb8aab095c34ce023..0000000000000000000000000000000000000000
--- a/docs/source/user/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-User documentation
-==================
-
-This will contain the user documentation for this project.
-
diff --git a/morph/grid/local/README.rst b/morph/grid/local/README.rst
index 1552b996be8aea930de78d2e458b31c7339e3d2f..0920afa4d31e91bcd0450493093131979234b1ba 100644
--- a/morph/grid/local/README.rst
+++ b/morph/grid/local/README.rst
@@ -26,17 +26,11 @@ One possible way to do it in NixOS:
 Pre-Vagrant 2.2.16: Get Vagrant with the required fixes for NixOS guests
 ````````````````````````````````````````````````````````````````````````
 
-The Vagrant nixos-guest template `received a critical update on 2021-03-08 <https://github.com/hashicorp/vagrant/commit/990d94ed9d0b3092e855bc1bb9deeeb7aa7792cf>`_ which is going to be in version 2.2.16 once it's out.
+The Vagrant nixos-guest template `received a critical update on 2021-03-08 <https://github.com/hashicorp/vagrant/commit/990d94ed9d0b3092e855bc1bb9deeeb7aa7792cf>`_ which came out with Vagrant version 2.2.16.
 
-Retrieve and use the latest Vagrant development version locally::
+If you run an older Nixpkgs, retrieve and use the latest Vagrant development version like so::
 
-  git clone ssh://git@github.com/hashicorp/vagrant.git
-  cd vagrant/
-  nix-shell -p gcc gnumake git gnutar curl ruby
-  bundle install
-  bundle --binstubs exec
-  cd exec/
-  export PATH=`pwd`:$PATH
+  NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/master.tar.gz nix-shell -p vagrant
 
 
 Generating and deploying keys
@@ -82,7 +76,7 @@ Use the local development environment
 
 Build and start the VMs::
 
-  vagrant up
+  VAGRANT_DEFAULT_PROVIDER=virtualbox vagrant up
 
 Then::