diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py
index 92641c6ce..035d5cdf8 100644
--- a/buildman/manager/executor.py
+++ b/buildman/manager/executor.py
@@ -11,6 +11,7 @@ from trollius import coroutine, From, Return, get_event_loop
 from functools import partial
 
 from buildman.asyncutil import AsyncWrapper
+from container_cloud_config import CloudConfigContext
 
 
 logger = logging.getLogger(__name__)
@@ -20,7 +21,7 @@ ONE_HOUR = 60*60
 
 ENV = Environment(loader=FileSystemLoader('buildman/templates'))
 TEMPLATE = ENV.get_template('cloudconfig.yaml')
-
+CloudConfigContext().populate_jinja_environment(ENV)
 
 class ExecutorException(Exception):
   """ Exception raised when there is a problem starting or stopping a builder.
diff --git a/buildman/templates/cloudconfig.yaml b/buildman/templates/cloudconfig.yaml
index 13e6894bf..51bb2f090 100644
--- a/buildman/templates/cloudconfig.yaml
+++ b/buildman/templates/cloudconfig.yaml
@@ -19,18 +19,13 @@ coreos:
     group: {{ coreos_channel }}
 
   units:
-    - name: quay-builder.service
-      command: start
-      content: |
-        [Unit]
-        Description=Quay builder container
-        Author=Jake Moshenko
-        After=docker.service
-
-        [Service]
-        TimeoutStartSec=600
-        TimeoutStopSec=2000
-        ExecStartPre=/usr/bin/docker login -u {{ quay_username }} -p {{ quay_password }} -e unused quay.io
-        ExecStart=/usr/bin/docker run --rm --net=host --name quay-builder --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock -v /usr/share/ca-certificates:/etc/ssl/certs quay.io/coreos/registry-build-worker:{{ worker_tag }}
-        ExecStop=/usr/bin/docker stop quay-builder
-        ExecStopPost=/bin/sh -xc "/bin/sleep 120; /usr/bin/systemctl --no-block poweroff"
+    {{ dockersystemd('quay-builder',
+                     'quay.io/coreos/registry-build-worker',
+                     quay_username,
+                     quay_password,
+                     worker_tag,
+                     extra_args='--net=host --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock -v /usr/share/ca-certificates:/etc/ssl/certs',
+                     exec_stop_post=['/bin/sh -xc "/bin/sleep 120; /usr/bin/systemctl --no-block poweroff"'],
+                     flattened=True,
+                     restart_policy='no'
+                    ) | indent(4) }}
diff --git a/requirements-nover.txt b/requirements-nover.txt
index 3ac8c84a6..83953b6be 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -40,6 +40,7 @@ git+https://github.com/DevTable/aniso8601-fake.git
 git+https://github.com/DevTable/anunidecode.git
 git+https://github.com/DevTable/avatar-generator.git
 git+https://github.com/DevTable/pygithub.git
+git+https://github.com/DevTable/container-cloud-config.git
 git+https://github.com/jplana/python-etcd.git
 gipc
 pygpgme
diff --git a/requirements.txt b/requirements.txt
index 73ce4da45..7981d1c2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -63,5 +63,6 @@ git+https://github.com/DevTable/aniso8601-fake.git
 git+https://github.com/DevTable/anunidecode.git
 git+https://github.com/DevTable/avatar-generator.git
 git+https://github.com/DevTable/pygithub.git
+git+https://github.com/DevTable/container-cloud-config.git
 git+https://github.com/NateFerrero/oauth2lib.git
 git+https://github.com/jplana/python-etcd.git