diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index 6d4a66b6ab..832a710be2 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -2,3 +2,5 @@ DIST code-server-3.4.1-linux-amd64.tar.gz 74127655 BLAKE2B 95e916e64c886688b3704
 DIST code-server-3.4.1-linux-arm64.tar.gz 73470946 BLAKE2B 278a1fef95b612242f4126eea53d7b8dc824fc5dda55ff6b2f1e7752d3ebecebcf30045c1c2bb2a18d1ad7999b20c29398a3c5715920d6e8d8c94eaa76e8a619 SHA512 24168006e737a6579869b8e4b157e21d9ef85282b811783163f0d2291e47bee7e0794c8327663182922b473ff57999432e6c53502849836a53d300728341d1bc
 DIST code-server-3.6.1-linux-amd64.tar.gz 76288261 BLAKE2B 443135065cdab9e0477d9665e9e56d924bd9199ce19cfbdea1e811c2517e7e71beaf18a347a287d0013d7df655900fc08a8f7fcbfe402b1e22487a80876d1eaa SHA512 0e875dc78a2776897a5a1556183808da70c8a0b2e4d96653a419bdab08df6f3d10643f90f568edeafcb38c36bfefa9fe0a674ad020b5e08c17b2e0eece940bc1
 DIST code-server-3.6.1-linux-arm64.tar.gz 75331263 BLAKE2B c390e11b02472409ef0147f6dc5392f36eff93dd19a07e2eeed09a2626b541740c0191fdac0cca43e843b3195fc803921bf37b704b67a2e41fa0a531feca560c SHA512 badc150af52263232240edc16e960ac9e51b22e05bc96d81d11726e28d733b1d79139b0d85aa108011f2993c6a6e395134d2524e5fc13fe3b7dfeac24899eb75
+DIST code-server-3.8.0-linux-amd64.tar.gz 78942963 BLAKE2B 4c78ed40aec86a72dede21a82ae111884be5cba1958fb22d6353d63af98f6d3bab50c7ae1fa0b81079be6d035e84d873f4ebf00da76edaa15b2356e89b3d1261 SHA512 76cdbbdb63b3061ce9d1cb016466356d5184b83e742fc084d9a0376aa12dc9d68314061ea5cde93f6590b07862169cbd291f77b71dfadc4bee4140e277813ae8
+DIST code-server-3.8.0-linux-arm64.tar.gz 77939946 BLAKE2B c154561c308e5e233016f1b9b5f53647a2aaad12b73d27d1e84ee37234104048005b36cccdda5593973238ef279428b8f38309cad193a67afd87d77205eeb27c SHA512 0fe4a42eb1c50ae1d33f9c94e592ac8a3e69fad51abc1f5c90595a1588350e95f78bc2c44f728b3f155112f2db11e79b2227f2e847a45d58c87078d667119a1a
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
index d3bdc55e9a..81ec629c32 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 MY_PN="${PN/-bin/}"
-MY_PV="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
 
 inherit systemd
 
@@ -16,6 +16,7 @@ SRC_URI="
 	arm64? ( ${BASE_URI}-arm64.tar.gz )
 "
 
+RESTRICT="test"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm64"
@@ -26,16 +27,18 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	>=net-libs/nodejs-12.16.1[ssl]
+	>=net-libs/nodejs-12.16.1:0/12[ssl]
 	sys-apps/ripgrep
 "
 
-S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-node.patch"
 )
 
+DOCS=( README.md ThirdPartyNotices.txt )
+
 src_prepare() {
 	default
 
@@ -58,11 +61,7 @@ src_prepare() {
 }
 
 src_install() {
-	local mydocs="README.md ThirdPartyNotices.txt"
-	for doc in ${mydocs}
-	do
-		(dodoc "${doc}" && rm "${doc}") || die
-	done
+	einstalldocs
 
 	insinto "/usr/lib/${MY_PN}"
 	doins -r .
diff --git a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
index d3bdc55e9a..81ec629c32 100644
--- a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 MY_PN="${PN/-bin/}"
-MY_PV="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
 
 inherit systemd
 
@@ -16,6 +16,7 @@ SRC_URI="
 	arm64? ( ${BASE_URI}-arm64.tar.gz )
 "
 
+RESTRICT="test"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm64"
@@ -26,16 +27,18 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	>=net-libs/nodejs-12.16.1[ssl]
+	>=net-libs/nodejs-12.16.1:0/12[ssl]
 	sys-apps/ripgrep
 "
 
-S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-node.patch"
 )
 
+DOCS=( README.md ThirdPartyNotices.txt )
+
 src_prepare() {
 	default
 
@@ -58,11 +61,7 @@ src_prepare() {
 }
 
 src_install() {
-	local mydocs="README.md ThirdPartyNotices.txt"
-	for doc in ${mydocs}
-	do
-		(dodoc "${doc}" && rm "${doc}") || die
-	done
+	einstalldocs
 
 	insinto "/usr/lib/${MY_PN}"
 	doins -r .
diff --git a/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild b/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
new file mode 100644
index 0000000000..81ec629c32
--- /dev/null
+++ b/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
+
+inherit systemd
+
+DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)"
+HOMEPAGE="https://coder.com/"
+SRC_URI="
+	amd64? ( ${BASE_URI}-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-arm64.tar.gz )
+"
+
+RESTRICT="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+# In case we ever make a non-"-binary" pkg
+DEPEND="
+	!www-apps/code-server
+"
+RDEPEND="
+	${DEPEND}
+	>=net-libs/nodejs-12.16.1:0/12[ssl]
+	sys-apps/ripgrep
+"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-node.patch"
+)
+
+DOCS=( README.md ThirdPartyNotices.txt )
+
+src_prepare() {
+	default
+
+	# We remove as much precompiled code as we can,
+	# node modules not written in JS cannot be removed
+	# thus "-bin".
+
+	# use system node
+	rm node || die
+	rm lib/node || die
+
+	# remove bundled ripgrep binary
+	rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
+
+	# not needed
+	rm code-server || die
+	rm postinstall.sh || die
+	# already in /usr/portage/licenses/MIT
+	rm LICENSE.txt || die
+}
+
+src_install() {
+	einstalldocs
+
+	insinto "/usr/lib/${MY_PN}"
+	doins -r .
+	fperms +x "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
+	dosym "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}"
+
+	dosym "${EPREFIX}/usr/bin/rg" "${EPREFIX}/usr/lib/${MY_PN}/lib/vscode/node_modules/vscode-ripgrep/bin/rg"
+
+	systemd_dounit "${FILESDIR}/${MY_PN}.service"
+}
+
+pkg_postinst() {
+	elog "When using code-server systemd service run it as a user"
+	elog "For example: 'systemctl --user enable --now code-server'"
+}
diff --git a/www-apps/code-server-bin/files/code-server-bin-node.patch b/www-apps/code-server-bin/files/code-server-bin-node.patch
index ee4ce6cd46..9437a14bd1 100644
--- a/www-apps/code-server-bin/files/code-server-bin-node.patch
+++ b/www-apps/code-server-bin/files/code-server-bin-node.patch
@@ -5,4 +5,4 @@
  
  ROOT="$(root)"
 -exec "$ROOT/lib/node" "$ROOT" "$@"
-+exec node "${ROOT}" --disable-telemetry "${@}"
++exec node "${ROOT}" --disable-telemetry --disable-update-check "${@}"