diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml
index 3cb7efee81..6dce33f426 100644
--- a/nodepool/nb03.openstack.org.yaml
+++ b/nodepool/nb03.openstack.org.yaml
@@ -68,7 +68,6 @@ diskimages:
       - openstack-repos
       - nodepool-base
       - cache-devstack
-      - initialize-urandom
       - growroot
       - infra-package-needs
     release: stretch
@@ -80,6 +79,5 @@ diskimages:
       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 1e28d3730c..b3f1bc6bfb 100644
--- a/nodepool/nl01.openstack.org.yaml
+++ b/nodepool/nl01.openstack.org.yaml
@@ -13,6 +13,8 @@ labels:
     min-ready: 1
   - name: debian-jessie
     min-ready: 1
+  - name: debian-stretch
+    min-ready: 1
   - name: fedora-27
     min-ready: 1
   - name: opensuse-423
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 3ad9a7c46a..e035cf133c 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -140,7 +140,8 @@ diskimages:
       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_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'
@@ -162,7 +163,8 @@ diskimages:
       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_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'