diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 02e40dc76..c0e8119cb 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -259,7 +259,8 @@ kolla_build_blocks:
     {% endfor %}
     {% else %}
     RUN \
-        rm /etc/apt/sources.list && \
+        rm -f /etc/apt/sources.list && \
+        rm -f /etc/apt/sources.list.d/* && \
     {% if stackhpc_repo_mirror_auth_proxy_enabled | bool %}
     {# We lack the ca-certificates package at this stage, so don't verify the CA initially #}
         echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/90no-verify-peer && \
@@ -291,7 +292,8 @@ kolla_build_blocks:
     COPY sources.list.ubuntu /etc/apt/sources.list.backup
     {% endif %}
     RUN \
-        rm /etc/apt/sources.list && \
+        rm -f /etc/apt/sources.list && \
+        rm -f /etc/apt/sources.list.d/* && \
         rm -f /etc/apt/apt.conf.d/90no-verify-peer && \
     {% for repo in stackhpc_ubuntu_noble_repos %}
         echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \