diff --git a/.github/workflows/pentoo-visibility.yaml b/.github/workflows/pentoo-visibility.yaml
new file mode 100644
index 000000000..6cbbdef9a
--- /dev/null
+++ b/.github/workflows/pentoo-visibility.yaml
@@ -0,0 +1,26 @@
+name: Pentoo Visibility Check
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  pentoo-visibility-check:
+    runs-on: ubuntu-latest
+    steps:
+    -
+      name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    -
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    -
+      name: List added files
+      run: git diff-tree --no-commit-id --name-only -r ${{ github.sha }}
+    -
+      name: Visibility Check
+      run: |
+        sudo docker build --progress=plain . -f scripts/qa/Dockerfile
diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml
index 516a50249..2cc2ea787 100644
--- a/.github/workflows/pkgcheck.yaml
+++ b/.github/workflows/pkgcheck.yaml
@@ -2,6 +2,9 @@ name: pkgcheck
 on:
   push:
     branches: [master]
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -20,9 +23,9 @@ jobs:
       - name: Tree-wide pkgcheck error check
         uses: pkgcore/pkgcheck-action@v1
         with:
-          args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered
+          args: --net --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered
 
       - name: Commit pkgcheck warnings
         uses: pkgcore/pkgcheck-action@v1
         with:
-          args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }}
+          args: --net --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }}
diff --git a/.github/workflows/pkgcheck_merge.yaml b/.github/workflows/pkgcheck_merge.yaml
deleted file mode 100644
index 290924ca1..000000000
--- a/.github/workflows/pkgcheck_merge.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: pkgcheck_merge
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Tree-wide pkgcheck pentoo-ci
-        uses: pkgcore/pkgcheck-action@v1
-        with:
-          args: -C PentooCI --exit PentooCI --net
-
-      - name: Tree-wide pkgcheck error check
-        uses: pkgcore/pkgcheck-action@v1
-        with:
-          args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,-MasterPackageClobbered
-
-      - name: Commit pkgcheck warnings
-        uses: pkgcore/pkgcheck-action@v1
-        with:
-          args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }}
diff --git a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild
similarity index 94%
rename from pentoo/pentoo-system/pentoo-system-2025.1.ebuild
rename to pentoo/pentoo-system/pentoo-system-2025.2.ebuild
index 2a577df64..7dcc0ffd4 100644
--- a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild
@@ -26,14 +26,14 @@ PDEPEND="${PDEPEND}
 		!pentoo-minimal? ( !pentoo-in-a-container? ( sys-apps/fwupd ) )
 		video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions )
 	)
-	2fa? ( X? ( app-crypt/yubikey-manager-qt
-		sys-auth/yubikey-personalization-gui
-			)
+	2fa? (
+		X? ( sys-auth/yubikey-personalization-gui )
 		app-crypt/yubikey-manager
 		app-crypt/ccid
 		app-crypt/libu2f-host
 		app-crypt/libu2f-server
-		sys-auth/pam_yubico )
+		sys-auth/pam_yubico
+	)
 	!arm? ( app-portage/cpuid2cpuflags )
 	windows-compat? ( app-emulation/wine-vanilla )"
 
diff --git a/scripts/qa/Dockerfile b/scripts/qa/Dockerfile
new file mode 100644
index 000000000..d4cce393d
--- /dev/null
+++ b/scripts/qa/Dockerfile
@@ -0,0 +1,17 @@
+FROM pentoolinux/pentoo-core
+
+#setup gentoo repo
+WORKDIR /var/db/repos/
+RUN git clone https://github.com/gentoo/gentoo.git --depth 1
+#RUN git clone https://github.com/pentoo/pentoo-overlay.git pentoo --depth 1
+# Use the github checkout for pentoo, that's what we are testing
+COPY . pentoo
+#RUN emerge --regen --jobs=$(nproc) --quiet
+WORKDIR /home
+#RUN sed -i 's#pentoo-in-a-container#pentoo-in-a-container -pentoo-full#' /etc/portage/make.conf
+#disable minimal
+RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf
+#install libsndfile minimal to break circular deps
+#RUN USE=minimal FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse media-libs/libsndfile
+#install pentoo/pentoo
+RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend