diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh
index 016f3ae465..880c804ac0 100755
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@@ -20,6 +20,7 @@ create "Ubuntu Xenial" "ubuntu-xenial"
 create "Ubuntu Trusty" "ubuntu-trusty"
 create "Centos 7" "centos-7"
 create "Fedora 29" "fedora-29"
+create "Debian Buster" "debian-buster"
 create "Debian Stretch" "debian-stretch"
 create "Gentoo" "gentoo-17-0-systemd"
 create "openSUSE 15.0" "opensuse-150"
diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml
index aec8dd9968..aef7aff8fc 100644
--- a/nodepool/nb03.openstack.org.yaml
+++ b/nodepool/nb03.openstack.org.yaml
@@ -14,6 +14,8 @@ labels:
     max-ready-age: 3600
   - name: ubuntu-bionic-arm64
     max-ready-age: 3600
+  - name: debian-buster-arm64
+    max-ready-age: 3600
   - name: debian-stretch-arm64
     max-ready-age: 3600
 
@@ -39,6 +41,14 @@ providers:
           os_command_line: "console=ttyAMA0"
           hw_disk_bus: scsi
           hw_scsi_model: virtio-scsi
+      - name: debian-buster-arm64
+        pause: false
+        config-drive: true
+        meta:
+          hw_firmware_type: uefi
+          os_command_line: "console=ttyAMA0"
+          hw_disk_bus: scsi
+          hw_scsi_model: virtio-scsi
       - name: debian-stretch-arm64
         pause: false
         config-drive: true
@@ -103,6 +113,28 @@ diskimages:
       DIB_DEBIAN_COMPONENTS: 'main,universe'
       GIT_HTTP_LOW_SPEED_TIME: '300'
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+  - name: debian-buster-arm64
+    elements:
+      - block-device-efi
+      - debian-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - growroot
+      - infra-package-needs
+    release: buster
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_APT_LOCAL_CACHE: '0'
+      DIB_DISABLE_APT_CLEANUP: '1'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.london.linaro-london.openstack.org/debian'
+      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
   - name: debian-stretch-arm64
     elements:
       - block-device-efi
diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index 2d5fd8e834..56ef303c86 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -15,6 +15,8 @@ zookeeper-servers:
 labels:
   - name: centos-7
     min-ready: 1
+  - name: debian-buster
+    min-ready: 1
   - name: debian-stretch
     min-ready: 1
   - name: fedora-28
@@ -46,6 +48,8 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
+      - name: debian-buster
+        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -75,6 +79,11 @@ providers:
             flavor-name: 'Performance'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: 'Performance'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'Performance'
@@ -153,6 +162,7 @@ providers:
 
 diskimages:
   - name: centos-7
+  - name: debian-buster
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index ead0fbd4e6..56f627475d 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -14,6 +14,7 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
   - name: centos-7
+  - name: debian-buster
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
@@ -36,6 +37,8 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
+      - name: debian-buster
+        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -69,6 +72,11 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -170,6 +178,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -238,6 +251,11 @@ providers:
             flavor-name: 'zuul-flavor'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: 'zuul-flavor'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'zuul-flavor'
@@ -291,6 +309,7 @@ providers:
 
 diskimages:
   - name: centos-7
+  - name: debian-buster
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index e939371978..b0e7616d08 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -17,6 +17,9 @@ zookeeper-servers:
 # ubuntu-xenial-arm64 being one of them.
 labels:
   - name: centos-7
+  - name: debian-buster
+  - name: debian-buster-arm64
+    min-ready: 1
   - name: debian-stretch
   - name: debian-stretch-arm64
     min-ready: 1
@@ -58,6 +61,8 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
+      - name: debian-buster
+        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -87,6 +92,11 @@ providers:
             flavor-name: 'A1.8'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'A1.8'
@@ -153,6 +163,11 @@ providers:
             flavor-name: 'osf-highcpu-8'
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: 'osf-highcpu-8'
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: 'osf-highcpu-8'
@@ -239,6 +254,13 @@ providers:
             volume-size: 80
             diskimage: centos-7
             key-name: infra-root-keys-2018-06-15
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch
             min-ram: 8000
             flavor-name: v2-highcpu-8
@@ -348,6 +370,8 @@ providers:
     launch-timeout: 800
     rate: 0.001
     diskimages:
+      - name: debian-buster-arm64
+        config-drive: true
       - name: debian-stretch-arm64
         config-drive: true
       - name: ubuntu-xenial-arm64
@@ -358,6 +382,11 @@ providers:
       - name: main
         max-servers: 8
         labels:
+          - name: debian-buster-arm64
+            min-ram: 8000
+            flavor-name: 'os.large'
+            diskimage: debian-buster-arm64
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch-arm64
             min-ram: 8000
             flavor-name: 'os.large'
@@ -381,6 +410,8 @@ providers:
     launch-timeout: 800
     rate: 0.001
     diskimages:
+      - name: debian-buster-arm64
+        config-drive: true
       - name: debian-stretch-arm64
         config-drive: true
       - name: ubuntu-xenial-arm64
@@ -391,6 +422,11 @@ providers:
       - name: main
         max-servers: 5
         labels:
+          - name: debian-buster-arm64
+            min-ram: 8000
+            flavor-name: 'c1.large'
+            diskimage: debian-buster-arm64
+            key-name: infra-root-keys-2018-06-15
           - name: debian-stretch-arm64
             min-ram: 8000
             flavor-name: 'c1.large'
@@ -409,6 +445,8 @@ providers:
 
 diskimages:
   - name: centos-7
+  - name: debian-buster
+  - name: debian-buster-arm64
   - name: debian-stretch
   - name: debian-stretch-arm64
   - name: fedora-28
diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml
index 481761c529..41e91a476b 100644
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@@ -14,6 +14,7 @@ zookeeper-servers:
 # another launcher will need to assume this logic.
 labels:
   - name: centos-7
+  - name: debian-buster
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
@@ -35,6 +36,8 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
+      - name: debian-buster
+        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -66,6 +69,13 @@ providers:
             key-name: infra-root-keys-2018-06-15
             instance-properties:
               glean_ignore_interfaces: 'True'
+          - name: debian-buster
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: debian-buster
+            key-name: infra-root-keys-2018-06-15
+            instance-properties:
+              glean_ignore_interfaces: 'True'
           - name: debian-stretch
             min-ram: 8000
             flavor-name: ssd-osFoundation-3
@@ -151,6 +161,7 @@ providers:
 
 diskimages:
   - name: centos-7
+  - name: debian-buster
   - name: debian-stretch
   - name: fedora-28
   - name: fedora-29
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 426e9d4741..02046a6eb2 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -37,6 +37,8 @@ providers:
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
+      - name: debian-buster
+        config-drive: true
       - name: debian-stretch
         config-drive: true
       - name: fedora-28
@@ -160,6 +162,30 @@ diskimages:
       GIT_HTTP_LOW_SPEED_TIME: '300'
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
       DIB_SHOW_IMAGE_USAGE: '1'
+  - name: debian-buster
+    pause: false
+    elements:
+      - debian-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - growroot
+      - infra-package-needs
+    release: buster
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_CHECKSUM: '1'
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      DIB_APT_LOCAL_CACHE: '0'
+      DIB_DISABLE_APT_CLEANUP: '1'
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/debian'
+      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
+      DIB_GRUB_TIMEOUT: '0'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+      DIB_SHOW_IMAGE_USAGE: '1'
   - name: fedora-28
     pause: false
     elements: