diff --git a/Dockerfile b/Dockerfile
index 3a201ad..0f24bfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:jammy
 
-COPY jammy-ports.sources /etc/apt/sources.list.d/jammy-ports.sources
+COPY jammy /etc/apt/sources.list.d
 COPY toolchains /opt/toolchains
 
 RUN dpkg --add-architecture i386
@@ -8,7 +8,7 @@ RUN dpkg --add-architecture riscv64
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture armhf
 
-RUN apt update -y
+RUN apt update -y | true
 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 jammy main" | tee -a /etc/apt/sources.list.d/gitea.list
diff --git a/Dockerfile.plucky b/Dockerfile.plucky
index 0e77767..7c365fc 100644
--- a/Dockerfile.plucky
+++ b/Dockerfile.plucky
@@ -1,11 +1,11 @@
 FROM ubuntu:plucky
 COPY toolchains /opt/toolchains
-COPY plucky-ports.sources /etc/apt/sources.list.d/plucky-ports.sources
+COPY plucky /etc/apt/sources.list.d
 RUN dpkg --add-architecture i386
 RUN dpkg --add-architecture riscv64
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture armhf
-RUN apt update -y
+RUN apt update -y | true
 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
diff --git a/jammy/armhf.sources b/jammy/armhf.sources
new file mode 100644
index 0000000..a1b17a1
--- /dev/null
+++ b/jammy/armhf.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: jammy jammy-updates jammy-backports
+Components: main universe restricted multiverse
+Architectures: armhf
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
\ No newline at end of file
diff --git a/jammy-ports.sources b/jammy/jammy.sources
similarity index 100%
rename from jammy-ports.sources
rename to jammy/jammy.sources
diff --git a/jammy/riscv64.sources b/jammy/riscv64.sources
new file mode 100644
index 0000000..e87e5a8
--- /dev/null
+++ b/jammy/riscv64.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: jammy jammy-updates jammy-backports
+Components: main universe restricted multiverse
+Architectures: riscv64
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
\ No newline at end of file
diff --git a/plucky-ports.sources b/plucky/arm64.sources
similarity index 100%
rename from plucky-ports.sources
rename to plucky/arm64.sources
diff --git a/plucky/armhf.sources b/plucky/armhf.sources
new file mode 100644
index 0000000..31f2b40
--- /dev/null
+++ b/plucky/armhf.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: plucky plucky-updates plucky-backports
+Components: main universe restricted multiverse
+Architectures: armhf
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
\ No newline at end of file
diff --git a/plucky/riscv64.sources b/plucky/riscv64.sources
new file mode 100644
index 0000000..2f67fa8
--- /dev/null
+++ b/plucky/riscv64.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: plucky plucky-updates plucky-backports
+Components: main universe restricted multiverse
+Architectures: riscv64
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
\ No newline at end of file