diff --git a/Dockerfile b/Dockerfile
index 6c1842f..8e23265 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,11 +84,10 @@ ENV HOME="/root" \
   PATH="/lsiopy/bin:$PATH"
 
 # copy sources
-COPY sources.list /etc/apt/
+COPY ubuntu.sources /etc/apt/sources.d/ubuntu.sources
 
 RUN \
   echo "**** Ripped from Ubuntu Docker Logic ****" && \
-  rm -f /etc/apt/sources.list.d/ubuntu.sources && \
   set -xe && \
   echo '#!/bin/sh' \
     > /usr/sbin/policy-rc.d && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8e65e1b..663ed04 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -84,11 +84,10 @@ ENV HOME="/root" \
   PATH="/lsiopy/bin:$PATH"
 
 # copy sources
-COPY sources.list.arm /etc/apt/sources.list
+COPY ubuntu.sources.arm /etc/apt/sources.d/ubuntu.sources
 
 RUN \
   echo "**** Ripped from Ubuntu Docker Logic ****" && \
-  rm -f /etc/apt/sources.list.d/ubuntu.sources && \
   set -xe && \
   echo '#!/bin/sh' \
     > /usr/sbin/policy-rc.d && \
diff --git a/sources.list b/sources.list
deleted file mode 100644
index d7df8ce..0000000
--- a/sources.list
+++ /dev/null
@@ -1,12 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ resolute main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ resolute main restricted
-deb http://archive.ubuntu.com/ubuntu/ resolute-updates main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ resolute-updates main restricted
-deb http://archive.ubuntu.com/ubuntu/ resolute universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ resolute universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ resolute-updates universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ resolute-updates universe multiverse
-deb http://archive.ubuntu.com/ubuntu/ resolute-security main restricted
-deb-src http://archive.ubuntu.com/ubuntu/ resolute-security main restricted
-deb http://archive.ubuntu.com/ubuntu/ resolute-security universe multiverse
-deb-src http://archive.ubuntu.com/ubuntu/ resolute-security universe multiverse
diff --git a/sources.list.arm b/sources.list.arm
deleted file mode 100644
index c402cd8..0000000
--- a/sources.list.arm
+++ /dev/null
@@ -1,12 +0,0 @@
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute main restricted multiverse
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates main restricted multiverse
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute universe
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-updates universe
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security main restricted multiverse
-deb http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe
-deb-src http://ports.ubuntu.com/ubuntu-ports/ resolute-security universe
diff --git a/ubuntu.sources b/ubuntu.sources
new file mode 100644
index 0000000..e7c3dbe
--- /dev/null
+++ b/ubuntu.sources
@@ -0,0 +1,11 @@
+Types: deb
+URIs: https://archive.ubuntu.com/ubuntu/
+Suites: resolute resolute-updates resolute-backports
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+Types: deb
+URIs: https://security.ubuntu.com/ubuntu/
+Suites: resolute-security
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
diff --git a/ubuntu.sources.arm b/ubuntu.sources.arm
new file mode 100644
index 0000000..677d613
--- /dev/null
+++ b/ubuntu.sources.arm
@@ -0,0 +1,11 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports
+Suites: resolute resolute-updates resolute-backports
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+Types: deb
+URIs: https://ports.ubuntu.com/ubuntu-ports
+Suites: resolute-security
+Components: main restricted universe multiverse
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg