diff --git a/aws/aws-alb-ingress-controller/base/cluster-role.yaml b/aws/aws-alb-ingress-controller/base/cluster-role.yaml
index ee5e2d0c4e..8910eaad16 100644
--- a/aws/aws-alb-ingress-controller/base/cluster-role.yaml
+++ b/aws/aws-alb-ingress-controller/base/cluster-role.yaml
@@ -6,7 +6,6 @@ rules:
   - apiGroups:
       - ""
       - extensions
-      - networking.k8s.io
     resources:
       - configmaps
       - endpoints
@@ -33,4 +32,4 @@ rules:
     verbs:
       - get
       - list
-      - watch
+      - watch
\ No newline at end of file
diff --git a/aws/aws-alb-ingress-controller/base/deployment.yaml b/aws/aws-alb-ingress-controller/base/deployment.yaml
index 08620515b6..e4b748b25c 100644
--- a/aws/aws-alb-ingress-controller/base/deployment.yaml
+++ b/aws/aws-alb-ingress-controller/base/deployment.yaml
@@ -48,6 +48,6 @@ spec:
             # List of regions: http://docs.aws.amazon.com/general/latest/gr/rande.html#vpc_region
             # - --aws-region=us-west-1
           # Repository location of the ALB Ingress Controller.
-          image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2
+          image: docker.io/amazon/aws-alb-ingress-controller
           imagePullPolicy: Always
       serviceAccountName: alb-ingress-controller
diff --git a/aws/aws-alb-ingress-controller/base/kustomization.yaml b/aws/aws-alb-ingress-controller/base/kustomization.yaml
index d68b148e5f..ef54cbf074 100644
--- a/aws/aws-alb-ingress-controller/base/kustomization.yaml
+++ b/aws/aws-alb-ingress-controller/base/kustomization.yaml
@@ -13,7 +13,7 @@ generatorOptions:
 images:
 - name: docker.io/amazon/aws-alb-ingress-controller
   newName: docker.io/amazon/aws-alb-ingress-controller
-  newTag: v1.1.2
+  newTag: v1.1.5
 configMapGenerator:
 - name: alb-ingress-controller-parameters
   env: params.env
diff --git a/aws/fluentd-cloud-watch/base/configmap.yaml b/aws/fluentd-cloud-watch/base/configmap.yaml
index 1a7854c3db..789555bbc5 100644
--- a/aws/fluentd-cloud-watch/base/configmap.yaml
+++ b/aws/fluentd-cloud-watch/base/configmap.yaml
@@ -8,6 +8,8 @@ data:
   fluent.conf: |
     @include containers.conf
     @include systemd.conf
+    @include host.conf
+
     <match fluent.**>
       @type null
     </match>
@@ -17,6 +19,7 @@ data:
       @id in_tail_container_logs
       @label @containers
       path /var/log/containers/*.log
+      exclude_path ["/var/log/containers/cloudwatch-agent*", "/var/log/containers/fluentd*"]
       pos_file /var/log/fluentd-containers.log.pos
       tag *
       read_from_head true
@@ -25,11 +28,61 @@ data:
         time_format %Y-%m-%dT%H:%M:%S.%NZ
       </parse>
     </source>
+
+    <source>
+      @type tail
+      @id in_tail_cwagent_logs
+      @label @cwagentlogs
+      path /var/log/containers/cloudwatch-agent*
+      pos_file /var/log/cloudwatch-agent.log.pos
+      tag *
+      read_from_head true
+      <parse>
+        @type json
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_fluentd_logs
+      @label @fluentdlogs
+      path /var/log/containers/fluentd*
+      pos_file /var/log/fluentd.log.pos
+      tag *
+      read_from_head true
+      <parse>
+        @type json
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+    <label @fluentdlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_fluentd
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_fluentd_stream_transformer
+        <record>
+          stream_name ${tag_parts[3]}
+        </record>
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
     <label @containers>
       <filter **>
         @type kubernetes_metadata
         @id filter_kube_metadata
       </filter>
+
       <filter **>
         @type record_transformer
         @id filter_containers_stream_transformer
@@ -37,11 +90,57 @@ data:
           stream_name ${tag_parts[3]}
         </record>
       </filter>
+
+      <filter **>
+        @type concat
+        key log
+        multiline_start_regexp /^\S/
+        separator ""
+        flush_interval 5
+        timeout_label @NORMAL
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
+    <label @cwagentlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_cwagent
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_cwagent_stream_transformer
+        <record>
+          stream_name ${tag_parts[3]}
+        </record>
+      </filter>
+
+      <filter **>
+        @type concat
+        key log
+        multiline_start_regexp /^\d{4}[-/]\d{1,2}[-/]\d{1,2}/
+        separator ""
+        flush_interval 5
+        timeout_label @NORMAL
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
+    <label @NORMAL>
       <match **>
         @type cloudwatch_logs
         @id out_cloudwatch_logs_containers
         region "#{ENV.fetch('REGION')}"
-        log_group_name "/eks/#{ENV.fetch('CLUSTER_NAME')}/containers"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/application"
         log_stream_name_key stream_name
         remove_log_stream_name_key true
         auto_create_stream true
@@ -63,11 +162,16 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-kubelet.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubelet-pos.json
+      </storage>
       read_from_head true
       tag kubelet.service
     </source>
+
     <source>
       @type systemd
       @id in_systemd_kubeproxy
@@ -77,11 +181,16 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-kubeproxy.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubeproxy-pos.json
+      </storage>
       read_from_head true
       tag kubeproxy.service
     </source>
+
     <source>
       @type systemd
       @id in_systemd_docker
@@ -91,12 +200,22 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-docker.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-docker-pos.json
+      </storage>
       read_from_head true
       tag docker.service
     </source>
+
     <label @systemd>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_systemd
+      </filter>
+
       <filter **>
         @type record_transformer
         @id filter_systemd_stream_transformer
@@ -104,11 +223,12 @@ data:
           stream_name ${tag}-${record["hostname"]}
         </record>
       </filter>
+
       <match **>
         @type cloudwatch_logs
         @id out_cloudwatch_logs_systemd
         region "#{ENV.fetch('REGION')}"
-        log_group_name "/eks/#{ENV.fetch('CLUSTER_NAME')}/systemd"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/dataplane"
         log_stream_name_key stream_name
         auto_create_stream true
         remove_log_stream_name_key true
@@ -119,4 +239,74 @@ data:
           retry_forever true
         </buffer>
       </match>
+    </label>
+  host.conf: |
+    <source>
+      @type tail
+      @id in_tail_dmesg
+      @label @hostlogs
+      path /var/log/dmesg
+      pos_file /var/log/dmesg.log.pos
+      tag host.dmesg
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_secure
+      @label @hostlogs
+      path /var/log/secure
+      pos_file /var/log/secure.log.pos
+      tag host.secure
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_messages
+      @label @hostlogs
+      path /var/log/messages
+      pos_file /var/log/messages.log.pos
+      tag host.messages
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <label @hostlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_host
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_containers_stream_transformer_host
+        <record>
+          stream_name ${tag}-${record["host"]}
+        </record>
+      </filter>
+
+      <match host.**>
+        @type cloudwatch_logs
+        @id out_cloudwatch_logs_host_logs
+        region "#{ENV.fetch('REGION')}"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/host"
+        log_stream_name_key stream_name
+        remove_log_stream_name_key true
+        auto_create_stream true
+        <buffer>
+          flush_interval 5
+          chunk_limit_size 2m
+          queued_chunks_limit_size 32
+          retry_forever true
+        </buffer>
+      </match>
     </label>
\ No newline at end of file
diff --git a/aws/fluentd-cloud-watch/base/daemonset.yaml b/aws/fluentd-cloud-watch/base/daemonset.yaml
index c6febe4acd..f9fb934ca6 100644
--- a/aws/fluentd-cloud-watch/base/daemonset.yaml
+++ b/aws/fluentd-cloud-watch/base/daemonset.yaml
@@ -24,17 +24,22 @@ spec:
               mountPath: /config-volume
             - name: fluentdconf
               mountPath: /fluentd/etc
+        - name: update-log-driver
+          image: busybox
+          command: ['sh','-c','']
       containers:
         - name: fluentd-cloudwatch
-          image: fluent/fluentd-kubernetes-daemonset:v1.1-debian-cloudwatch
+          image: fluent/fluentd-kubernetes-daemonset
           env:
             - name: REGION
               value: $(REGION)
             - name: CLUSTER_NAME
               value: $(CLUSTER_NAME)
+            - name: CI_VERSION
+              value: "k8s/1.0.1"
           resources:
             limits:
-              memory: 200Mi
+              memory: 400Mi
             requests:
               cpu: 100m
               memory: 200Mi
@@ -51,6 +56,9 @@ spec:
             - name: runlogjournal
               mountPath: /run/log/journal
               readOnly: true
+            - name: dmesg
+              mountPath: /var/log/dmesg
+              readOnly: true
       volumes:
         - name: config-volume
           configMap:
@@ -66,3 +74,6 @@ spec:
         - name: runlogjournal
           hostPath:
             path: /run/log/journal
+        - name: dmesg
+          hostPath:
+            path: /var/log/dmesg
\ No newline at end of file
diff --git a/aws/fluentd-cloud-watch/base/kustomization.yaml b/aws/fluentd-cloud-watch/base/kustomization.yaml
index a7a09c8d83..1458245627 100644
--- a/aws/fluentd-cloud-watch/base/kustomization.yaml
+++ b/aws/fluentd-cloud-watch/base/kustomization.yaml
@@ -14,7 +14,7 @@ generatorOptions:
 images:
 - name: fluent/fluentd-kubernetes-daemonset
   newName: fluent/fluentd-kubernetes-daemonset
-  newTag: v1.1-debian-cloudwatch
+  newTag: v1.7.3-debian-cloudwatch-1.0
 configMapGenerator:
 - name: fluentd-cloud-watch-parameters
   env: params.env
diff --git a/aws/infra_configs/cluster_config.yaml b/aws/infra_configs/cluster_config.yaml
index b5cce1e9d8..cde7120087 100644
--- a/aws/infra_configs/cluster_config.yaml
+++ b/aws/infra_configs/cluster_config.yaml
@@ -7,7 +7,7 @@ metadata:
   # AWS_CLUSTER_NAME and AWS_REGION will override `name` and `region` here.
   name: your_cluster_name
   region: your_cluster_region
-  version: '1.13'
+  version: '1.14'
 # If your region has multiple availability zones, you can specify 3 of them.
 # cluster AZs must be set explicitly for single AZ nodegroup example to work
 #availabilityZones: ["us-west-2b", "us-west-2c", "us-west-2d"]
diff --git a/aws/nvidia-device-plugin/base/daemonset.yaml b/aws/nvidia-device-plugin/base/daemonset.yaml
index 4bb7f05bb8..59b2afeac3 100644
--- a/aws/nvidia-device-plugin/base/daemonset.yaml
+++ b/aws/nvidia-device-plugin/base/daemonset.yaml
@@ -22,7 +22,7 @@ spec:
           operator: Exists
           effect: NoSchedule
       containers:
-        - image: nvidia/k8s-device-plugin:1.0.0-beta
+        - image: nvidia/k8s-device-plugin:1.0.0-beta4
           name: nvidia-device-plugin-ctr
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/aws/nvidia-device-plugin/base/kustomization.yaml b/aws/nvidia-device-plugin/base/kustomization.yaml
index 0b90445ebe..6d018e293e 100644
--- a/aws/nvidia-device-plugin/base/kustomization.yaml
+++ b/aws/nvidia-device-plugin/base/kustomization.yaml
@@ -8,4 +8,4 @@ commonLabels:
 images:
 - name: nvidia/k8s-device-plugin
   newName: nvidia/k8s-device-plugin
-  newTag: 1.0.0-beta
+  newTag: 1.0.0-beta4
diff --git a/tests/aws-aws-alb-ingress-controller-base_test.go b/tests/aws-aws-alb-ingress-controller-base_test.go
index 4db04674ef..448d8d2bc6 100644
--- a/tests/aws-aws-alb-ingress-controller-base_test.go
+++ b/tests/aws-aws-alb-ingress-controller-base_test.go
@@ -23,7 +23,6 @@ rules:
   - apiGroups:
       - ""
       - extensions
-      - networking.k8s.io
     resources:
       - configmaps
       - endpoints
@@ -63,7 +62,8 @@ roleRef:
   name: alb-ingress-controller
 subjects:
   - kind: ServiceAccount
-    name: alb-ingress-controller`)
+    name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/deployment.yaml", `
 # Application Load Balancer (ALB) Ingress Controller Deployment Manifest.
 # This manifest details sensible defaults for deploying an ALB Ingress Controller.
@@ -115,7 +115,7 @@ spec:
             # List of regions: http://docs.aws.amazon.com/general/latest/gr/rande.html#vpc_region
             # - --aws-region=us-west-1
           # Repository location of the ALB Ingress Controller.
-          image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2
+          image: docker.io/amazon/aws-alb-ingress-controller
           imagePullPolicy: Always
       serviceAccountName: alb-ingress-controller
 `)
@@ -123,9 +123,11 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: alb-ingress-controller`)
+  name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/params.env", `
-clusterName=`)
+clusterName=
+`)
 	th.writeK("/manifests/aws/aws-alb-ingress-controller/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -142,7 +144,7 @@ generatorOptions:
 images:
 - name: docker.io/amazon/aws-alb-ingress-controller
   newName: docker.io/amazon/aws-alb-ingress-controller
-  newTag: v1.1.2
+  newTag: v1.1.5
 configMapGenerator:
 - name: alb-ingress-controller-parameters
   env: params.env
diff --git a/tests/aws-aws-alb-ingress-controller-overlays-application_test.go b/tests/aws-aws-alb-ingress-controller-overlays-application_test.go
index b5b80b660a..6347c5763c 100644
--- a/tests/aws-aws-alb-ingress-controller-overlays-application_test.go
+++ b/tests/aws-aws-alb-ingress-controller-overlays-application_test.go
@@ -75,7 +75,6 @@ rules:
   - apiGroups:
       - ""
       - extensions
-      - networking.k8s.io
     resources:
       - configmaps
       - endpoints
@@ -115,7 +114,8 @@ roleRef:
   name: alb-ingress-controller
 subjects:
   - kind: ServiceAccount
-    name: alb-ingress-controller`)
+    name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/deployment.yaml", `
 # Application Load Balancer (ALB) Ingress Controller Deployment Manifest.
 # This manifest details sensible defaults for deploying an ALB Ingress Controller.
@@ -167,7 +167,7 @@ spec:
             # List of regions: http://docs.aws.amazon.com/general/latest/gr/rande.html#vpc_region
             # - --aws-region=us-west-1
           # Repository location of the ALB Ingress Controller.
-          image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2
+          image: docker.io/amazon/aws-alb-ingress-controller
           imagePullPolicy: Always
       serviceAccountName: alb-ingress-controller
 `)
@@ -175,9 +175,11 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: alb-ingress-controller`)
+  name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/params.env", `
-clusterName=`)
+clusterName=
+`)
 	th.writeK("/manifests/aws/aws-alb-ingress-controller/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -194,7 +196,7 @@ generatorOptions:
 images:
 - name: docker.io/amazon/aws-alb-ingress-controller
   newName: docker.io/amazon/aws-alb-ingress-controller
-  newTag: v1.1.2
+  newTag: v1.1.5
 configMapGenerator:
 - name: alb-ingress-controller-parameters
   env: params.env
diff --git a/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go b/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go
index 5483f79b40..8e4576ffd7 100644
--- a/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go
+++ b/tests/aws-aws-alb-ingress-controller-overlays-vpc_test.go
@@ -44,7 +44,8 @@ spec:
 `)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/overlays/vpc/params.env", `
 vpcId=
-region=us-west-2`)
+region=us-west-2
+`)
 	th.writeK("/manifests/aws/aws-alb-ingress-controller/overlays/vpc", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -80,7 +81,6 @@ rules:
   - apiGroups:
       - ""
       - extensions
-      - networking.k8s.io
     resources:
       - configmaps
       - endpoints
@@ -120,7 +120,8 @@ roleRef:
   name: alb-ingress-controller
 subjects:
   - kind: ServiceAccount
-    name: alb-ingress-controller`)
+    name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/deployment.yaml", `
 # Application Load Balancer (ALB) Ingress Controller Deployment Manifest.
 # This manifest details sensible defaults for deploying an ALB Ingress Controller.
@@ -172,7 +173,7 @@ spec:
             # List of regions: http://docs.aws.amazon.com/general/latest/gr/rande.html#vpc_region
             # - --aws-region=us-west-1
           # Repository location of the ALB Ingress Controller.
-          image: docker.io/amazon/aws-alb-ingress-controller:v1.1.2
+          image: docker.io/amazon/aws-alb-ingress-controller
           imagePullPolicy: Always
       serviceAccountName: alb-ingress-controller
 `)
@@ -180,9 +181,11 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: alb-ingress-controller`)
+  name: alb-ingress-controller
+`)
 	th.writeF("/manifests/aws/aws-alb-ingress-controller/base/params.env", `
-clusterName=`)
+clusterName=
+`)
 	th.writeK("/manifests/aws/aws-alb-ingress-controller/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -199,7 +202,7 @@ generatorOptions:
 images:
 - name: docker.io/amazon/aws-alb-ingress-controller
   newName: docker.io/amazon/aws-alb-ingress-controller
-  newTag: v1.1.2
+  newTag: v1.1.5
 configMapGenerator:
 - name: alb-ingress-controller-parameters
   env: params.env
diff --git a/tests/aws-aws-efs-csi-driver-base_test.go b/tests/aws-aws-efs-csi-driver-base_test.go
index 30e7eefb45..fbad297b0c 100644
--- a/tests/aws-aws-efs-csi-driver-base_test.go
+++ b/tests/aws-aws-efs-csi-driver-base_test.go
@@ -81,7 +81,8 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "update"]`)
+    verbs: ["get", "list", "watch", "update"]
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-attacher-cluster-role-binding.yaml", `
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -94,12 +95,14 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: efs-csi-external-attacher-clusterrole
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-controller-sa.yaml", `
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: efs-csi-controller-sa`)
+  name: efs-csi-controller-sa
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-node-cluster-role.yaml", `
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -123,7 +126,8 @@ rules:
     verbs: ["get", "list", "watch", "update"]
   - apiGroups: ["csi.storage.k8s.io"]
     resources: ["csinodeinfos"]
-    verbs: ["get", "list", "watch", "update"]`)
+    verbs: ["get", "list", "watch", "update"]
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-node-cluster-role-binding.yaml", `
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -136,7 +140,8 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: efs-csi-node-clusterrole
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-node-daemon-set.yaml", `
 kind: DaemonSet
 apiVersion: apps/v1
@@ -220,13 +225,15 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: efs-csi-node-sa`)
+  name: efs-csi-node-sa
+`)
 	th.writeF("/manifests/aws/aws-efs-csi-driver/base/csi-default-storage.yaml", `
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: efs-default
-provisioner: efs.csi.aws.com`)
+provisioner: efs.csi.aws.com
+`)
 	th.writeK("/manifests/aws/aws-efs-csi-driver/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/tests/aws-aws-fsx-csi-driver-base_test.go b/tests/aws-aws-fsx-csi-driver-base_test.go
index 76b1399355..4f6f4c7a0d 100644
--- a/tests/aws-aws-fsx-csi-driver-base_test.go
+++ b/tests/aws-aws-fsx-csi-driver-base_test.go
@@ -92,7 +92,8 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "update"]`)
+    verbs: ["get", "list", "watch", "update"]
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-attacher-cluster-role-binding.yaml", `
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -105,7 +106,8 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: fsx-csi-external-attacher-clusterrole
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role.yaml", `
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -123,7 +125,8 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["events"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]`)
+    verbs: ["get", "list", "watch", "create", "update", "patch"]
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role-binding.yaml", `
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -136,7 +139,8 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: external-provisioner-role
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-controller-sa.yaml", `
 apiVersion: v1
 kind: ServiceAccount
@@ -180,7 +184,8 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: fsx-csi-node-clusterrole
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-node-daemonset.yaml", `
 kind: DaemonSet
 apiVersion: apps/v1
@@ -281,7 +286,8 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["events"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]`)
+    verbs: ["get", "list", "watch", "create", "update", "patch"]
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-provisioner-cluster-role-binding.yaml", `
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -294,13 +300,15 @@ subjects:
 roleRef:
   kind: ClusterRole
   name: fsx-external-provisioner-clusterrole
-  apiGroup: rbac.authorization.k8s.io`)
+  apiGroup: rbac.authorization.k8s.io
+`)
 	th.writeF("/manifests/aws/aws-fsx-csi-driver/base/csi-default-storage.yaml", `
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: fsx-default
-provisioner: fsx.csi.aws.com`)
+provisioner: fsx.csi.aws.com
+`)
 	th.writeK("/manifests/aws/aws-fsx-csi-driver/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/tests/aws-fluentd-cloud-watch-base_test.go b/tests/aws-fluentd-cloud-watch-base_test.go
index 01eebfd1a9..21fd41a069 100644
--- a/tests/aws-fluentd-cloud-watch-base_test.go
+++ b/tests/aws-fluentd-cloud-watch-base_test.go
@@ -24,7 +24,8 @@ rules:
     resources:
       - namespaces
       - pods
-    verbs: ["get", "list", "watch"]`)
+    verbs: ["get", "list", "watch"]
+`)
 	th.writeF("/manifests/aws/fluentd-cloud-watch/base/cluster-role-binding.yaml", `
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
@@ -37,7 +38,8 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: fluentd
-    namespace: kube-system`)
+    namespace: kube-system
+`)
 	th.writeF("/manifests/aws/fluentd-cloud-watch/base/configmap.yaml", `
 apiVersion: v1
 kind: ConfigMap
@@ -49,6 +51,8 @@ data:
   fluent.conf: |
     @include containers.conf
     @include systemd.conf
+    @include host.conf
+
     <match fluent.**>
       @type null
     </match>
@@ -58,6 +62,7 @@ data:
       @id in_tail_container_logs
       @label @containers
       path /var/log/containers/*.log
+      exclude_path ["/var/log/containers/cloudwatch-agent*", "/var/log/containers/fluentd*"]
       pos_file /var/log/fluentd-containers.log.pos
       tag *
       read_from_head true
@@ -66,11 +71,61 @@ data:
         time_format %Y-%m-%dT%H:%M:%S.%NZ
       </parse>
     </source>
+
+    <source>
+      @type tail
+      @id in_tail_cwagent_logs
+      @label @cwagentlogs
+      path /var/log/containers/cloudwatch-agent*
+      pos_file /var/log/cloudwatch-agent.log.pos
+      tag *
+      read_from_head true
+      <parse>
+        @type json
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_fluentd_logs
+      @label @fluentdlogs
+      path /var/log/containers/fluentd*
+      pos_file /var/log/fluentd.log.pos
+      tag *
+      read_from_head true
+      <parse>
+        @type json
+        time_format %Y-%m-%dT%H:%M:%S.%NZ
+      </parse>
+    </source>
+
+    <label @fluentdlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_fluentd
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_fluentd_stream_transformer
+        <record>
+          stream_name ${tag_parts[3]}
+        </record>
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
     <label @containers>
       <filter **>
         @type kubernetes_metadata
         @id filter_kube_metadata
       </filter>
+
       <filter **>
         @type record_transformer
         @id filter_containers_stream_transformer
@@ -78,11 +133,57 @@ data:
           stream_name ${tag_parts[3]}
         </record>
       </filter>
+
+      <filter **>
+        @type concat
+        key log
+        multiline_start_regexp /^\S/
+        separator ""
+        flush_interval 5
+        timeout_label @NORMAL
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
+    <label @cwagentlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_cwagent
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_cwagent_stream_transformer
+        <record>
+          stream_name ${tag_parts[3]}
+        </record>
+      </filter>
+
+      <filter **>
+        @type concat
+        key log
+        multiline_start_regexp /^\d{4}[-/]\d{1,2}[-/]\d{1,2}/
+        separator ""
+        flush_interval 5
+        timeout_label @NORMAL
+      </filter>
+
+      <match **>
+        @type relabel
+        @label @NORMAL
+      </match>
+    </label>
+
+    <label @NORMAL>
       <match **>
         @type cloudwatch_logs
         @id out_cloudwatch_logs_containers
         region "#{ENV.fetch('REGION')}"
-        log_group_name "/eks/#{ENV.fetch('CLUSTER_NAME')}/containers"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/application"
         log_stream_name_key stream_name
         remove_log_stream_name_key true
         auto_create_stream true
@@ -104,11 +205,16 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-kubelet.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubelet-pos.json
+      </storage>
       read_from_head true
       tag kubelet.service
     </source>
+
     <source>
       @type systemd
       @id in_systemd_kubeproxy
@@ -118,11 +224,16 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-kubeproxy.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-kubeproxy-pos.json
+      </storage>
       read_from_head true
       tag kubeproxy.service
     </source>
+
     <source>
       @type systemd
       @id in_systemd_docker
@@ -132,12 +243,22 @@ data:
         field_map {"MESSAGE": "message", "_HOSTNAME": "hostname", "_SYSTEMD_UNIT": "systemd_unit"}
         field_map_strict true
       </entry>
-      path /run/log/journal
-      pos_file /var/log/fluentd-journald-docker.pos
+      path /var/log/journal
+      <storage>
+        @type local
+        persistent true
+        path /var/log/fluentd-journald-docker-pos.json
+      </storage>
       read_from_head true
       tag docker.service
     </source>
+
     <label @systemd>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_systemd
+      </filter>
+
       <filter **>
         @type record_transformer
         @id filter_systemd_stream_transformer
@@ -145,11 +266,12 @@ data:
           stream_name ${tag}-${record["hostname"]}
         </record>
       </filter>
+
       <match **>
         @type cloudwatch_logs
         @id out_cloudwatch_logs_systemd
         region "#{ENV.fetch('REGION')}"
-        log_group_name "/eks/#{ENV.fetch('CLUSTER_NAME')}/systemd"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/dataplane"
         log_stream_name_key stream_name
         auto_create_stream true
         remove_log_stream_name_key true
@@ -160,7 +282,78 @@ data:
           retry_forever true
         </buffer>
       </match>
-    </label>`)
+    </label>
+  host.conf: |
+    <source>
+      @type tail
+      @id in_tail_dmesg
+      @label @hostlogs
+      path /var/log/dmesg
+      pos_file /var/log/dmesg.log.pos
+      tag host.dmesg
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_secure
+      @label @hostlogs
+      path /var/log/secure
+      pos_file /var/log/secure.log.pos
+      tag host.secure
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <source>
+      @type tail
+      @id in_tail_messages
+      @label @hostlogs
+      path /var/log/messages
+      pos_file /var/log/messages.log.pos
+      tag host.messages
+      read_from_head true
+      <parse>
+        @type syslog
+      </parse>
+    </source>
+
+    <label @hostlogs>
+      <filter **>
+        @type kubernetes_metadata
+        @id filter_kube_metadata_host
+      </filter>
+
+      <filter **>
+        @type record_transformer
+        @id filter_containers_stream_transformer_host
+        <record>
+          stream_name ${tag}-${record["host"]}
+        </record>
+      </filter>
+
+      <match host.**>
+        @type cloudwatch_logs
+        @id out_cloudwatch_logs_host_logs
+        region "#{ENV.fetch('REGION')}"
+        log_group_name "/aws/containerinsights/#{ENV.fetch('CLUSTER_NAME')}/host"
+        log_stream_name_key stream_name
+        remove_log_stream_name_key true
+        auto_create_stream true
+        <buffer>
+          flush_interval 5
+          chunk_limit_size 2m
+          queued_chunks_limit_size 32
+          retry_forever true
+        </buffer>
+      </match>
+    </label>
+`)
 	th.writeF("/manifests/aws/fluentd-cloud-watch/base/daemonset.yaml", `
 apiVersion: apps/v1
 kind: DaemonSet
@@ -188,17 +381,22 @@ spec:
               mountPath: /config-volume
             - name: fluentdconf
               mountPath: /fluentd/etc
+        - name: update-log-driver
+          image: busybox
+          command: ['sh','-c','']
       containers:
         - name: fluentd-cloudwatch
-          image: fluent/fluentd-kubernetes-daemonset:v1.1-debian-cloudwatch
+          image: fluent/fluentd-kubernetes-daemonset
           env:
             - name: REGION
               value: $(REGION)
             - name: CLUSTER_NAME
               value: $(CLUSTER_NAME)
+            - name: CI_VERSION
+              value: "k8s/1.0.1"
           resources:
             limits:
-              memory: 200Mi
+              memory: 400Mi
             requests:
               cpu: 100m
               memory: 200Mi
@@ -215,6 +413,9 @@ spec:
             - name: runlogjournal
               mountPath: /run/log/journal
               readOnly: true
+            - name: dmesg
+              mountPath: /var/log/dmesg
+              readOnly: true
       volumes:
         - name: config-volume
           configMap:
@@ -230,12 +431,16 @@ spec:
         - name: runlogjournal
           hostPath:
             path: /run/log/journal
+        - name: dmesg
+          hostPath:
+            path: /var/log/dmesg
 `)
 	th.writeF("/manifests/aws/fluentd-cloud-watch/base/service-account.yaml", `
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: fluentd`)
+  name: fluentd
+`)
 	th.writeF("/manifests/aws/fluentd-cloud-watch/base/params.env", `
 region=us-west-2
 clusterName=
@@ -257,7 +462,7 @@ generatorOptions:
 images:
 - name: fluent/fluentd-kubernetes-daemonset
   newName: fluent/fluentd-kubernetes-daemonset
-  newTag: v1.1-debian-cloudwatch
+  newTag: v1.7.3-debian-cloudwatch-1.0
 configMapGenerator:
 - name: fluentd-cloud-watch-parameters
   env: params.env
diff --git a/tests/aws-istio-ingress-overlays-cognito_test.go b/tests/aws-istio-ingress-overlays-cognito_test.go
index 6d0da51547..eb1b04947c 100644
--- a/tests/aws-istio-ingress-overlays-cognito_test.go
+++ b/tests/aws-istio-ingress-overlays-cognito_test.go
@@ -31,12 +31,14 @@ metadata:
 	th.writeF("/manifests/aws/istio-ingress/overlays/cognito/params.yaml", `
 varReference:
 - path: metadata/annotations
-  kind: Ingress`)
+  kind: Ingress
+`)
 	th.writeF("/manifests/aws/istio-ingress/overlays/cognito/params.env", `
 CognitoUserPoolArn=
 CognitoAppClientId=
 CognitoUserPoolDomain=
-certArn=`)
+certArn=
+`)
 	th.writeK("/manifests/aws/istio-ingress/overlays/cognito", `
 bases:
 - ../../base
diff --git a/tests/aws-istio-ingress-overlays-oidc_test.go b/tests/aws-istio-ingress-overlays-oidc_test.go
index dd08c39135..e8121035a8 100644
--- a/tests/aws-istio-ingress-overlays-oidc_test.go
+++ b/tests/aws-istio-ingress-overlays-oidc_test.go
@@ -40,7 +40,8 @@ oidcAuthorizationEndpoint=
 oidcTokenEndpoint=
 oidcUserInfoEndpoint=
 oidcSecretName=istio-oidc-secret
-certArn=`)
+certArn=
+`)
 	th.writeF("/manifests/aws/istio-ingress/overlays/oidc/secrets.env", `
 clientId=
 clientSecret=
diff --git a/tests/aws-nvidia-device-plugin-base_test.go b/tests/aws-nvidia-device-plugin-base_test.go
index 64c35648c8..d5e251e1d6 100644
--- a/tests/aws-nvidia-device-plugin-base_test.go
+++ b/tests/aws-nvidia-device-plugin-base_test.go
@@ -39,7 +39,7 @@ spec:
           operator: Exists
           effect: NoSchedule
       containers:
-        - image: nvidia/k8s-device-plugin:1.0.0-beta
+        - image: nvidia/k8s-device-plugin:1.0.0-beta4
           name: nvidia-device-plugin-ctr
           securityContext:
             allowPrivilegeEscalation: false
@@ -64,7 +64,7 @@ commonLabels:
 images:
 - name: nvidia/k8s-device-plugin
   newName: nvidia/k8s-device-plugin
-  newTag: 1.0.0-beta
+  newTag: 1.0.0-beta4
 `)
 }
 
diff --git a/tests/aws-nvidia-device-plugin-overlays-application_test.go b/tests/aws-nvidia-device-plugin-overlays-application_test.go
index d480a11408..8fcb02bd4a 100644
--- a/tests/aws-nvidia-device-plugin-overlays-application_test.go
+++ b/tests/aws-nvidia-device-plugin-overlays-application_test.go
@@ -89,7 +89,7 @@ spec:
           operator: Exists
           effect: NoSchedule
       containers:
-        - image: nvidia/k8s-device-plugin:1.0.0-beta
+        - image: nvidia/k8s-device-plugin:1.0.0-beta4
           name: nvidia-device-plugin-ctr
           securityContext:
             allowPrivilegeEscalation: false
@@ -114,7 +114,7 @@ commonLabels:
 images:
 - name: nvidia/k8s-device-plugin
   newName: nvidia/k8s-device-plugin
-  newTag: 1.0.0-beta
+  newTag: 1.0.0-beta4
 `)
 }