diff --git a/.github/workflows/gcloud.yml b/.github/workflows/gcloud.yml
index 341fb85..effeb61 100644
--- a/.github/workflows/gcloud.yml
+++ b/.github/workflows/gcloud.yml
@@ -27,10 +27,10 @@ jobs:
             command: /usr/sbin/init
           - distro: centos:8
             command: /usr/sbin/init
-          - distro: ubuntu:16.04
-            command: /sbin/init
           - distro: ubuntu:18.04
             command: /lib/systemd/systemd
+          - distro: ubuntu:20.04
+            command: /lib/systemd/systemd
           - distro: debian:9
             command: /lib/systemd/systemd
         collection_role:
@@ -48,9 +48,18 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt install docker
+          sudo apt-get install -y apt-transport-https ca-certificates curl gnupg \
+            lsb-release
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg \
+            --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          echo \
+            "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
+            $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+          sudo apt-get update
+          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
           python -m pip install --upgrade pip
-          pip install molecule yamllint ansible-lint docker
+          pip install molecule yamllint ansible ansible-lint docker \
+            molecule[docker]
 
       - name: Run role test
         run: >-
diff --git a/molecule/gcloud/converge.yml b/molecule/gcloud/converge.yml
index 6889b4b..3790ebf 100644
--- a/molecule/gcloud/converge.yml
+++ b/molecule/gcloud/converge.yml
@@ -13,11 +13,13 @@
       file:
         path: /etc/systemd/system/containerd.service.d
         state: directory
+        mode: 0755
       when: ansible_service_mgr == "systemd"
     - name: override file for containerd
       copy:
         src: files/override.conf
         dest: /etc/systemd/system/containerd.service.d/override.conf
+        mode: 0644
       when: ansible_service_mgr == "systemd"
   roles:
     - role: google.cloud.gcloud
diff --git a/molecule/gcsfuse/converge.yml b/molecule/gcsfuse/converge.yml
index f4c2bce..b0e6311 100644
--- a/molecule/gcsfuse/converge.yml
+++ b/molecule/gcsfuse/converge.yml
@@ -14,11 +14,13 @@
       file:
         path: /etc/systemd/system/containerd.service.d
         state: directory
+        mode: 0755
       when: ansible_service_mgr == "systemd"
     - name: override file for containerd
       copy:
         src: files/override.conf
         dest: /etc/systemd/system/containerd.service.d/override.conf
+        mode: 0644
       when: ansible_service_mgr == "systemd"
   roles:
     - role: google.cloud.gcsfuse
diff --git a/roles/gcloud/LICENSE b/roles/gcloud/LICENSE
deleted file mode 100644
index 616fc1e..0000000
--- a/roles/gcloud/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Eric Anderson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/roles/gcloud/README.md b/roles/gcloud/README.md
index dfc365a..8c6b83a 100644
--- a/roles/gcloud/README.md
+++ b/roles/gcloud/README.md
@@ -1,6 +1,4 @@
-# ericsysmin.gcloud
-
-[![Build Status](https://travis-ci.org/ericsysmin/ansible-role-gcloud.svg?branch=master)](https://travis-ci.org/ericsysmin/ansible-role-gcloud)
+# google.cloud.gcloud
 
 This role installs the gcloud command-line tool on a linux system.
 
@@ -48,7 +46,7 @@ All variables which can be overridden are stored in defaults/main.yml file as we
 ```yaml
 - hosts: servers
   roles:
-     - role: ericsysmin.gcloud
+     - role: google.cloud.gcloud
 ```
 
 ## License
diff --git a/roles/gcloud/defaults/main.yml b/roles/gcloud/defaults/main.yml
index b5c4534..deeec69 100644
--- a/roles/gcloud/defaults/main.yml
+++ b/roles/gcloud/defaults/main.yml
@@ -5,7 +5,7 @@ gcloud_install_type: package
 # default values for gcloud apt installation
 gcloud_apt_key: https://packages.cloud.google.com/apt/doc/apt-key.gpg
 gcloud_apt_url: http://packages.cloud.google.com/apt
-gcloud_apt_repo: cloud-sdk-{{ ansible_distribution_release }}
+gcloud_apt_repo: cloud-sdk
 
 # default values for gcloud yum installation
 gcloud_yum_baseurl: https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64
diff --git a/roles/gcloud/meta/main.yml b/roles/gcloud/meta/main.yml
index 50918c4..8c8e784 100644
--- a/roles/gcloud/meta/main.yml
+++ b/roles/gcloud/meta/main.yml
@@ -3,9 +3,8 @@ galaxy_info:
   role_name: gcloud
   author: Eric Anderson
   description: Ansible role to install google-cloud-sdk
-  company: Avi Networks
-  license: MIT
-  min_ansible_version: 2.4
+  license: GPL-3.0
+  min_ansible_version: 2.9
   platforms:
     - name: Ubuntu
       versions:
diff --git a/roles/gcloud/tasks/archive/archive_install.yml b/roles/gcloud/tasks/archive/archive_install.yml
index b1a6606..009d262 100644
--- a/roles/gcloud/tasks/archive/archive_install.yml
+++ b/roles/gcloud/tasks/archive/archive_install.yml
@@ -1,6 +1,6 @@
 ---
 - name: gcloud | Archive | Ensure temp path exists
-  file: path={{ gcloud_archive_path }} state=directory
+  file: path={{ gcloud_archive_path }} state=directory mode=0755
 
 - name: gcloud | Archive | Extract Cloud SDK archive
   unarchive:
diff --git a/roles/gcloud/tasks/archive/command_completion.yml b/roles/gcloud/tasks/archive/command_completion.yml
index 866dbfb..1c6a457 100644
--- a/roles/gcloud/tasks/archive/command_completion.yml
+++ b/roles/gcloud/tasks/archive/command_completion.yml
@@ -24,6 +24,7 @@
     owner: root
     group: root
     state: directory
+    mode: 0755
 
 - name: gcloud | Archive | Link binaries to /usr/bin (like package install)
   file:
diff --git a/roles/gcloud/tasks/archive/main.yml b/roles/gcloud/tasks/archive/main.yml
index 7fff493..1175bfc 100644
--- a/roles/gcloud/tasks/archive/main.yml
+++ b/roles/gcloud/tasks/archive/main.yml
@@ -5,7 +5,8 @@
     path: "{{ gcloud_archive_path }}/google-cloud-sdk/VERSION"
   register: gcloud_status
 
-- debug: var=gcloud_status
+- name: gcloud | Archive | Get gcloud_status
+  debug: var=gcloud_status
 
 - name: gcloud | Archive | Set installed version if installation exists
   block:
@@ -16,9 +17,11 @@
     - name: gcloud | Archive | Setting the gcloud_installed_version variable/fact
       set_fact:
         gcloud_installed_version: "{{ (gcloud_installed_version_data.content|b64decode|trim) }}"
-    - debug:
+    - name: gcloud | Archive | get the gcloud_installed_version
+      debug:
         msg: "google-cloud-sdk: {{ gcloud_installed_version }} is installed"
-    - debug:
+    - name: gcloud | Archive | Version already installed
+      debug:
         msg: >-
           Skipping installation of google-cloud-sdk version {{ gcloud_version }} when
           {{ gcloud_installed_version }} is already installed.