diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml
index abdc03f..12c9851 100644
--- a/config/aarch64/ci.toml
+++ b/config/aarch64/ci.toml
@@ -41,7 +41,7 @@ expat = {}
 extrautils = {}
 #fal
 #fd = {} # ctrlc-3.1.1
-#ffmpeg = {} # undefined references
+#ffmpeg6 = {} # undefined references
 findutils = {}
 fontconfig = {}
 #freeciv = {}
@@ -53,7 +53,7 @@ freetype = {}
 fribidi = {}
 #game-2048 = {} # rustc-serialize
 #gawk = {} # langinfo.h
-gcc = {}
+gcc13 = {}
 gdbserver = {}
 #gdk-pixbuf = {} # shared-mime-info
 gears = {}
diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml
index 2ccf854..83c5da4 100644
--- a/config/aarch64/dev.toml
+++ b/config/aarch64/dev.toml
@@ -55,7 +55,7 @@ vim = {}
 # Development tools
 cargo = {}
 crates-io-index = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 rust = {}
diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml
index 2ee892e..cb6674f 100644
--- a/config/aarch64/resist.toml
+++ b/config/aarch64/resist.toml
@@ -18,7 +18,7 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 initfs = {}
diff --git a/config/i686/dev.toml b/config/i686/dev.toml
index 2ccf854..83c5da4 100644
--- a/config/i686/dev.toml
+++ b/config/i686/dev.toml
@@ -55,7 +55,7 @@ vim = {}
 # Development tools
 cargo = {}
 crates-io-index = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 rust = {}
diff --git a/config/i686/resist.toml b/config/i686/resist.toml
index 2ee892e..cb6674f 100644
--- a/config/i686/resist.toml
+++ b/config/i686/resist.toml
@@ -18,7 +18,7 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 initfs = {}
diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index e834525..1da7a45 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -41,7 +41,7 @@ expat = {}
 extrautils = {}
 #fal
 #fd = {} # ctrlc-3.1.1
-ffmpeg = {}
+ffmpeg6 = {}
 findutils = {}
 fontconfig = {}
 #freeciv = {}
@@ -53,7 +53,7 @@ freetype = {}
 fribidi = {}
 #game-2048 = {} # rustc-serialize
 #gawk = {} # langinfo.h
-gcc = {}
+gcc13 = {}
 gdbserver = {}
 #gdk-pixbuf = {} # shared-mime-info
 gears = {}
diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml
index 2ccf854..83c5da4 100644
--- a/config/x86_64/dev.toml
+++ b/config/x86_64/dev.toml
@@ -55,7 +55,7 @@ vim = {}
 # Development tools
 cargo = {}
 crates-io-index = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 rust = {}
diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml
index 63eeeed..792d4d5 100644
--- a/config/x86_64/jeremy.toml
+++ b/config/x86_64/jeremy.toml
@@ -57,7 +57,7 @@ sodium = {}
 acid = {}
 cleye = {}
 curl = {}
-ffmpeg = {}
+ffmpeg6 = {}
 git = {}
 gnu-grep = {}
 lua = {}
@@ -95,7 +95,7 @@ winit = {}
 autoconf = {}
 automake = {}
 #cargo = {} # openssl issues
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 nasm = {}
diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml
index 2ee892e..cb6674f 100644
--- a/config/x86_64/resist.toml
+++ b/config/x86_64/resist.toml
@@ -18,7 +18,7 @@ drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
-gcc = {}
+gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
 initfs = {}