diff --git a/sift/repos/ubuntu-multiverse.sls b/sift/repos/ubuntu-multiverse.sls
index 61ae73c..5485282 100644
--- a/sift/repos/ubuntu-multiverse.sls
+++ b/sift/repos/ubuntu-multiverse.sls
@@ -1,26 +1,41 @@
+{% set codename = grains["oscodename"] %}
 {%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%}
-sift-ubuntu-ports-repo:
+sift-ubuntu-ports-repo-multiverse:
   file.append:
     - name: /etc/apt/sources.list.d/ubuntu.sources
     - text: |
 
         Types: deb
         URIs: http://ports.ubuntu.com/ubuntu-ports/
-        Suites: noble
+        Suites: {{ codename }}
         Components: main universe restricted multiverse
         Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
         Architectures: arm64
 
         Types: deb
         URIs: http://ports.ubuntu.com/ubuntu-ports/
-        Suites: noble-security
+        Suites: {{ codename }}-security
         Components: main universe restricted multiverse
         Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
         Architectures: arm64
     - unless:
-      - grep -q "URIs: http://ports.ubuntu.com/ubuntu-ports/" /etc/apt/sources.list.d/ubuntu.sources
+      - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources
+      - grep -q "{{ codename }}-security" /etc/apt/sources.list.d/ubuntu.sources
 
 {% else %}
+sift-ubuntu-repo-multiverse:
+  file.append:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - text: |
+        Types: deb
+        URIs: http://archive.ubuntu.com/ubuntu/
+        Suites: {{ codename }} {{ codename }}-updates {{ codename }}-backports
+        Components: main restricted universe multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+    - makedirs: True
+    - unless:
+      - grep -q "archive.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources
+
 sift-multiverse-repo:
   file.replace:
     - name: /etc/apt/sources.list.d/ubuntu.sources
@@ -36,10 +51,20 @@ sift-security-repo:
 
         Types: deb
         URIs: http://security.ubuntu.com/ubuntu/
-        Suites: noble-security
+        Suites: {{ codename }}-security
         Components: main universe restricted multiverse
         Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
     - unless:
-      - grep -q "^Suites:.*noble-security" /etc/apt/sources.list.d/ubuntu.sources
+      - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources
+      - grep -q "security.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources
+
+{% if codename == "jammy" %}
 
+sift-remove-sources-list-multiverse:
+  file.absent:
+    - name: /etc/apt/sources.list
+    - require:
+      - file: sift-multiverse-repo
+
+{% endif %}
 {% endif %}
diff --git a/sift/repos/ubuntu-universe.sls b/sift/repos/ubuntu-universe.sls
index 6fe23e5..eb0d90b 100644
--- a/sift/repos/ubuntu-universe.sls
+++ b/sift/repos/ubuntu-universe.sls
@@ -1,18 +1,33 @@
+{% set codename = grains["oscodename"] %}
 {%- if grains["osarch"] == "aarch64" or grains["osarch"] == "arm64" -%}
-sift-ubuntu-ports-repo:
+sift-ubuntu-ports-repo-universe:
   file.append:
     - name: /etc/apt/sources.list.d/ubuntu.sources
     - text: |
 
         Types: deb
         URIs: http://ports.ubuntu.com/ubuntu-ports/
-        Suites: noble
+        Suites: {{ codename }}
         Components: main universe restricted multiverse
         Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
         Architectures: arm64
-    - unless: 
-      - grep -q "URIs: http://ports.ubuntu.com/ubuntu-ports/" /etc/apt/sources.list.d/ubuntu.sources
+    - makedirs: True
+    - unless:
+      - grep -q "ubuntu-ports" /etc/apt/sources.list.d/ubuntu.sources
 {% else %}
+sift-ubuntu-repo-universe:
+  file.append:
+    - name: /etc/apt/sources.list.d/ubuntu.sources
+    - text: |
+        Types: deb
+        URIs: http://archive.ubuntu.com/ubuntu/
+        Suites: {{ codename }} {{ codename }}-updates {{ codename }}-backports
+        Components: main restricted universe multiverse
+        Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+    - makedirs: True
+    - unless:
+      - grep -q "archive.ubuntu.com" /etc/apt/sources.list.d/ubuntu.sources
+
 sift-universe-repo:
   file.replace:
     - name: /etc/apt/sources.list.d/ubuntu.sources
@@ -20,5 +35,15 @@ sift-universe-repo:
     - repl: '\1\2 universe'
     - flags:
         - MULTILINE
-{%- endif %}
+
+{% if codename == "jammy" %}
+
+sift-remove-sources-list:
+  file.absent:
+    - name: /etc/apt/sources.list
+    - require:
+      - file: sift-universe-repo
+
+{% endif %}
+{% endif %}