diff --git a/README.rst b/README.rst
index 3687dac..d2c20f5 100644
--- a/README.rst
+++ b/README.rst
@@ -15,17 +15,20 @@
 Sample pillar
 -------------
 
+Host
+----
+
 .. code-block:: yaml
 
     docker:
       host:
         enabled: true
 
-Containers
-----------
+Client
+------
 
     docker:
-      host:
+      client:
         container:
           jenkins:
             # Don't start automatically
diff --git a/docker/container.sls b/docker/client/container.sls
similarity index 92%
rename from docker/container.sls
rename to docker/client/container.sls
index 09c627b..cd9d914 100644
--- a/docker/container.sls
+++ b/docker/client/container.sls
@@ -1,10 +1,9 @@
-{%- from "docker/map.jinja" import compose with context %}
+{% from "docker/map.jinja" import client with context %}
 
-docker_python:
-  pkg.installed:
-    - name: python-docker
+include:
+  - docker.client
 
-{%- for name, container in compose.container.items() %}
+{%- for name, container in client.container.items() %}
   {%- set id = name %}
   {%- set required_containers = [] %}
 
diff --git a/docker/host.sls b/docker/host.sls
index 5d451af..58c2997 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -30,27 +30,6 @@
   - require:
     - pkg: docker_packages
 
-{% if host.install_docker_py %}
-docker-py-requirements:
-  pkg.installed:
-    - name: python-pip
-  pip.installed:
-    - name: pip
-    - upgrade: True
-
-docker-py:
-  pip.installed:
-    {%- if "pip_version" in host %}
-    - name: docker-py {{ host.pip_version }}
-    {%- else %}
-    - name: docker-py
-    {%- endif %}
-    - require:
-      - pkg: docker_packages
-      - pip: docker-py-requirements
-    - reload_modules: True
-{% endif %}
-
 {%- if host.registry is defined %}
 
 {%- for name,registry in host.registry.iteritems() %}
diff --git a/docker/init.sls b/docker/init.sls
index ec94e24..6256940 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.container is defined %}
-- docker.container
+{%- if pillar.docker.client is defined %}
+- docker.client
 {%- endif %}
 {%- if pillar.docker.registry is defined %}
 - docker.registry
diff --git a/docker/map.jinja b/docker/map.jinja
index f228e3e..40e83c5 100644
--- a/docker/map.jinja
+++ b/docker/map.jinja
@@ -3,47 +3,26 @@
     'CentOS': {
         'pkgs': ['docker-io'],
         'service': 'docker',
-        'container': {},
-        'install_docker_py': False
     },
     'Debian': {
         'pkgs': ['docker.io'],
         'service': 'docker',
-        'container': {},
-        'install_docker_py': False
     },
     'RedHat': {
         'pkgs': ['iptables', 'lxc-docker'],
         'service': 'docker',
-        'container': {},
-        'install_docker_py': False
     },
     'Ubuntu': {
         'pkgs': ['docker-engine', 'python-docker'],
         'service': 'docker',
-        'container': {},
-        'install_docker_py': False
     },
 }, grain='os', merge=salt['pillar.get']('docker:host')) %}
 
-{% set compose = salt['grains.filter_by']({
-    'CentOS': {
-        'pkgs': ['docker-io'],
-        'service': 'docker'
+{% set client = salt['grains.filter_by']({
+    'default': {
+        'pkgs': ['python-docker'],
     },
-    'Debian': {
-        'pkgs': ['docker.io'],
-        'service': 'docker'
-    },
-    'RedHat': {
-        'pkgs': ['iptables', 'lxc-docker'],
-        'service': 'docker'
-    },
-    'Ubuntu': {
-        'pkgs': ['docker-engine'],
-        'service': 'docker'
-    },
-}, grain='os', merge=salt['pillar.get']('docker:compose')) %}
+}, grain='os', merge=salt['pillar.get']('docker:client')) %}
 
 {% set registry = salt['grains.filter_by']({
     'default': {
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
new file mode 100644
index 0000000..ac6c99d
--- /dev/null
+++ b/metadata/service/client.yml
@@ -0,0 +1,6 @@
+applications:
+- docker
+parameters:
+  docker:
+    client:
+      enabled: true
diff --git a/metadata/service/host/container/registry.yml b/metadata/service/host/container/registry.yml
deleted file mode 100644
index c081ed8..0000000
--- a/metadata/service/host/container/registry.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  docker:
-    host:
-      container:
-        registry:
-          image: "registry:2"
-          runoptions:
-            - -e "REGISTRY_STORAGE=inmemory"
-            - -e "GUNICORN_OPTS=[\"--preload\"]"
-            - "--log-driver=syslog"
-            - "-p 5000:5000"
-            - "--rm"
\ No newline at end of file