diff --git a/simulation-scripts/perturb.sh b/simulation-scripts/perturb.sh
index d593acd4..e629fef6 100755
--- a/simulation-scripts/perturb.sh
+++ b/simulation-scripts/perturb.sh
@@ -339,7 +339,7 @@ template_tasks() {
   local pod_name
   local POD_NAME
   local POD_RESULT
-  tasks_json=$(yq r -j tasks.yaml)
+  tasks_json=$(yq eval -j tasks.yaml)
   cp tasks.yaml "${tmptasks}"
   POD_NAME=$(echo "${tasks_json}" | jq -r '.tasks[].startingPoint.podName | select (.!=null)')
   for pod_name in $POD_NAME; do
diff --git a/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml b/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
index 51abbdb6..603d9e5b 100644
--- a/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
+++ b/terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
@@ -48,9 +48,11 @@ write_files:
 runcmd:
   - 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
   - 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main"  > /etc/apt/sources.list.d/kubernetes.list'
+  - 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
+  - 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
   - 'mkdir /run/download'
   - 'apt update'
-  - 'apt install -y kubelet kubeadm kubectl docker.io awscli'
+  - 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
   - 'wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz'
   - 'tar -C /usr/bin -xzf /run/download/crictl.tgz'
   - 'chmod 754 /usr/bin/crictl'
@@ -61,6 +63,7 @@ runcmd:
   - 'systemctl restart kubelet'
   - 'wget https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -O /run/download/rbac-kdd.yaml'
   - 'wget https://docs.projectcalico.org/v3.9/manifests/calico.yaml -O /run/download/calico.yaml'
+  - 'kubeadm config images pull'
   - 'kubeadm init --pod-network-cidr=192.168.0.0/16'
   - 'mkdir /root/.kube'
   - 'cp /etc/kubernetes/admin.conf /root/.kube/config'
diff --git a/terraform/modules/AWS/Kubernetes/master-goss.yaml b/terraform/modules/AWS/Kubernetes/master-goss.yaml
index 4ad85041..dd34a9cf 100644
--- a/terraform/modules/AWS/Kubernetes/master-goss.yaml
+++ b/terraform/modules/AWS/Kubernetes/master-goss.yaml
@@ -26,7 +26,7 @@ service:
 group:
   docker:
     exists: true
-    gid: 115
+    gid: 999
 process:
   kubelet:
     running: true
diff --git a/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml b/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
index 081665f6..4398703e 100644
--- a/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
+++ b/terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
@@ -47,9 +47,11 @@ write_files:
 runcmd:
   - "curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -"
   - 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main"  > /etc/apt/sources.list.d/kubernetes.list'
+  - 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
+  - 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
   - "mkdir /run/download"
   - "apt update"
-  - "apt install -y kubelet kubeadm kubectl docker.io awscli"
+  - 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
   - "wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz"
   - "tar -C /usr/bin -xzf /run/download/crictl.tgz"
   - "rm -rf /run/download"
diff --git a/terraform/modules/AWS/Kubernetes/node-goss.yaml b/terraform/modules/AWS/Kubernetes/node-goss.yaml
index 4ad85041..dd34a9cf 100644
--- a/terraform/modules/AWS/Kubernetes/node-goss.yaml
+++ b/terraform/modules/AWS/Kubernetes/node-goss.yaml
@@ -26,7 +26,7 @@ service:
 group:
   docker:
     exists: true
-    gid: 115
+    gid: 999
 process:
   kubelet:
     running: true