diff --git a/binutils/binutils-2.40-focal.tar.xz b/binutils/binutils-2.40-focal.tar.xz
new file mode 100644
index 0000000..01bd86f
Binary files /dev/null and b/binutils/binutils-2.40-focal.tar.xz differ
diff --git a/binutils/build.sh b/binutils/build.sh
new file mode 100644
index 0000000..4753744
--- /dev/null
+++ b/binutils/build.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# This script is meant to make it easy to build GNU binutils using a Docker container.
+
+THIS=$(readlink -e $0)
+USER_ID=`id -u`
+GROUP_ID=`id -g`
+VERSION=2.40
+UBUNTU=focal
+
+PKG=binutils-${VERSION}
+OUT=$PKG-$UBUNTU
+
+wget -nc https://ftp.gnu.org/gnu/binutils/$PKG.tar.xz
+tar xf $PKG.tar.xz
+
+mkdir -p $OUT | true
+
+docker run -v $(pwd):/src -w /src -u root -t yuzuemu/build-environments:linux-fresh /bin/bash /src/docker.sh $VERSION $UBUNTU
+
+cp -v $THIS $OUT
+tar cv $OUT | xz -T0 -c | split --bytes=90MB - $OUT.tar.xz.
diff --git a/binutils/docker.sh b/binutils/docker.sh
new file mode 100644
index 0000000..c80d3d9
--- /dev/null
+++ b/binutils/docker.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+THIS=$(readlink -e $0)
+VERSION=$1
+UBUNTU=$2
+
+OUT=/src/binutils-$VERSION-$UBUNTU
+
+mkdir build
+cd build
+/src/binutils-$VERSION/configure
+make -j$(nproc)
+
+make -j$(nproc) install DESTDIR=$OUT
+cp $THIS $OUT
diff --git a/boost/boost-1_81_0.tar.xz b/boost/boost-1_81_0.tar.xz
new file mode 100644
index 0000000..22f30b1
Binary files /dev/null and b/boost/boost-1_81_0.tar.xz differ
diff --git a/boost/build.sh b/boost/build.sh
index 255ef93..c957822 100755
--- a/boost/build.sh
+++ b/boost/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -e
 # This script is meant to make it easy to build a package using a Docker container.
 
 # Run this from the same directory as source directory
@@ -7,7 +7,7 @@
 THIS=$(readlink -e $0)
 USER_ID=`id -u`
 GROUP_ID=`id -g`
-VERSION=1_79_0
+VERSION=1_81_0
 PKG_NAME=boost
 
 mkdir -p $PKG_NAME-$VERSION
diff --git a/boost/docker.sh b/boost/docker.sh
index 76e6456..dac4ebc 100755
--- a/boost/docker.sh
+++ b/boost/docker.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 THIS=$(readlink -e $0)
 PKG_NAME=$1
diff --git a/gcc/build_gcc.sh b/gcc/build_gcc.sh
index e1b87cb..c54b447 100644
--- a/gcc/build_gcc.sh
+++ b/gcc/build_gcc.sh
@@ -1,19 +1,25 @@
 #!/bin/bash
+set -e
 
 # This script is meant to make it easy to build GCC using a Docker container.
 
-# Run this from the same directory as gcc source directory
-# Recommended to clone GCC with:
-#    git clone --depth 1 -b "releases/gcc-11.3.0" git://gcc.gnu.org/git/gcc.git
-
 THIS=$(readlink -e $0)
 USER_ID=`id -u`
 GROUP_ID=`id -g`
-VERSION=11.3.0
+VERSION=12.2.0
 
-mkdir -p gcc-$VERSION
+if [ ! -d gcc ]; then
+    git clone --depth 1 -b "releases/gcc-$VERSION" git://gcc.gnu.org/git/gcc.git
+else
+    cd gcc
+    sudo git clean -fxd
+    git restore :/
+    cd ..
+fi
 
-docker run -v $(pwd):/src -w /src -u root -t debian:test /bin/bash /src/docker.sh $VERSION
+mkdir -p gcc-$VERSION | true
+
+docker run -v $(pwd):/src -w /src -u root -t yuzuemu/build-environments:linux-fresh /bin/bash /src/docker.sh $VERSION
 
 cp -v $THIS gcc-$VERSION/
 tar cv gcc-$VERSION | xz -T0 -c | split --bytes=90MB - gcc-$VERSION.tar.xz.
diff --git a/gcc/docker.sh b/gcc/docker.sh
index d257523..506d4d1 100644
--- a/gcc/docker.sh
+++ b/gcc/docker.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
+set -e
 
 THIS=$(readlink -e $0)
 
-mkdir build
-cd build
+mkdir gcc/build
+cd gcc/build
 /src/gcc/configure --enable-languages=c,c++ --disable-multilib
 make -j$(nproc)
 
-mkdir gcc-$1
+mkdir gcc-$1 | true
 make -j$(nproc) install DESTDIR=/src/gcc-$1
 cp $THIS /src/gcc-$1
diff --git a/gcc/gcc-12.2.0-ubuntu.tar.xz.aa b/gcc/gcc-12.2.0-ubuntu.tar.xz.aa
new file mode 100644
index 0000000..3852a3d
Binary files /dev/null and b/gcc/gcc-12.2.0-ubuntu.tar.xz.aa differ
diff --git a/gcc/gcc-12.2.0-ubuntu.tar.xz.ab b/gcc/gcc-12.2.0-ubuntu.tar.xz.ab
new file mode 100644
index 0000000..e9fdb91
Binary files /dev/null and b/gcc/gcc-12.2.0-ubuntu.tar.xz.ab differ
diff --git a/gcc/gcc-12.2.0-ubuntu.tar.xz.ac b/gcc/gcc-12.2.0-ubuntu.tar.xz.ac
new file mode 100644
index 0000000..3ac8c12
Binary files /dev/null and b/gcc/gcc-12.2.0-ubuntu.tar.xz.ac differ
diff --git a/gcc/gcc-12.2.0-ubuntu.tar.xz.ad b/gcc/gcc-12.2.0-ubuntu.tar.xz.ad
new file mode 100644
index 0000000..c425dc3
Binary files /dev/null and b/gcc/gcc-12.2.0-ubuntu.tar.xz.ad differ