diff --git a/README.md b/README.md
index 2859892..9225621 100644
--- a/README.md
+++ b/README.md
@@ -1,42 +1,23 @@
 
 # Docker
 
-Formulas for working with Docker
+Docker is a platform for developers and sysadmins to develop, ship, and run applications. Docker lets you quickly assemble applications from components and eliminates the friction that can come when shipping code. Docker lets you get your code tested and deployed into production as fast as possible.
+
+Docker is supported on the following systems:
+
+* Debian 8.0 Jessie (64-bit)
+* Ubuntu Trusty 14.04 (LTS) (64-bit)
+* Ubuntu Precise 12.04 (LTS) (64-bit)
+* Ubuntu Raring 13.04 and Saucy 13.10 (64 bit)
 
 ## Sample pillar
 
-    django_pki:
-      server:
+    docker:
+      host:
         enabled: true
-        secret_key: 'y5m^_^ak6+y5m^_y5m^_^ak6+^ak6+5(f...'
-        default_key_length: 2048
-        default_country: 'CZ'
-        passphrase_min_length: 12
-        workers: 3
-        bind:
-          address: 0.0.0.0
-          port: 8642
-          protocol: tcp
-        source:
-          engine: 'git'
-          address: 'git@repo.domain.com:django/django-pki.git'
-          rev: 'master'
-        cache:
-          engine: 'memcached'
-          host: '127.0.0.1'
-          prefix: 'CACHE_DJANGO_PKI'
-        database:
-          engine: 'postgresql'
-          host: '127.0.0.1'
-          name: 'django_pki'
-          password: 'pwd'
-          user: 'django_pki'
-        mail:
-          host: 'mail.domain.com'
-          password: 'mail-pwd'
-          user: 'mail-user'
 
 ## Read more
 
+* https://docs.docker.com/installation/ubuntulinux/
 * https://github.com/saltstack-formulas/docker-formula
-* 
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/files/docker_apt.pgp b/files/docker_apt.pgp
new file mode 100644
index 0000000..f9aa36a
--- /dev/null
+++ b/files/docker_apt.pgp
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQENBFIOqEUBCADsvqwefcPPQArws9jHF1PaqhXxkaXzeE5uHHtefdoRxQdjoGok
+HFmHWtCd9zR7hDpHE7Q4dwJtSFWZAM3zaUtlvRAgvMmfLm08NW9QQn0CP5khjjF1
+cgckhjmzQAzpEHO5jiSwl0ZU8ouJrLDgmbhT6knB1XW5/VmeECqKRyhlEK0zRz1a
+XV+4EVDySlORmFyqlmdIUmiU1/6pKEXyRBBVCHNsbnpZOOzgNhfMz8VE8Hxq7Oh8
+1qFaFXjNGCrNZ6xr/DI+iXlsZ8urlZjke5llm4874N8VPUeFQ/szmsbSqmCnbd15
+LLtrpvpSMeyRG+LoTYvyTG9QtAuewL9EKJPfABEBAAG0OURvY2tlciBSZWxlYXNl
+IFRvb2wgKHJlbGVhc2Vkb2NrZXIpIDxkb2NrZXJAZG90Y2xvdWQuY29tPokBOAQT
+AQIAIgUCUg6oRQIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ2Fdqi6iN
+IenM+QgAnOiozhHDAYGO92SmZjib6PK/1djbrDRMreCT8bnzVpriTOlEtARDXsmX
+njKSFa+HTxHi/aTNo29TmtHDfUupcfmaI2mXbZt1ixXLuwcMv9sJXKoeWwKZnN3i
+9vAM9/yAJz3aq+sTXeG2dDrhZr34B3nPhecNkKQ4v6pnQy43Mr59Fvv5CzKFa9oZ
+IoZf+Ul0F90HSw5WJ1NsDdHGrAaHLZfzqAVrqHzazw7ghe94k460T8ZAaovCaTQV
+HzTcMfJdPz/uTim6J0OergT9njhtdg2ugUj7cPFUTpsxQ1i2S8qDEQPL7kabAZZo
+Pim0BXdjsHVftivqZqfWeVFKMorchQ==
+=fRgo
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/host.sls b/host.sls
index 117cc34..0e6a43a 100644
--- a/host.sls
+++ b/host.sls
@@ -1,33 +1,26 @@
 {% from "docker/map.jinja" import host with context %}
 {%- if host.enabled %}
 
-docker_packages:
-  pkg.installed:
-    - names: 
-
-    python-apt
-
-docker-dependencies:
-   pkg.installed:
-    - pkgs:
-      - iptables
-      - ca-certificates
-      - lxc
+{%- if grains.os == 'Ubuntu' %}
 
 docker_repo:
   pkgrepo.managed:
   - repo: 'deb http://get.docker.io/ubuntu docker main'
   - file: '/etc/apt/sources.list.d/docker.list'
-  - key_url: salt://docker/docker.pgp
+  - key_url: salt://docker/files/docker_apt.pgp
   - require_in:
-    - pkg: lxc-docker
-    - require:
-      - pkg: docker-python-apt
+    - pkg: docker_packages
 
-lxc-docker:
+{%- endif %}
+
+docker_packages:
   pkg.latest:
-    - require:
-      - pkg: docker-dependencies
+  - pkgs: {{ host.pkgs }}
 
-docker:
-  service.running
\ No newline at end of file
+docker_service:
+  service.running:
+  - name: {{ host.service }}
+  - require:
+    - pkg: docker_packages
+
+{%- endif %}
\ No newline at end of file
diff --git a/map.jinja b/map.jinja
index e69de29..b6ef018 100644
--- a/map.jinja
+++ b/map.jinja
@@ -0,0 +1,19 @@
+
+{% set host = salt['grains.filter_by']({
+    'CentOS': {
+        'pkgs': ['docker-io'],
+        'service': 'docker'
+    },
+    'Debian': {
+        'pkgs': ['docker.io'],
+        'service': 'docker'
+    },
+    'RedHat': {
+        'pkgs': ['iptables', 'lxc-docker'],
+        'service': 'docker'
+    },
+    'Ubuntu': {
+        'pkgs': ['iptables', 'ca-certificates', 'lxc', 'lxc-docker'],
+        'service': 'docker'
+    },
+}, grain='os', merge=salt['pillar.get']('docker:host')) %}
\ No newline at end of file