diff --git a/app-admin/pdk/Manifest b/app-admin/pdk/Manifest
index 42f8f23..b777a9c 100644
--- a/app-admin/pdk/Manifest
+++ b/app-admin/pdk/Manifest
@@ -1,4 +1,2 @@
-DIST pdk_1.8.0.0-1stretch_amd64.deb 128361866 BLAKE2B 1d21de3e011d8f111ca9910193fb2ffd3360ec1bc7d1917b89c24d42dad8c1b521b12f37850cfc88a32cc79aab76000b2801568683e96ef9aedfbe7ab48bf6b3 SHA512 edae3add1d7a0e66361cc60c555f556355a07d80dc05b21cfa8c994b8a66442168d72b602258d984f9c19c15e561c9260d3ebbc82e6bfc22758f4327d78791c2
 DIST pdk_3.0.0.0-1bullseye_amd64.deb 117793618 BLAKE2B aea6e1b6a05492323be55ccab81da3737a0f294dd05ada12dfafa0ef799ed441a05cd0814ad6a5284de50c9ac6506eec302dbdcf4ee61f8803b2b5aa5dfaf818 SHA512 05b33d6a98feca5146ec52fb2b735dd73010f0c908c2cec39ce36e9bf93c085f3651de873bcb2c4b6608e5747c2cf7e0bc24ec26274fe4c6690fc24149c73956
-EBUILD pdk-1.8.0.0.ebuild 1612 BLAKE2B 56d49807d13d85c8b43ec6eefc0fe7cf6df5b6a051b9b5c3ee91020b1b7e1b77b5820a9bf42f15f87d5f90817ff3719a6c680c5eb9111743e47973c82f514c1d SHA512 1bd46ddc1b081ca5571e5fdf40d11826e6724ceda15d3f0e890013336c2dbcad399a015326cde376edf06e201af7094f0c462f3d3012460937ff86171396d588
-EBUILD pdk-3.0.0.0.ebuild 899 BLAKE2B e7a30042f64eee0050771371a0f1ce58d14060f286a763ab8fdb5c86ac8902bd0d84e20630b18047bae9b6e08addb218133c0c2d362c87b738fad319ec640865 SHA512 304c231edf046192a4b8a7744d7fc7a41d7b215fda8beb4c54e5d390ee4cc2b7f19c71ca3a2801b15aae71d71f95f25659346509898aaed4e53d67a1e13a5b51
+EBUILD pdk-3.0.0.0.ebuild 892 BLAKE2B 02cc743b36be5984499c31ce0dc4e6b7106da1c93192e678020cafee7e5981b62f88307e92cd0a62aad95f318931f6a2ebc5534ba17c3029177b8e657fc4d349 SHA512 59cef997abcff199ebbbf8c50435f338e01082aa92bfae4193996eba36911702c8f7ff8dcba0e7a7769ab21ecfdb418d73c30e191aea2105263b9a0986002eea
diff --git a/app-admin/pdk/pdk-1.8.0.0.ebuild b/app-admin/pdk/pdk-1.8.0.0.ebuild
deleted file mode 100644
index a456fa1..0000000
--- a/app-admin/pdk/pdk-1.8.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils unpacker
-
-DESCRIPTION="Puppet SDK - develop and test puppet modules"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="strip"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/pdk
-	/opt/puppetlabs/pdk/lib/engines/*
-	/opt/puppetlabs/pdk/lib/*
-	/opt/puppetlabs/pdk/bin/*"
-
-src_install() {
-	# Drop the opt folder into place
-	insinto /opt
-	doins -r opt/*
-
-	# Add symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/git/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.1.9/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.4.4/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.5.1/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.1.0/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.4.0/bin/"
-	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.5.0/bin/"
-
-	# remove rwx a.out stuff
-	rm "${D}"/opt/puppetlabs/pdk/private/ruby/2.4.4/lib/ruby/gems/2.4.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
-	rm "${D}"/opt/puppetlabs/pdk/share/cache/ruby/2.1.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
-	rm "${D}"/opt/puppetlabs/pdk/share/cache/ruby/2.5.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
-
-	dosym ../../opt/puppetlabs/pdk/bin/pdk /usr/bin/pdk
-}
diff --git a/app-admin/pdk/pdk-3.0.0.0.ebuild b/app-admin/pdk/pdk-3.0.0.0.ebuild
index b833dc0..d1e559e 100644
--- a/app-admin/pdk/pdk-3.0.0.0.ebuild
+++ b/app-admin/pdk/pdk-3.0.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit eutils unpacker
+EAPI=8
+inherit unpacker
 
 DEB_RELEASE="bullseye"