diff --git a/Dockerfile b/Dockerfile
index bf63afb542..f149d0ba45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -223,14 +223,15 @@ LABEL org.opencontainers.image.source='https://github.com/storytold/storyteller-
 # https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
 # https://forums.developer.nvidia.com/t/invalid-public-key-for-cuda-apt-repository/212901/11
 RUN apt-key del 7fa2af80
+
+# NB: Fix for 'E: Conflicting values set for option Signed-By regarding source'
+# NB: We need to remove all sources
+RUN rm $(find /etc/apt | grep cuda)
+
 #RUN wget https://developer.download.nvidia.com/compute/cuda/repos/$distro/$arch/cuda-keyring_1.0-1_all.deb
 RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
 RUN dpkg -i cuda-keyring_1.0-1_all.deb
 
-# NB: Fix for 'E: Conflicting values set for option Signed-By regarding source'
-#RUN apt-key adv --fetch-keys https://repo.download.nvidia.com/baseos/GPG-KEY-dgx-debian-prod
-RUN sed -i '/developer\.download\.nvidia\.com\/compute\/cuda\/repos/d' /etc/apt/sources.list
-
 # NB: Comment this out for non-debug images
 # TODO: Figure out how this is done elsewhere with just the static binaries
 # Others: `mysql-client`