diff --git a/etc/config/c++.amazon.properties b/etc/config/c++.amazon.properties
index 73ef4e5baf0..719d3e63aee 100644
--- a/etc/config/c++.amazon.properties
+++ b/etc/config/c++.amazon.properties
@@ -862,7 +862,7 @@ compiler.zapcc190308.name=x86-64 Zapcc 190308
 
 ###############################
 # Cross GCC
-group.cross.compilers=&ppcs:&mipss:&nanomips:&mrisc32:&msp:&gccarm:&avr:&rvgcc:&xtensaesp32:&xtensaesp32s2:&xtensaesp32s3:&platspec:&kalray:&s390x:&sh:&loongarch64:&c6x:&sparc:&sparc64:&sparcleon
+group.cross.compilers=&ppcs:&mipss:&nanomips:&mrisc32:&msp:&gccarm:&avr:&rvgcc:&xtensaesp32:&xtensaesp32s2:&xtensaesp32s3:&platspec:&kalray:&s390x:&sh:&loongarch64:&c6x:&sparc:&sparc64:&sparcleon:&bpf
 group.cross.supportsBinary=true
 group.cross.groupName=Cross GCC
 group.cross.supportsExecute=false
@@ -870,6 +870,23 @@ group.cross.licenseLink=https://gcc.gnu.org/onlinedocs/gcc/Copying.html
 group.cross.licenseName=GNU General Public License
 group.cross.licensePreamble=Copyright (c) 2007 Free Software Foundation, Inc. <a href="https://fsf.org/" target="_blank">https://fsf.org/</a>
 
+###############################
+# Cross for BPF
+group.bpf.compilers=&gccbpf
+
+# GCC for BPF
+group.gccbpf.compilers=bpfgtrunk
+group.gccbpf.supportsBinary=true
+group.gccbpf.supportsExecute=false
+group.gccbpf.baseName=BPF gcc
+group.gccbpf.groupName=BPF GCC
+group.gccbpf.isSemVer=true
+
+compiler.bpfgtrunk.exe=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-g++
+compiler.bpfgtrunk.semver=trunk
+compiler.bpfgtrunk.objdumper=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-objdump
+compiler.bpfgtrunk.demangler=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-c++filt
+
 ###############################
 # Cross for SPARC
 group.sparc.compilers=&gccsparc
diff --git a/etc/config/c.amazon.properties b/etc/config/c.amazon.properties
index 2d28e67ab9a..305f12eed62 100644
--- a/etc/config/c.amazon.properties
+++ b/etc/config/c.amazon.properties
@@ -800,13 +800,30 @@ compiler.cicx202221.options=--gcc-toolchain=/opt/compiler-explorer/gcc-12.2.0
 
 ###############################
 # Cross GCC
-group.ccross.compilers=&cppcs:&cmipss:&cnanomips:&cmrisc32:&cmsp:&cgccarm:&cavr:&rvcgcc:&cxtensaesp32:&cxtensaesp32s2:&cxtensaesp32s3:&cplatspec:&ckalray:&cs390x:&csh:&cloongarch64:&cc6x:&csparc:&csparc64:&csparcleon
+group.ccross.compilers=&cppcs:&cmipss:&cnanomips:&cmrisc32:&cmsp:&cgccarm:&cavr:&rvcgcc:&cxtensaesp32:&cxtensaesp32s2:&cxtensaesp32s3:&cplatspec:&ckalray:&cs390x:&csh:&cloongarch64:&cc6x:&csparc:&csparc64:&csparcleon:&cbpf
 group.ccross.supportsBinary=false
 group.ccross.groupName=Cross GCC
 group.ccross.licenseLink=https://gcc.gnu.org/onlinedocs/gcc/Copying.html
 group.ccross.licenseName=GNU General Public License
 group.ccross.licensePreamble=Copyright (c) 2007 Free Software Foundation, Inc. <a href="https://fsf.org/" target="_blank">https://fsf.org/</a>
 
+###############################
+# Cross for BPF
+group.cbpf.compilers=&cgccbpf
+
+# GCC for BPF
+group.cgccbpf.compilers=cbpfgtrunk
+group.cgccbpf.supportsBinary=true
+group.cgccbpf.supportsExecute=false
+group.cgccbpf.baseName=BPF gcc
+group.cgccbpf.groupName=BPF GCC
+group.cgccbpf.isSemVer=true
+
+compiler.cbpfgtrunk.exe=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-gcc
+compiler.cbpfgtrunk.semver=trunk
+compiler.cbpfgtrunk.objdumper=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-objdump
+compiler.cbpfgtrunk.demangler=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-c++filt
+
 ###############################
 # Cross for SPARC
 group.csparc.compilers=&cgccsparc