diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild
similarity index 96%
rename from pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild
rename to pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild
index e7e86b28fd..bb2af0533f 100644
--- a/pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild
+++ b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild
@@ -20,7 +20,7 @@ PDEPEND="X? (
 		amd64? (
 			sys-firmware/sof-firmware
 			chrome? (
-				|| ( www-client/google-chrome www-client/chromium:stable www-client/google-chrome-beta www-client/google-chrome-unstable )
+				|| ( www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable )
 			)
 		)
 
diff --git a/pentoo/zero-system/zero-system-2026.2-r4.ebuild b/pentoo/zero-system/zero-system-2026.2-r5.ebuild
similarity index 99%
rename from pentoo/zero-system/zero-system-2026.2-r4.ebuild
rename to pentoo/zero-system/zero-system-2026.2-r5.ebuild
index a033ca3bb0..3483fda649 100644
--- a/pentoo/zero-system/zero-system-2026.2-r4.ebuild
+++ b/pentoo/zero-system/zero-system-2026.2-r5.ebuild
@@ -54,7 +54,6 @@ RDEPEND="
 			x11-misc/slim
 			x11-misc/xdotool
 			xfce-extra/xfce4-genmon-plugin
-			amd64? ( www-client/chromium:stable )
 			arm? ( www-client/firefox )
 			!arm? ( www-client/firefox-bin
 					www-client/google-chrome
diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults
index 24dd0b175b..e8b3872737 100644
--- a/profiles/pentoo/base/make.defaults
+++ b/profiles/pentoo/base/make.defaults
@@ -84,3 +84,5 @@ BRANDING_OS_HOME_URL='https://pentoo.org/'
 BRANDING_OS_SUPPORT_URL='https://pentoo.org/'
 BRANDING_OS_BUG_REPORT_URL='https://github.com/pentoo/pentoo-overlay/issues'
 BRANDING_OS_PRETTY_NAME='Pentoo Linux'
+
+ACCEPT_LICENSE="${ACCEPT_LICENSE} google-chrome"
diff --git a/profiles/pentoo/base/package.keywords/dev-build b/profiles/pentoo/base/package.keywords/dev-build
new file mode 100644
index 0000000000..de8d715648
--- /dev/null
+++ b/profiles/pentoo/base/package.keywords/dev-build
@@ -0,0 +1,3 @@
+#https://bugs.gentoo.org/982332
+#https://bugs.gentoo.org/980766
+~dev-build/scons-4.11.1 amd64 arm arm64
diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask
index d59919fb0b..cbfbef4363 100644
--- a/profiles/pentoo/base/package.mask
+++ b/profiles/pentoo/base/package.mask
@@ -75,3 +75,6 @@ sci-libs/mkl
 
 #force sticky upgrade
 <sys-apps/shadow-4.19.3
+
+#https://bugs.gentoo.org/982332
+=dev-build/scons-4.11.0
diff --git a/profiles/pentoo/overlay/package.keywords/dev-build b/profiles/pentoo/overlay/package.keywords/dev-build
new file mode 120000
index 0000000000..eafc83d867
--- /dev/null
+++ b/profiles/pentoo/overlay/package.keywords/dev-build
@@ -0,0 +1 @@
+../../base/package.keywords/dev-build
\ No newline at end of file
diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility
index e6c3f5ceba..2e89bfa4ec 100644
--- a/scripts/qa/Dockerfile.visibility
+++ b/scripts/qa/Dockerfile.visibility
@@ -1,4 +1,4 @@
-FROM pentoolinux/pentoo-core
+FROM pentoolinux/pentoo-core-ci
 
 # Setup repos
 WORKDIR /var/db/repos/
@@ -15,15 +15,6 @@ COPY . pentoo
 
 WORKDIR /home
 
-# disable minimal (pentoo-core is default minimal)
-RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf
-
-RUN goornogo="$(portageq match / 'dev-lang/go')"
-RUN if [ -z "${goornogo}" ]; then \
-      emerge -1 -kb dev-lang/go-bootstrap; \
-      emerge -1 -kb dev-lang/go; \
-    fi
-
 # Check consistency of all metadata in the repo
 RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs="$(nproc)" --quiet
 # test install pentoo/pentoo
diff --git a/scripts/qa/test-build b/scripts/qa/test-build
index aeeec8b481..cb55f2eebd 100755
--- a/scripts/qa/test-build
+++ b/scripts/qa/test-build
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 WARNED='0'
 FAILED='0'
 FEATURES='-ipc-sandbox -network-sandbox -pid-sandbox'
@@ -32,6 +33,9 @@ print_build_log() {
   fi
 }
 
+# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage
+#emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world
+
 for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do
   if [ "${i%.ebuild}" != "${i}" ]; then
     test_ebuild="$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')"