diff --git a/README.rst b/README.rst
index b2bf63e..3687dac 100644
--- a/README.rst
+++ b/README.rst
@@ -27,30 +27,18 @@
     docker:
       host:
         container:
-          registry:
-            image: "registry:2"
-            runoptions:
-              - -e "REGISTRY_STORAGE=inmemory"
-              - -e "GUNICORN_OPTS=[\"--preload\"]"
-              - "--log-driver=syslog"
-              - "-p 5000:5000"
-              - "--rm"
-
-Compose
--------
-
-.. code-block:: yaml
-
-    docker:
-      compose:
-        container:
-          postgres:
-            restart: always
-            image: postgres:latest
-            volumes_from:
-              - memcached
+          jenkins:
+            # Don't start automatically
+            start: false
+            restart: unless-stopped
+            image: jenkins:2.7.1
             ports:
-              - "5432:5432"
+              - 8081:8080
+              - 50000:50000
+            environment:
+              JAVA_OPTS: "-Dhudson.footerURL=https://www.example.com"
+            volumes:
+              - /srv/volumes/jenkins:/var/jenkins_home
 
 Registry
 --------
diff --git a/docker/compose.sls b/docker/container.sls
similarity index 100%
rename from docker/compose.sls
rename to docker/container.sls
diff --git a/docker/containers.sls b/docker/containers.sls
deleted file mode 100644
index 6bcac40..0000000
--- a/docker/containers.sls
+++ /dev/null
@@ -1,41 +0,0 @@
-{%- from "docker/map.jinja" import host with context %}
-
-{%- if host.enabled %}
-
-{% for name, container in host.container.items() %}
-docker-image-{{ name }}:
-  cmd.run:
-    - name: docker pull {{ container.image }}
-    - require:
-      - service: docker_service
-
-{# TODO: SysV init script #}
-{%- set init_system = salt["cmd.run"]("ps -p1 | grep -q systemd && echo systemd || echo upstart") %}
-
-docker-container-startup-config-{{ name }}:
-  file.managed:
-{%- if init_system == "systemd" %}
-    - name: /etc/systemd/system/docker-{{ name }}.service
-    - source: salt://docker/files/systemd.conf
-{%- elif init_system == "upstart" %}
-    - name: /etc/init/docker-{{ name }}.conf
-    - source: salt://docker/files/upstart.conf
-{%- endif %}
-    - mode: 700
-    - user: root
-    - template: jinja
-    - defaults:
-        name: {{ name | json }}
-        container: {{ container | json }}
-    - require:
-      - cmd: docker-image-{{ name }}
-
-docker-container-service-{{ name }}:
-  service.running:
-    - name: docker-{{ name }}
-    - enable: True
-    - watch:
-      - file: docker-container-startup-config-{{ name }}
-{% endfor %}
-
-{%- endif %}
diff --git a/docker/files/systemd.conf b/docker/files/systemd.conf
deleted file mode 100644
index cf1e2de..0000000
--- a/docker/files/systemd.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-Description=Docker container for {{ name }}
-Requires=docker.service
-After=docker.service
-
-{#- Ugly, but covers the cases where variable evaluates to false, is empty, or non-existent #}
-{%- set runoptions = container.get("runoptions") or [] %}
-{%- set stopoptions = container.get("stopoptions") or [] %}
-{%- set cmd = container.get("cmd") or "" %}
-
-{%- if runoptions == "None" %}
-{%- set runoptions = [] %}
-{%- endif %}
-
-{%- if cmd == "None" %}
-{%- set cmd = "" %}
-{%- endif %}
-
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/docker run -d {% for option in runoptions %}{{ option }} {% endfor %} --name={{ name }} {{ container.image }} {{ cmd }}
-ExecStop=/usr/bin/docker stop {{ name }}
-ExecStopPost=/usr/bin/docker rm -f {{ name }}
-
-[Install]
-WantedBy=local.target
diff --git a/docker/files/upstart.conf b/docker/files/upstart.conf
deleted file mode 100644
index 6825d43..0000000
--- a/docker/files/upstart.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-description "Docker container for {{ name }}"
-start on filesystem and started docker
-stop on runlevel [06]
-respawn
-
-{#- Ugly, but covers the cases where variable evaluates to false, is empty, or non-existent #}
-{%- set runoptions = container.get("runoptions", []) %}
-{%- set stopoptions = container.get("stopoptions", []) %}
-
-{%- if runoptions == "None" %}
-{%- set runoptions = [] %}
-{%- endif %}
-
-script
-  exec docker run \
-  {%- for option in runoptions %}
-    {{ option }} \
-  {%- endfor %}
-    --name={{ name }} \
-    {{ container.image }} {{ container.get("cmd", "") }}
-end script
-
-pre-stop script
-  /usr/bin/docker stop \
-  {%- for option in stopoptions %}
-    {{ option }} \
-  {%- endfor %}
-    {{ name }}
-  /usr/bin/docker rm {{ name }}
-end script
diff --git a/docker/host.sls b/docker/host.sls
index ff42833..5d451af 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -1,9 +1,6 @@
 {% from "docker/map.jinja" import host with context %}
 {%- if host.enabled %}
 
-include:
-- .containers
-
 docker_packages:
   pkg.installed:
   - pkgs: {{ host.pkgs }}
diff --git a/docker/init.sls b/docker/init.sls
index 6f3208e..ec94e24 100644
--- a/docker/init.sls
+++ b/docker/init.sls
@@ -3,8 +3,8 @@
 {%- if pillar.docker.host is defined %}
 - docker.host
 {%- endif %}
-{%- if pillar.docker.compose is defined %}
-- docker.compose
+{%- if pillar.docker.container is defined %}
+- docker.container
 {%- endif %}
 {%- if pillar.docker.registry is defined %}
 - docker.registry