diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d568a3e2dee36ef3ae955ca030f5a892cf70c01d..6b69d39705cff55496c478f74424c86a83c8f8be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@ librarian:
   stage: test
   script:
     - apt-get install -y -q wget ruby git
-    - wget https://apt.puppetlabs.com/puppet5-release-xenial.deb
-    - dpkg -i puppet5-release-xenial.deb
+    - wget https://apt.puppetlabs.com/puppet6-release-bionic.deb
+    - dpkg -i puppet6-release-bionic.deb
     - apt-get update -qq && apt-get install -y -qq puppet-agent
     - gem install --no-ri --no-rdoc librarian-puppet
     - export PATH=/opt/puppetlabs/bin:$PATH
@@ -20,7 +20,7 @@ librarian:
     - librarian-puppet version
     - librarian-puppet install
     - librarian-puppet show
-  image: ubuntu:16.04
+  image: ubuntu:18.04
 
 deploy:
   stage: deploy
@@ -31,6 +31,6 @@ deploy:
     - mkdir -p ~/.ssh
     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
     - bash deploy.sh
-  image: ubuntu:16.04
+  image: ubuntu:18.04
   only:
     - master
diff --git a/README.md b/README.md
index 09c4de80a37f5fd88e8d8dbc2bb5166edb90e191..bb363a3b9721b7a29dc78d3306dda465cd184e7e 100644
--- a/README.md
+++ b/README.md
@@ -94,8 +94,8 @@ Now we need to log out and `vagrant ssh` back in to see if our changes worked. O
 
 All that is left to do now is to install puppet inside of the VM so we can provision stuff in there. We'll download and install the latest Puppet 5 repo package and use that to install puppet.
 ```
-wget https://apt.puppetlabs.com/puppet5-release-stretch.deb
-sudo dpkg -i puppet5-release-stretch.deb
+wget https://apt.puppetlabs.com/puppet6-release-buster.deb
+sudo dpkg -i puppet6-release-buster.deb
 sudo apt update
 sudo apt install puppet-agent
 ```