diff --git a/docker/builders/builder-any-aarch64_gcc13.0.0.Dockerfile b/docker/builders/builder-any-aarch64_gcc13.0.0.Dockerfile
new file mode 120000
index 00000000..bb504b22
--- /dev/null
+++ b/docker/builders/builder-any-aarch64_gcc13.0.0.Dockerfile
@@ -0,0 +1 @@
+builder-any-x86_64_gcc13.0.0.Dockerfile
\ No newline at end of file
diff --git a/docker/builders/builder-any-x86_64_gcc13.0.0.Dockerfile b/docker/builders/builder-any-x86_64_gcc13.0.0.Dockerfile
new file mode 100644
index 00000000..02acfc68
--- /dev/null
+++ b/docker/builders/builder-any-x86_64_gcc13.0.0.Dockerfile
@@ -0,0 +1,40 @@
+FROM fedora:39
+
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
+
+ARG TARGETARCH
+
+RUN dnf install -y \
+	bash-completion \
+	bc \
+	clang \
+	llvm \
+	ca-certificates \
+	curl \
+	dkms \
+	dwarves \
+	gnupg2 \
+	gcc \
+	jq \
+	glibc-devel \
+	elfutils-libelf-devel \
+	netcat \
+	xz \
+	cpio \
+	flex \
+	bison \
+	openssl \
+	openssl-devel \
+	ncurses-devel \
+	systemd-devel \
+	pciutils-devel \
+	binutils-devel \
+	lsb-release \
+	wget \
+	gpg \
+	zstd \
+	cmake \
+	git
+
+# Properly create soft links
+RUN ln -s /usr/bin/gcc /usr/bin/gcc-13.0.0
diff --git a/pkg/driverbuilder/builder/builders.go b/pkg/driverbuilder/builder/builders.go
index 67af3826..deda53d7 100644
--- a/pkg/driverbuilder/builder/builders.go
+++ b/pkg/driverbuilder/builder/builders.go
@@ -135,6 +135,11 @@ type GCCVersionRequestor interface {
 
 func defaultGCC(kr kernelrelease.KernelRelease) semver.Version {
 	switch kr.Major {
+	case 6:
+		if kr.Minor >= 6 {
+			return semver.Version{Major: 13}
+		}
+		return semver.Version{Major: 12}
 	case 5:
 		if kr.Minor >= 15 {
 			return semver.Version{Major: 12}
@@ -150,7 +155,7 @@ func defaultGCC(kr kernelrelease.KernelRelease) semver.Version {
 	case 2:
 		return semver.Version{Major: 4, Minor: 8}
 	default:
-		return semver.Version{Major: 12}
+		return semver.Version{Major: 13}
 	}
 }