diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
index ad8052e..0231f29 100644
--- a/.github/workflows/acceptance.yml
+++ b/.github/workflows/acceptance.yml
@@ -11,7 +11,7 @@ jobs:
       uses: actions/checkout@v2
     - name: Run install script 
       run: |  
-        sudo bash ./install_puppet_7_agent.sh
+        sudo bash ./install_puppet_8_agent.sh
     - name: Test puppet is installed
       run: |
         /opt/puppetlabs/bin/puppet --version
\ No newline at end of file
diff --git a/README.md b/README.md
index 43c2548..a597aca 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,12 @@ Puppet > 7.X
 $ wget -O - https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_7_agent.sh | sudo sh
 ```
 
+
+Puppet > 8.X
+```
+$ wget -O - https://raw.githubusercontent.com/petems/puppet-install-shell/master/install_puppet_8_agent.sh | sudo sh
+```
+
 ## Running Acceptance Tests
 
 Pick an Operating System then run the rake helper:
diff --git a/install_puppet_8_agent.sh b/install_puppet_8_agent.sh
new file mode 100755
index 0000000..5cd11bf
--- /dev/null
+++ b/install_puppet_8_agent.sh
@@ -0,0 +1,554 @@
+#!/bin/sh
+# WARNING: REQUIRES /bin/sh
+#
+# Install puppet-agent with shell... how hard can it be?
+#
+# 0.0.1a - Here Be Dragons
+#
+
+# Set up colours
+if tty -s;then
+    RED=${RED:-$(tput setaf 1)}
+    GREEN=${GREEN:-$(tput setaf 2)}
+    YLW=${YLW:-$(tput setaf 3)}
+    BLUE=${BLUE:-$(tput setaf 4)}
+    RESET=${RESET:-$(tput sgr0)}
+else
+    RED=
+    GREEN=
+    YLW=
+    BLUE=
+    RESET=
+fi
+
+# Timestamp
+now () {
+    date +'%H:%M:%S %z'
+}
+
+# Logging functions instead of echo
+log () {
+    echo "${BLUE}`now`${RESET} ${1}"
+}
+
+info () {
+    log "${GREEN}INFO${RESET}: ${1}"
+}
+
+warn () {
+    log "${YLW}WARN${RESET}: ${1}"
+}
+
+critical () {
+    log "${RED}CRIT${RESET}: ${1}"
+}
+
+utopic () {
+    warn "There is no utopic release yet, see https://tickets.puppetlabs.com/browse/CPR-92 for progress";
+    warn "We'll use the trusty package for now";
+    deb_codename="trusty";
+}
+
+# Check whether a command exists - returns 0 if it does, 1 if it does not
+exists() {
+  if command -v $1 >/dev/null 2>&1
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Helper bug-reporting text
+report_bug() {
+  critical "Please file a bug report at https://github.com/petems/puppet-install-shell/"
+  critical ""
+  critical "Version: $version"
+  critical "Platform: $platform"
+  critical "Platform Version: $platform_version"
+  critical "Machine: $machine"
+  critical "OS: $os"
+  critical ""
+  critical "Please detail your operating system type, version and any other relevant details"
+}
+
+# Get command line arguments
+while getopts v:f:d:h opt
+do
+  case "$opt" in
+    v)  version="$OPTARG";;
+    f)  cmdline_filename="$OPTARG";;
+    d)  cmdline_dl_dir="$OPTARG";;
+    h) echo >&2 \
+      "install_puppet_agent.sh - A shell script to install Puppet Agent > 5.0.0, assuming no dependencies
+      usage:
+      -v   version         version to install, defaults to \$latest_version
+      -f   filename        filename for downloaded file, defaults to original name
+      -d   download_dir    filename for downloaded file, defaults to /tmp/(random-number)"
+      exit 0;;
+    \?)   # unknown flag
+      echo >&2 \
+      "unknown option
+      usage: $0 [-v version] [-f filename | -d download_dir]"
+      exit 1;;
+  esac
+done
+shift `expr $OPTIND - 1`
+
+machine=`uname -m`
+os=`uname -s`
+
+# Retrieve Platform and Platform Version
+if test -f "/etc/lsb-release" && grep -q DISTRIB_ID /etc/lsb-release; then
+  platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]'`
+  platform_version=`grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2`
+elif test -f "/etc/debian_version"; then
+  platform="debian"
+  platform_version=`cat /etc/debian_version`
+elif test -f "/etc/redhat-release"; then
+  platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
+  platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
+
+  #If /etc/redhat-release exists, we act like RHEL by default. Except for fedora
+  if test "$platform" = "fedora"; then
+    platform="fedora"
+  else
+    platform="el"
+  fi
+elif test -f "/etc/system-release"; then
+  platform=`sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
+  platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
+  # amazon is built off of fedora, so act like RHEL
+  if test "$platform" = "amazon linux ami"; then
+    platform="el"
+    platform_version="6.0"
+  fi
+# Apple OS X
+elif test -f "/usr/bin/sw_vers"; then
+  platform="mac_os_x"
+  # Matching the tab-space with sed is error-prone
+  platform_version=`sw_vers | awk '/^ProductVersion:/ { print $2 }'`
+
+  major_version=`echo $platform_version | cut -d. -f1,2`
+  case $major_version in
+    "10.6") platform_version="10.6" ;;
+    "10.7"|"10.8"|"10.9") platform_version="10.7" ;;
+    *) echo "No builds for platform: $major_version"
+       report_bug
+       exit 1
+       ;;
+  esac
+
+  # x86_64 Apple hardware often runs 32-bit kernels (see OHAI-63)
+  x86_64=`sysctl -n hw.optional.x86_64`
+  if test $x86_64 -eq 1; then
+    machine="x86_64"
+  fi
+elif test -f "/etc/release"; then
+  platform="solaris2"
+  machine=`/usr/bin/uname -p`
+  platform_version=`/usr/bin/uname -r`
+elif test -f "/etc/SuSE-release"; then
+  if grep -q 'Enterprise' /etc/SuSE-release;
+  then
+      platform="sles"
+      platform_version=`awk '/^VERSION/ {V = $3}; /^PATCHLEVEL/ {P = $3}; END {print V "." P}' /etc/SuSE-release`
+  else
+      platform="suse"
+      platform_version=`awk '/^VERSION =/ { print $3 }' /etc/SuSE-release`
+  fi
+elif test -f "/etc/arch-release"; then
+  platform="archlinux"
+  platform_version=`/usr/bin/uname -r`
+elif test "x$os" = "xFreeBSD"; then
+  platform="freebsd"
+  platform_version=`uname -r | sed 's/-.*//'`
+elif test "x$os" = "xAIX"; then
+  platform="aix"
+  platform_version=`uname -v`
+  machine="ppc"
+fi
+
+if test "x$platform" = "x"; then
+  critical "Unable to determine platform version!"
+  report_bug
+  exit 1
+fi
+
+if test "x$version" = "x"; then
+  version="latest";
+  info "Version parameter not defined, assuming latest";
+else
+  case "$version" in
+    3*)
+      critical "Cannot install Puppet 3 with this script. Puppet 3 is EOL, and you should upgrade. you need to use install_puppet_agent.sh"
+      report_bug
+      exit 1
+      ;;
+    4*)
+      critical "Cannot install Puppet 4 with this script, you need to use install_puppet_agent.sh"
+      report_bug
+      exit 1
+      ;;
+    5*)
+      critical "Cannot install Puppet 5 with this script, you need to use install_puppet_5_agent.sh"
+      report_bug
+      exit 1
+      ;;
+    6*)
+      critical "Cannot install Puppet 6 with this script, you need to use install_puppet_6_agent.sh"
+      report_bug
+      exit 1
+      ;;
+    7*)
+      critical "Cannot install Puppet 7 with this script, you need to use install_puppet_7_agent.sh"
+      report_bug
+      exit 1
+      ;;
+    *)
+      info "Version parameter defined: $version";
+      ;;
+  esac
+fi
+
+# Mangle $platform_version to pull the correct build
+# for various platforms
+major_version=`echo $platform_version | cut -d. -f1`
+case $platform in
+  "el")
+    platform_version=$major_version
+    ;;
+  "fedora")
+    platform_version=$major_version
+    ;;
+  "debian")
+    platform_version=$major_version
+    ;;
+  "freebsd")
+    platform_version=$major_version
+    ;;
+  "sles")
+    platform_version=$major_version
+    ;;
+  "suse")
+    platform_version=$major_version
+    ;;
+esac
+
+if test "x$platform_version" = "x"; then
+  critical "Unable to determine platform version!"
+  report_bug
+  exit 1
+fi
+
+if test "x$platform" = "xsolaris2"; then
+  # hack up the path on Solaris to find wget
+  PATH=/usr/sfw/bin:$PATH
+  export PATH
+fi
+
+checksum_mismatch() {
+  critical "Package checksum mismatch!"
+  report_bug
+  exit 1
+}
+
+unable_to_retrieve_package() {
+  critical "Unable to retrieve a valid package!"
+  report_bug
+  exit 1
+}
+
+random_hexdump () {
+  hexdump -n 2 -e '/2 "%u"' /dev/urandom
+}
+
+if test "x$TMPDIR" = "x"; then
+  tmp="/tmp"
+else
+  tmp=$TMPDIR
+fi
+
+# Random function since not all shells have $RANDOM
+if exists hexdump; then
+  random_number=random_hexdump
+else
+  random_number="`date +%N`"
+fi
+
+tmp_dir="$tmp/install.sh.$$.$random_number"
+(umask 077 && mkdir $tmp_dir) || exit 1
+
+tmp_stderr="$tmp/stderr.$$.$random_number"
+
+capture_tmp_stderr() {
+  # spool up tmp_stderr from all the commands we called
+  if test -f $tmp_stderr; then
+    output=`cat ${tmp_stderr}`
+    stderr_results="${stderr_results}\nSTDERR from $1:\n\n$output\n"
+  fi
+}
+
+trap "rm -f $tmp_stderr; rm -rf $tmp_dir; exit $1" 1 2 15
+
+# do_wget URL FILENAME
+do_wget() {
+  info "Trying wget..."
+  wget -O "$2" "$1" 2>$tmp_stderr
+  rc=$?
+
+  # check for 404
+  grep "ERROR 404" $tmp_stderr 2>&1 >/dev/null
+  if test $? -eq 0; then
+    critical "ERROR 404"
+    unable_to_retrieve_package
+  fi
+
+  # check for bad return status or empty output
+  if test $rc -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "wget"
+    return 1
+  fi
+
+  return 0
+}
+
+# do_curl URL FILENAME
+do_curl() {
+  info "Trying curl..."
+  curl -1 -sL -D $tmp_stderr "$1" > "$2"
+  rc=$?
+  # check for 404
+  grep "404 Not Found" $tmp_stderr 2>&1 >/dev/null
+  if test $? -eq 0; then
+    critical "ERROR 404"
+    unable_to_retrieve_package
+  fi
+
+  # check for bad return status or empty output
+  if test $rc -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "curl"
+    return 1
+  fi
+
+  return 0
+}
+
+# do_fetch URL FILENAME
+do_fetch() {
+  info "Trying fetch..."
+  fetch -o "$2" "$1" 2>$tmp_stderr
+  # check for bad return status
+  test $? -ne 0 && return 1
+  return 0
+}
+
+# do_perl URL FILENAME
+do_perl() {
+  info "Trying perl..."
+  perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>$tmp_stderr
+  rc=$?
+  # check for 404
+  grep "404 Not Found" $tmp_stderr 2>&1 >/dev/null
+  if test $? -eq 0; then
+    critical "ERROR 404"
+    unable_to_retrieve_package
+  fi
+
+  # check for bad return status or empty output
+  if test $rc -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "perl"
+    return 1
+  fi
+
+  return 0
+}
+
+do_checksum() {
+  if exists sha256sum; then
+    checksum=`sha256sum $1 | awk '{ print $1 }'`
+    if test "x$checksum" != "x$2"; then
+      checksum_mismatch
+    else
+      info "Checksum compare with sha256sum succeeded."
+    fi
+  elif exists shasum; then
+    checksum=`shasum -a 256 $1 | awk '{ print $1 }'`
+    if test "x$checksum" != "x$2"; then
+      checksum_mismatch
+    else
+      info "Checksum compare with shasum succeeded."
+    fi
+  elif exists md5sum; then
+    checksum=`md5sum $1 | awk '{ print $1 }'`
+    if test "x$checksum" != "x$3"; then
+      checksum_mismatch
+    else
+      info "Checksum compare with md5sum succeeded."
+    fi
+  elif exists md5; then
+    checksum=`md5 $1 | awk '{ print $4 }'`
+    if test "x$checksum" != "x$3"; then
+      checksum_mismatch
+    else
+      info "Checksum compare with md5 succeeded."
+    fi
+  else
+    warn "Could not find a valid checksum program, pre-install shasum, md5sum or md5 in your O/S image to get valdation..."
+  fi
+}
+
+# do_download URL FILENAME
+do_download() {
+  info "Downloading $1"
+  info "  to file $2"
+
+  # we try all of these until we get success.
+  # perl, in particular may be present but LWP::Simple may not be installed
+
+  if exists wget; then
+    do_wget $1 $2 && return 0
+  fi
+
+  if exists curl; then
+    do_curl $1 $2 && return 0
+  fi
+
+  if exists fetch; then
+    do_fetch $1 $2 && return 0
+  fi
+
+  if exists perl; then
+    do_perl $1 $2 && return 0
+  fi
+
+  unable_to_retrieve_package
+}
+
+# install_file TYPE FILENAME
+# TYPE is "rpm", "deb", "solaris", or "sh"
+install_file() {
+  case "$1" in
+    "rpm")
+      info "installing puppetlabs yum repo with rpm..."
+      if test -f "/etc/yum.repos.d/puppetlabs-pc1.repo"; then
+        info "existing puppetlabs yum repo found, moving to old location"
+        mv /etc/yum.repos.d/puppetlabs-pc1.repo /etc/yum.repos.d/puppetlabs-pc1.repo.old
+      fi
+      rpm -Uvh --oldpackage --replacepkgs "$2"
+      if test "$version" = 'latest'; then
+        yum install -y puppet-agent
+      else
+        yum install -y "puppet-agent-${version}"
+      fi
+      ;;
+    "deb")
+      info "installing puppetlabs apt repo with dpkg..."
+      dpkg -i "$2"
+      apt-get update -y
+      apt-get install apt-transport-https ca-certificates -y
+      if test "$version" = 'latest'; then
+        apt-get install -y puppet-agent
+      else
+        if test "x$deb_codename" != "x"; then
+          apt-get install -y "puppet-agent=${version}-1${deb_codename}"
+        else
+          apt-get install -y "puppet-agent=${version}"
+        fi
+      fi
+      ;;
+    "solaris")
+      critical "Solaris not supported yet"
+      ;;
+    "dmg" )
+      critical "Puppet-Agent Not Supported Yet: $1"
+      ;;
+    *)
+      critical "Unknown filetype: $1"
+      report_bug
+      exit 1
+      ;;
+  esac
+  if test $? -ne 0; then
+    critical "Installation failed"
+    report_bug
+    exit 1
+  fi
+}
+
+#Platforms that do not need downloads are in *, the rest get their own entry.
+case $platform in
+  "archlinux")
+    critical "Not got Puppet-agent not supported on Arch yet"
+    ;;
+  "freebsd")
+    critical "Not got Puppet-agent not supported on freebsd yet"
+    ;;
+  *)
+    info "Downloading Puppet $version for ${platform}..."
+    case $platform in
+      "el")
+        info "Red hat like platform! Lets get you an RPM..."
+        filetype="rpm"
+        filename="puppet8-release-el-${platform_version}.noarch.rpm"
+        download_url="http://yum.puppetlabs.com/${filename}"
+        ;;
+      "fedora")
+        info "Fedora platform! Lets get the RPM..."
+        filetype="rpm"
+        filename="puppet8-release-fedora-${platform_version}.noarch.rpm"
+        download_url="http://yum.puppetlabs.com/${filename}"
+        ;;
+      "debian")
+        info "Debian platform! Lets get you a DEB..."
+        case $major_version in
+          "10") deb_codename="buster";;
+          "11") deb_codename="bullseye";;
+        esac
+        filetype="deb"
+        filename="puppet8-release-${deb_codename}.deb"
+        download_url="http://apt.puppetlabs.com/${filename}"
+        ;;
+      "ubuntu")
+        info "Ubuntu platform! Lets get you a DEB..."
+        case $platform_version in
+          "18.04") deb_codename="bionic";;
+          "20.04") deb_codename="focal";;
+          "22.04") deb_codename="jammy";;
+        esac
+        filetype="deb"
+        filename="puppet8-release-${deb_codename}.deb"
+        download_url="http://apt.puppetlabs.com/${filename}"
+        ;;
+      "mac_os_x")
+        critical "Script doesn't Puppet-agent not supported on OSX yet"
+        ;;
+      *)
+        critical "Sorry $platform is not supported yet!"
+        report_bug
+        exit 1
+        ;;
+    esac
+
+    if test "x$cmdline_filename" != "x"; then
+      download_filename=$cmdline_filename
+    else
+      download_filename=$filename
+    fi
+
+    if test "x$cmdline_dl_dir" != "x"; then
+      download_filename="$cmdline_dl_dir/$download_filename"
+    else
+      download_filename="$tmp_dir/$download_filename"
+    fi
+
+    do_download "$download_url"  "$download_filename"
+
+    install_file $filetype "$download_filename"
+    ;;
+esac
+
+#Cleanup
+if test "x$tmp_dir" != "x"; then
+  rm -r "$tmp_dir"
+fi