diff --git a/puppetserver/Dockerfile b/puppetserver/Dockerfile
index cea524ad..d8cd733f 100644
--- a/puppetserver/Dockerfile
+++ b/puppetserver/Dockerfile
@@ -89,18 +89,8 @@ RUN chmod +x /docker-entrypoint.sh /healthcheck.sh /docker-entrypoint.d/*.sh &&
 
 FROM base as release
 
-ARG PUPPET_RELEASE
-ENV PUPPET_RELEASE=${PUPPET_RELEASE:-7}
-
-ARG PUPPETSERVER_VERSION
-ENV PUPPETSERVER_VERSION=${PUPPETSERVER_VERSION:-7.13.0}
-
-ARG R10K_VERSION
-ENV R10K_VERSION=${R10K_VERSION:-4.1.0}
-
-ARG RUGGED_VERSION
-ENV RUGGED_VERSION=${RUGGED_VERSION:-1.7.2}
-
+ARG PUPPET_RELEASE=8
+ARG PUPPETSERVER_VERSION=8.6.1
 ARG UBUNTU_CODENAME
 
 ######################################################