diff --git a/doc/source/mirror.rst b/doc/source/mirror.rst
index 91bcafa02..257eab41e 100644
--- a/doc/source/mirror.rst
+++ b/doc/source/mirror.rst
@@ -29,17 +29,31 @@ For example:
      opensuse:
        url: https://{{ zuul_site_local_mirror_host }}/opensuse
      debian:
-       - url: https://{{ zuul_site_local_mirror_host }}/debian
+       - type: deb
+         options:
+           trusted: true
+         url: https://{{ zuul_site_local_mirror_host }}/debian
+         suite: buster
          components: ['main']
-       - url: https://{{ zuul_site_local_mirror_host }}/debian-security
+       - type: deb
+         options:
+           trusted: true
+         url: https://{{ zuul_site_local_mirror_host }}/debian-security
+         suite: buster/updates
          components: ['main']
      ubuntu:
-       - url: https://{{ zuul_site_local_mirror_host }}/ubuntu
+       - type: deb
+         options:
+           trusted: true
+         url: https://{{ zuul_site_local_mirror_host }}/ubuntu
+         suite: bionic
          components: ['main', 'universe']
-         trusted: true
-       - url: https://{{ zuul_site_local_mirror_host }}/ubuntu-security
+       - type: deb
+         options:
+           trusted: true
+         url: https://{{ zuul_site_local_mirror_host }}/ubuntu
+         suite: bionic-security
          components: ['main', 'universe']
-         trusted: true
      dockerhub:
        url: https://{{ zuul_site_local_mirror_host }}:8082/
 
@@ -87,21 +101,32 @@ For example:
       accomodates mirror systems which may have a security mirror at a
       different URL.
 
+      .. zuul:rolevar:: type
+
+         The type for a Debian mirror (usually either ``deb`` or
+         ``deb-src``).
+
+      .. zuul:rolevar:: options
+         :type: dict
+
+         Mirror options, for example add ``trusted: yes`` in order
+         to trust unsigned APT mirrors.
+
       .. zuul:rolevar:: url
 
          The URL for a Debian mirror.
 
+      .. zuul:rolevar:: suite
+
+         The suite for a Debian mirror (e.g., ``buster`` or
+         ``buster/updates``).
+
       .. zuul:rolevar:: components
          :type: list
 
          A list of components available in this mirror (e.g.,
          ``main``, ``contrib``).
 
-      .. zuul:rolevar:: trusted
-         :default: False
-
-         Set to True in order to tag APT mirrors as trusted.
-
    .. zuul:rolevar:: ubuntu
       :type: list
 
@@ -109,21 +134,32 @@ For example:
       accomodates mirror systems which may have a security mirror at a
       different URL.
 
+      .. zuul:rolevar:: type
+
+         The type for an Ubuntu mirror (usually either ``deb`` or
+         ``deb-src``).
+
+      .. zuul:rolevar:: options
+         :type: dict
+
+         Mirror options, for example add ``trusted: yes`` in order
+         to trust unsigned APT mirrors.
+
       .. zuul:rolevar:: url
 
          The URL for an Ubuntu mirror.
 
+      .. zuul:rolevar:: suite
+
+         The suite for an Ubuntu mirror (e.g., ``bionic`` or
+         ``bionic-security``).
+
       .. zuul:rolevar:: components
          :type: list
 
          A list of components available in this mirror (e.g.,
          ``main``, ``contrib``).
 
-      .. zuul:rolevar:: trusted
-         :default: False
-
-         Set to True in order to tag APT mirrors as trusted.
-
    .. zuul:rolevar:: dockerhub
 
       .. zuul:rolevar:: url