diff --git a/ansible/roles/portshaker/files/freebsd b/ansible/roles/portshaker/files/freebsd
index 3602760..97a418c 100644
--- a/ansible/roles/portshaker/files/freebsd
+++ b/ansible/roles/portshaker/files/freebsd
@@ -5,6 +5,7 @@ if [ "$1" != '--' ]; then
 fi
 shift
 method="git"
-git_clone_uri="https://git.FreeBSD.org/ports.git"
+git_clone_uri="https://code.fizz.buzz/mirror/freebsd-ports.git"
+# git_clone_uri="https://git.FreeBSD.org/ports.git"
 git_branch="main"
 run_portshaker_command $*
diff --git a/ansible/roles/portshaker/files/portshaker.conf b/ansible/roles/portshaker/files/portshaker.conf
index 7b7f1b8..efb4a0e 100644
--- a/ansible/roles/portshaker/files/portshaker.conf
+++ b/ansible/roles/portshaker/files/portshaker.conf
@@ -5,5 +5,5 @@ mirror_base_dir="/var/cache/portshaker"
 ports_trees="main"
 
 main_ports_tree="/usr/local/portshaker/trees/main"
-# main_merge_from="freebsd myrepo"
-main_merge_from="freebsd"
+main_merge_from="freebsd myrepo"
+# main_merge_from="freebsd"
diff --git a/ansible/roles/poudriere/files/poudriere.d/14broadwell-default-computer-make.conf b/ansible/roles/poudriere/files/poudriere.d/14broadwell-default-computer-make.conf
index 5757029..7ca9baa 100644
--- a/ansible/roles/poudriere/files/poudriere.d/14broadwell-default-computer-make.conf
+++ b/ansible/roles/poudriere/files/poudriere.d/14broadwell-default-computer-make.conf
@@ -2,7 +2,7 @@ CPUTYPE?=broadwell
 
 # CPU optimizations for go
 .if ${.CURDIR:M*/lang/go*}
-OPTIONS_SET+=V2
+OPTIONS_UNSET+=V1
 OPTIONS_SET+=V3
 .endif
 
diff --git a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-make.conf b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-make.conf
index dfae523..c53438c 100644
--- a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-make.conf
+++ b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-make.conf
@@ -9,8 +9,7 @@ CPUTYPE?=znver4
 
 # CPU optimizations for go
 .if ${.CURDIR:M*/lang/go*}
-OPTIONS_SET+=V2
-OPTIONS_SET+=V3
+OPTIONS_UNSET+=V1
 OPTIONS_SET+=V4
 .endif
 
diff --git a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
index 2b07b8d..30cf124 100644
--- a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
+++ b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
@@ -94,6 +94,7 @@ sysutils/fusefs-sshfs
 sysutils/helm
 sysutils/htop
 sysutils/kubectl
+sysutils/kubeswitch
 sysutils/lscpu
 sysutils/lsof
 sysutils/moreutils
@@ -104,6 +105,7 @@ sysutils/pv
 sysutils/radeontop
 sysutils/rust-coreutils
 sysutils/shuf
+sysutils/stern
 sysutils/terraform
 sysutils/tmux
 sysutils/tree