diff --git a/Dockerfile b/Dockerfile
index 025d9f1..e835c72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM ubuntu:jammy
 COPY toolchains /opt/toolchains
-COPY jammy-main.sources /etc/apt/sources.list.d/jammy-main.sources
-COPY jammy-ports.sources /etc/apt/sources.list.d/jammy-ports.sources
+COPY jammy.sources /etc/apt/sources.list.d/ubuntu.sources
 RUN rm /etc/apt/sources.list
 RUN dpkg --add-architecture riscv64
 RUN dpkg --add-architecture arm64
@@ -11,4 +10,3 @@ RUN apt install -y cmake build-essential libmbedtls-dev make wget curl crossbuil
 
 RUN curl https://git.tesseslanguage.com/api/packages/tesses50/debian/repository.key -o /etc/apt/keyrings/gitea-tesses50.asc
 RUN echo "deb [signed-by=/etc/apt/keyrings/gitea-tesses50.asc] https://git.tesseslanguage.com/api/packages/tesses50/debian jammy main" | tee -a /etc/apt/sources.list.d/gitea.list
-RUN apt update -y
diff --git a/Dockerfile.plucky b/Dockerfile.plucky
index 864d454..0317642 100644
--- a/Dockerfile.plucky
+++ b/Dockerfile.plucky
@@ -1,12 +1,11 @@
 FROM ubuntu:plucky
 COPY toolchains /opt/toolchains
-COPY plucky-ports.sources /etc/apt/sources.list.d/plucky-ports.sources
+COPY plucky.sources /etc/apt/sources.list.d/ubuntu.sources
 RUN dpkg --add-architecture i386
 RUN dpkg --add-architecture riscv64
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture armhf
-RUN apt update -y | true
+RUN apt update -y
 RUN apt install -y cmake build-essential libmbedtls-dev make wget curl crossbuild-essential-armhf crossbuild-essential-i386 crossbuild-essential-riscv64 crossbuild-essential-armhf crossbuild-essential-arm64 libmbedtls-dev:armhf libmbedtls-dev:arm64 libmbedtls-dev:i386 libmbedtls-dev:riscv64
 RUN curl https://git.tesseslanguage.com/api/packages/tesses50/debian/repository.key -o /etc/apt/keyrings/gitea-tesses50.asc
 RUN echo "deb [signed-by=/etc/apt/keyrings/gitea-tesses50.asc] https://git.tesseslanguage.com/api/packages/tesses50/debian plucky main" | tee -a /etc/apt/sources.list.d/gitea.list
-RUN apt update -y
diff --git a/jammy-main.sources b/jammy-main.sources
deleted file mode 100644
index b7d2c3a..0000000
--- a/jammy-main.sources
+++ /dev/null
@@ -1,6 +0,0 @@
-Types: deb
-URIs: http://archive.ubuntu.com/ubuntu
-Suites: jammy jammy-updates jammy-backports
-Components: main universe restricted multiverse
-Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-Architectures: amd64
\ No newline at end of file
diff --git a/jammy-ports.sources b/jammy-ports.sources
deleted file mode 100644
index db881b6..0000000
--- a/jammy-ports.sources
+++ /dev/null
@@ -1,6 +0,0 @@
-Types: deb
-URIs: http://ports.ubuntu.com/ubuntu-ports/
-Suites: jammy jammy-updates jammy-backports
-Components: main universe restricted multiverse
-Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-Architectures: armhf,arm64,riscv64
\ No newline at end of file
diff --git a/jammy.sources b/jammy.sources
new file mode 100644
index 0000000..2b905ef
--- /dev/null
+++ b/jammy.sources
@@ -0,0 +1,22 @@
+Types: deb
+URIs: http://archive.ubuntu.com/ubuntu/
+Suites: jammy jammy-updates jammy-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: i386 amd64
+
+## Ubuntu security updates. Aside from URIs and Suites,
+## this should mirror your choices in the previous section.
+Types: deb
+URIs: http://security.ubuntu.com/ubuntu/
+Suites: jammy-security
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: i386 amd64
+
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: jammy jammy-updates jammy-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: armhf arm64 riscv64
\ No newline at end of file
diff --git a/plucky-ports.sources b/plucky-ports.sources
deleted file mode 100644
index 52510f3..0000000
--- a/plucky-ports.sources
+++ /dev/null
@@ -1,6 +0,0 @@
-Types: deb
-URIs: http://ports.ubuntu.com/ubuntu-ports/
-Suites: plucky plucky-updates plucky-backports
-Components: main universe restricted multiverse
-Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
-Architectures: armhf arm64 riscv64
\ No newline at end of file
diff --git a/plucky.sources b/plucky.sources
new file mode 100644
index 0000000..a44b296
--- /dev/null
+++ b/plucky.sources
@@ -0,0 +1,22 @@
+Types: deb
+URIs: http://archive.ubuntu.com/ubuntu/
+Suites: plucky plucky-updates plucky-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: i386 amd64
+
+## Ubuntu security updates. Aside from URIs and Suites,
+## this should mirror your choices in the previous section.
+Types: deb
+URIs: http://security.ubuntu.com/ubuntu/
+Suites: plucky-security
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: i386 amd64
+
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: plucky plucky-updates plucky-backports
+Components: main universe restricted multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+Architectures: armhf arm64 riscv64
\ No newline at end of file