diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml
index 7a42370307..3cb7efee81 100644
--- a/nodepool/nb03.openstack.org.yaml
+++ b/nodepool/nb03.openstack.org.yaml
@@ -8,6 +8,8 @@ zookeeper-servers:
 labels:
   - name: ubuntu-xenial-arm64
     max-ready-age: 3600
+  - name: debian-stretch-arm64
+    max-ready-age: 3600
 
 providers:
   - name: linaro-cn1
@@ -23,6 +25,14 @@ providers:
           os_command_line: "console=ttyAMA0"
           hw_disk_bus: scsi
           hw_scsi_model: virtio-scsi
+      - name: debian-stretch-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
 
 diskimages:
   - name: ubuntu-xenial-arm64
@@ -49,3 +59,27 @@ diskimages:
       DIB_DEBIAN_COMPONENTS: 'main,universe'
       GIT_HTTP_LOW_SPEED_TIME: '300'
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+  - name: debian-stretch-arm64
+    elements:
+      - block-device-efi
+      - debian-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - initialize-urandom
+      - growroot
+      - infra-package-needs
+    release: stretch
+    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.regionone.linaro.openstack.org/debian'
+      DIB_DEBOOTSTRAP_EXTRA_ARGS: '--no-check-gpg'
+      DIB_DEBIAN_COMPONENTS: 'main'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml
index ea13446841..1e28d3730c 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -38,6 +38,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: opensuse-423
@@ -64,6 +66,11 @@ providers:
             flavor-name: 'Performance'
             diskimage: debian-jessie
             key-name: infra-root-keys
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: 'Performance'
+            diskimage: debian-stretch
+            key-name: infra-root-keys
           - name: fedora-27
             min-ram: 8000
             flavor-name: 'Performance'
@@ -123,6 +130,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
   - name: fedora-27
   - name: gentoo
   - name: opensuse-423
diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 78f5a1d72e..eef9832491 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -11,6 +11,7 @@ zookeeper-servers:
 labels:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
   - name: fedora-27
   - name: opensuse-423
   - name: opensuse-tumbleweed
@@ -31,6 +32,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: opensuse-423
@@ -61,6 +64,11 @@ providers:
             flavor-name: '8C-8GB-100GB'
             diskimage: debian-jessie
             key-name: infra-root-keys
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: '8C-8GB-100GB'
+            diskimage: debian-stretch
+            key-name: infra-root-keys
           - name: fedora-27
             min-ram: 8000
             flavor-name: '8C-8GB-100GB'
@@ -164,6 +172,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: debian-jessie
             key-name: infra-root-keys
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: debian-stretch
+            key-name: infra-root-keys
           - name: fedora-27
             min-ram: 8000
             flavor-name: 'nodepool.0'
@@ -198,6 +211,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
   - name: fedora-27
   - name: gentoo
   - name: opensuse-423
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index d12bd5cb7d..6e180e5345 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -14,6 +14,9 @@ zookeeper-servers:
 labels:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
+  - name: debian-stretch-arm64
+    min-ready: 1
   - name: fedora-27
   - name: opensuse-423
   - name: opensuse-tumbleweed
@@ -35,6 +38,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: opensuse-423
@@ -61,6 +66,11 @@ providers:
             flavor-name: 'A1.8'
             diskimage: debian-jessie
             key-name: infra-root-keys
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: 'A1.8'
+            diskimage: debian-stretch
+            key-name: infra-root-keys
           - name: fedora-27
             min-ram: 8000
             flavor-name: 'A1.8'
@@ -116,6 +126,13 @@ providers:
             key-name: infra-root-keys
             boot-from-volume: True
             volume-size: 80
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: 'v2-highcpu-8'
+            diskimage: debian-stretch
+            key-name: infra-root-keys
+            boot-from-volume: True
+            volume-size: 80
           - name: fedora-27
             min-ram: 8000
             flavor-name: 'v2-highcpu-8'
@@ -177,10 +194,17 @@ providers:
             flavor-name: 'os.large'
             diskimage: ubuntu-xenial-arm64
             key-name: infra-root-keys
+          - name: debian-stretch-arm64
+            min-ram: 8000
+            flavor-name: 'os.large'
+            diskimage: debian-stretch-arm64
+            key-name: infra-root-keys
 
 diskimages:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
+  - name: debian-stretch-arm64
   - name: fedora-27
   - name: gentoo
   - name: opensuse-423
diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml
index 849a156827..c22fca85e3 100644
--- a/nodepool/nl04.openstack.org.yaml
+++ b/nodepool/nl04.openstack.org.yaml
@@ -11,6 +11,7 @@ zookeeper-servers:
 labels:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
   - name: fedora-27
   - name: opensuse-423
   - name: opensuse-tumbleweed
@@ -30,6 +31,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: opensuse-423
@@ -56,6 +59,11 @@ providers:
             flavor-name: ssd-osFoundation-3
             diskimage: debian-jessie
             key-name: infra-root-keys
+          - name: debian-stretch
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: debian-stretch
+            key-name: infra-root-keys
           - name: fedora-27
             min-ram: 8000
             flavor-name: ssd-osFoundation-3
@@ -102,6 +110,7 @@ providers:
 diskimages:
   - name: centos-7
   - name: debian-jessie
+  - name: debian-stretch
   - name: fedora-27
   - name: gentoo
   - name: opensuse-423
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 1cb81ef9a0..3ad9a7c46a 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -41,6 +41,8 @@ providers:
         config-drive: true
       - name: debian-jessie
         config-drive: true
+      - name: debian-stretch
+        config-drive: true
       - name: fedora-27
         config-drive: true
       - name: gentoo-17-0-systemd
@@ -142,6 +144,28 @@ diskimages:
       DIB_GRUB_TIMEOUT: '0'
       GIT_HTTP_LOW_SPEED_TIME: '300'
       GIT_HTTP_LOW_SPEED_LIMIT: '1000'
+  - name: debian-stretch
+    pause: false
+    elements:
+      - debian-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - cache-devstack
+      - growroot
+      - infra-package-needs
+    release: stretch
+    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://ftp.us.debian.org/debian/
+      DIB_GRUB_TIMEOUT: '0'
+      GIT_HTTP_LOW_SPEED_TIME: '300'
+      GIT_HTTP_LOW_SPEED_LIMIT: '1000'
   - name: fedora-27
     pause: false
     elements: