diff --git a/script/terraform/template/ansible/common/roles/containerd/defaults/main.yaml b/script/terraform/template/ansible/common/roles/containerd/defaults/main.yaml
index 60945c3..b880134 100644
--- a/script/terraform/template/ansible/common/roles/containerd/defaults/main.yaml
+++ b/script/terraform/template/ansible/common/roles/containerd/defaults/main.yaml
@@ -1,6 +1,7 @@
 
+docker_dist_repo: "https://download.docker.com"
 containerd_default_version: 
-  ubuntu: "1.5.9-*"
+  ubuntu: "1.6.15-*"
   centos: "1.6.10-*"
   debian: "1.4.13~*"
 containerd_data_root: "/var/lib/containerd"
diff --git a/script/terraform/template/ansible/common/roles/containerd/tasks/install-ubuntu.yaml b/script/terraform/template/ansible/common/roles/containerd/tasks/install-ubuntu.yaml
index cf901d1..38793d8 100644
--- a/script/terraform/template/ansible/common/roles/containerd/tasks/install-ubuntu.yaml
+++ b/script/terraform/template/ansible/common/roles/containerd/tasks/install-ubuntu.yaml
@@ -1,13 +1,48 @@
 
-  - name: install containerd
-    apt:
-      name:
-      - "containerd={{ containerd_version | default(containerd_default_version['ubuntu']) }}"
-      state: present
-      update_cache: yes
-    become: yes
-    register: aptrc
-    until: aptrc is success
-    retries: 10
-    delay: 10
+- name: add software dependencies
+  apt:
+    name:
+    - ca-certificates
+    - gnupg
+    state: present
+  ignore_errors: yes
+  become: yes
+  register: aptrc
+  until: aptrc is success
+  retries: 10
+  delay: 10
+
+
+- name: add docker GPG key
+  apt_key:
+    url: "{{ docker_dist_repo }}/linux/ubuntu/gpg"
+    state: present
+  register: aptrc
+  become: yes
+  until: aptrc is success
+  retries: 10
+  delay: 10
+
+- name: get os codename
+  shell:
+    cmd: ". /etc/os-release; echo $VERSION_CODENAME"
+    executable: /bin/bash
+  register: codename
+
+- name: add docker repository to apt
+  apt_repository:
+    repo: "deb {{ docker_dist_repo }}/linux/ubuntu {{ codename.stdout | lower }} stable"
+    state: present
+  become: yes
+
+- name: install containerd.io
+  apt:
+    name:
+    - "containerd.io={{ containerd_default_version['ubuntu'] }}"
+    update_cache: yes
+  register: aptrc
+  become: yes
+  until: aptrc is success
+  retries: 10
+  delay: 10