diff --git a/roles/docker-install/defaults/main.yml b/roles/docker_compose_install/defaults/main.yml
similarity index 77%
rename from roles/docker-install/defaults/main.yml
rename to roles/docker_compose_install/defaults/main.yml
index f9d1ff7..06548fe 100644
--- a/roles/docker-install/defaults/main.yml
+++ b/roles/docker_compose_install/defaults/main.yml
@@ -7,9 +7,10 @@
 docker_compose_install_apt_key_uri: https://download.docker.com/linux/ubuntu/gpg
 
 # The docker apt repo config line
-docker_compose_install_apt_repo: deb https://download.docker.com/linux/ubuntu bionic stable
+docker_compose_install_apt_repo: deb https://download.docker.com/linux/ubuntu {{ansible_lsb.codename}} stable
 
+# This needs to be supplied externally.
 # Get this version from https://github.com/docker/compose/releases/
 # Check compatibility with docker.
-docker_compose_install_compose_verion: 1.22.0
+#docker_compose_install_compose_version: 
 
diff --git a/roles/docker-install/tasks/main.yml b/roles/docker_compose_install/tasks/main.yml
similarity index 72%
rename from roles/docker-install/tasks/main.yml
rename to roles/docker_compose_install/tasks/main.yml
index 2b61dc8..64ec133 100644
--- a/roles/docker-install/tasks/main.yml
+++ b/roles/docker_compose_install/tasks/main.yml
@@ -7,10 +7,10 @@
       - apt-transport-https
       - ca-certificates
       - software-properties-common
-      - python-pip
+      - python3-pip
       - virtualenv
-      - python-setuptools
-      - python-docker
+      - python3-setuptools
+      - python3-docker
 
 - name: add docker repository key
   apt_key:
@@ -38,6 +38,19 @@
     name:
       - docker-compose
 
+- name: docker daemon configuration
+  copy:
+    dest: /etc/docker/daemon.json
+    content: |-
+      {
+        "log-driver": "json-file",
+        "log-opts": {
+          "max-size": "30m"
+        }
+      }
+  notify:
+    - restart docker daemon
+    
 - name: enable docker
   service:
     name: docker