diff --git a/bindep.txt b/bindep.txt
index 3e30527..0265648 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,8 +1,9 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
-libffi-dev [platform:dpkg]
 libffi-devel [platform:rpm]
+libffi-dev [platform:dpkg]
 libselinux-python [platform:rpm]
 libssl-dev [platform:dpkg]
 openssl-devel [platform:rpm]
+python2-dnf [platform:fedora]
diff --git a/files/etc/default/nodepool b/files/etc/default/nodepool
index c924ccf..ab241f7 100644
--- a/files/etc/default/nodepool
+++ b/files/etc/default/nodepool
@@ -7,7 +7,7 @@
 PREFIX=/usr/local
 
 # Options to pass to nodepoold.
-ARGS="-l /etc/nodepool/logging.conf --no-builder --no-deletes --no-launches"
+ARGS="-l /etc/nodepool/logging.conf --no-builder --no-launches"
 
 # The user used to nodepool service.
 RUNASUSER=nodepool
diff --git a/files/etc/default/nodepool-deleter b/files/etc/default/nodepool-deleter
index 87da989..c8176ad 100644
--- a/files/etc/default/nodepool-deleter
+++ b/files/etc/default/nodepool-deleter
@@ -7,7 +7,7 @@
 PREFIX=/usr/local
 
 # Options to pass to nodepool-deleter.
-ARGS="-l /etc/nodepool/deleter-logging.conf --no-builder --no-images --no-launches --no-webapp"
+ARGS="-l /etc/nodepool/deleter-logging.conf --no-builder --no-launches --no-webapp"
 
 # The user used to nodepool-deleter service.
 RUNASUSER=nodepool
diff --git a/files/etc/default/nodepool-launcher b/files/etc/default/nodepool-launcher
index cf69350..12e17b2 100644
--- a/files/etc/default/nodepool-launcher
+++ b/files/etc/default/nodepool-launcher
@@ -7,7 +7,7 @@
 PREFIX=/usr/local
 
 # Options to pass to nodepool-launcher.
-ARGS="-l /etc/nodepool/launcher-logging.conf --no-builder --no-deletes --no-images --no-webapp"
+ARGS="-l /etc/nodepool/launcher-logging.conf --no-builder --no-deletes --no-webapp"
 
 # The user used to nodepool-launcher service.
 RUNASUSER=nodepool
diff --git a/files/etc/sysconfig/nodepool b/files/etc/sysconfig/nodepool
index af0f5f7..64fd81e 100644
--- a/files/etc/sysconfig/nodepool
+++ b/files/etc/sysconfig/nodepool
@@ -7,6 +7,6 @@
 PREFIX=/usr
 
 # Options to pass to nodepoold.
-ARGS="-l /etc/nodepool/logging.conf --no-builder --no-deletes --no-launches"
+ARGS="-l /etc/nodepool/logging.conf --no-builder --no-launches"
 
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/sysconfig/nodepool-deleter b/files/etc/sysconfig/nodepool-deleter
index 763b73b..029e2fa 100644
--- a/files/etc/sysconfig/nodepool-deleter
+++ b/files/etc/sysconfig/nodepool-deleter
@@ -7,6 +7,6 @@
 PREFIX=/usr
 
 # Options to pass to nodepool-deleter.
-ARGS="-l /etc/nodepool/deleter-logging.conf --no-builder --no-images --no-launches --no-webapp"
+ARGS="-l /etc/nodepool/deleter-logging.conf --no-builder --no-launches --no-webapp"
 
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/sysconfig/nodepool-launcher b/files/etc/sysconfig/nodepool-launcher
index 83bda0f..f8c0f92 100644
--- a/files/etc/sysconfig/nodepool-launcher
+++ b/files/etc/sysconfig/nodepool-launcher
@@ -7,6 +7,6 @@
 PREFIX=/usr
 
 # Options to pass to nodepool-launcher.
-ARGS="-l /etc/nodepool/launcher-logging.conf --no-builder --no-deletes --no-images --no-webapp"
+ARGS="-l /etc/nodepool/launcher-logging.conf --no-builder --no-deletes --no-webapp"
 
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/templates/etc/nodepool/nodepool.yaml b/templates/etc/nodepool/nodepool.yaml
index c18e3e8..409fc31 100644
--- a/templates/etc/nodepool/nodepool.yaml
+++ b/templates/etc/nodepool/nodepool.yaml
@@ -5,6 +5,10 @@ elements-dir: /etc/nodepool/elements
 images-dir: /opt/nodepool/images
 script-dir: /etc/nodepool/scripts
 
+zookeeper-servers:
+  - host: localhost
+    port: 2181
+
 gearman-servers: []
 
 zmq-publishers: []