diff --git a/bash/lw_aws_inventory.sh b/bash/lw_aws_inventory.sh
index a9fa1f6..5a5cd69 100755
--- a/bash/lw_aws_inventory.sh
+++ b/bash/lw_aws_inventory.sh
@@ -39,10 +39,17 @@ REDSHIFT_CLUSTERS=0
 ELB_V1=0
 ELB_V2=0
 NAT_GATEWAYS=0
-ECS_FARGATE_CLUSTERS=0
+ECS_CLUSTERS=0
 ECS_FARGATE_RUNNING_TASKS=0
+ECS_FARGATE_RUNNING_CONTAINERS=0
+ECS_FARGATE_TOTAL_CONTAINERS=0
+ECS_FARGATE_ACTIVE_SERVICES=0
+ECS_EC2_INSTANCES=0
+ECS_TASK_DEFINITIONS=0
+EKS_CLUSTERS=0
+EKS_NODES=0
+EKS_FARGATE_ACTIVE_PROFILES=0
 LAMBDA_FNS=0
-LAMBDA_FNS_EXIST="No"
 
 function getRegions {
   aws --profile $profile ec2 describe-regions --output json | jq -r '.[] | .[] | .RegionName'
@@ -72,16 +79,20 @@ function getNatGateways {
   aws --profile $profile ec2 describe-nat-gateways --region $r --output json --no-paginate | jq '.NatGateways | length'
 }
 
-function getECSFargateClusters {
+function getECSClusters {
   aws --profile $profile ecs list-clusters --region $r --output json --no-paginate | jq -r '.clusterArns[]'
 }
 
+function getECSTaskDefinitions {
+  aws --profile $profile ecs list-task-definitions --region $r --output json --no-paginate | jq '.taskDefinitionArns | length'
+}
+
 function getECSFargateRunningTasks {
   RUNNING_FARGATE_TASKS=0
-  for c in $ecsfargateclusters; do
+  for c in $ecsclusters; do
     allclustertasks=$(aws --profile $profile ecs list-tasks --region $r --output json --cluster $c --no-paginate | jq -r '.taskArns | join(" ")')
     if [ -n "${allclustertasks}" ]; then
-      fargaterunningtasks=$(aws --profile $profile ecs describe-tasks --region $r --output json --tasks $allclustertasks --cluster $c --no-paginate | jq '[.tasks[] | select(.launchType=="FARGATE") | .containers[] | select(.lastStatus=="RUNNING")] | length')
+      fargaterunningtasks=$(aws --profile $profile ecs describe-tasks --region $r --output json --tasks $allclustertasks --cluster $c --no-paginate | jq '[.tasks[] | select(.launchType=="FARGATE") | select(.lastStatus=="RUNNING")] | length')
       RUNNING_FARGATE_TASKS=$(($RUNNING_FARGATE_TASKS + $fargaterunningtasks))
     fi
   done
@@ -89,6 +100,84 @@ function getECSFargateRunningTasks {
   echo "${RUNNING_FARGATE_TASKS}"
 }
 
+function getECSFargateRunningContainers {
+  RUNNING_FARGATE_CONTAINERS=0
+  for c in $ecsclusters; do
+    allclustertasks=$(aws --profile $profile ecs list-tasks --region $r --output json --cluster $c --no-paginate | jq -r '.taskArns | join(" ")')
+    if [ -n "${allclustertasks}" ]; then
+      fargaterunningcontainers=$(aws --profile $profile ecs describe-tasks --region $r --output json --tasks $allclustertasks --cluster $c --no-paginate | jq '[.tasks[] | select(.launchType=="FARGATE") | select(.lastStatus=="RUNNING") | .containers[] | select(.lastStatus=="RUNNING")] | length')
+      RUNNING_FARGATE_CONTAINERS=$(($RUNNING_FARGATE_CONTAINERS + $fargaterunningcontainers))
+    fi
+  done
+
+  echo "${RUNNING_FARGATE_CONTAINERS}"
+}
+
+function getECSFargateTotalContainers {
+  TOTAL_FARGATE_CONTAINERS=0
+  for c in $ecsclusters; do
+    allclustertasks=$(aws --profile $profile ecs list-tasks --region $r --output json --cluster $c --no-paginate | jq -r '.taskArns | join(" ")')
+    if [ -n "${allclustertasks}" ]; then
+      fargatetotalcontainers=$(aws --profile $profile ecs describe-tasks --region $r --output json --tasks $allclustertasks --cluster $c --no-paginate | jq '[.tasks[] | select(.launchType=="FARGATE") | select(.lastStatus=="RUNNING") | .containers[] ] | length')
+      TOTAL_FARGATE_CONTAINERS=$(($TOTAL_FARGATE_CONTAINERS + $fargatetotalcontainers))
+    fi
+  done
+
+  echo "${TOTAL_FARGATE_CONTAINERS}"
+}
+
+function getECSFargateServices {
+  ACTIVE_FARGATE_SERVICES=0
+  for c in $ecsclusters; do
+    allclusterservices=$(aws --profile $profile ecs list-services --region $r --output json --cluster $c --no-paginate | jq -r '.serviceArns | join(" ")')
+    if [ -n "${allclusterservices}" ]; then
+      fargateactiveservices=$(aws --profile $profile ecs describe-services --region $r --output json --services $allclusterservices --cluster $c --no-paginate | jq '[.services[] | select(.launchType=="FARGATE") | select(.status=="ACTIVE")] | length')
+      ACTIVE_FARGATE_SERVICES=$(($ACTIVE_FARGATE_SERVICES + $fargateactiveservices))
+    fi
+  done
+  echo "${ACTIVE_FARGATE_SERVICES}"
+}
+
+function getECSEC2Instances {
+  ECS_EC2_INSTANCES=0
+  for c in $ecsclusters; do
+    ecsec2instances=$(aws --profile $profile ecs list-container-instances --region $r --cluster $c | jq '.containerInstanceArns | length')
+    ECS_EC2_INSTANCES=$(($ECS_EC2_INSTANCES + $ecsec2instances))
+  done
+  echo "${ECS_EC2_INSTANCES}"
+}
+
+function getEKSClusters {
+  EKS_CLUSTERS=$(aws --profile $profile eks list-clusters --region $r --output json --no-paginate | jq -r '.clusters | .[]')
+  echo "${EKS_CLUSTERS}"
+}
+
+function getEKSNodes {
+  EKS_NODES=0
+  for c in $eksclusters; do
+    eksnodegroups=$(aws --profile $profile eks list-nodegroups --cluster-name $c --region $r | jq -r '.nodegroups | .[]')
+    for ng in $eksnodegroups; do
+      asgroups=$(aws --profile $profile eks describe-nodegroup --cluster-name $c --region $r --nodegroup-name $ng | jq -r '.nodegroup | .resources | .autoScalingGroups[] | .name')
+      for asg in $asgroups; do
+        eksnodes=$(aws --profile $profile autoscaling describe-auto-scaling-groups --auto-scaling-group-names $asg --region $r | jq '.AutoScalingGroups[] | .Instances | length')
+        EKS_NODES=$(($EKS_NODES + $eksnodes))
+      done
+    done
+  done
+  echo "${EKS_NODES}"
+}
+
+function getEKSFargateActiveProfiles {
+  EKS_FARGATE_ACTIVE_PROFILES=0
+  for c in $eksclusters; do
+    eksfargateprofiles=$(aws eks list-fargate-profiles --profile $profile --region $r --cluster-name $c | jq -r '.fargateProfileNames[]')
+    for p in $eksfargateprofiles; do
+      activeprofiles=$(aws eks describe-fargate-profile --profile $profile --region $r --cluster-name $c --fargate-profile-name $p | jq ' [.fargateProfile | select(.status=="ACTIVE")] | length')
+      EKS_FARGATE_ACTIVE_PROFILES=$(($EKS_FARGATE_ACTIVE_PROFILES + $activeprofiles))
+    done
+  done
+  echo "${EKS_FARGATE_ACTIVE_PROFILES}"
+}
 
 function getLambdaFunctions {
   aws --profile $profile lambda list-functions --region $r --output json --no-paginate | jq '.Functions | length'
@@ -98,8 +187,9 @@ function calculateInventory {
   profile=$1
   for r in $(getRegions); do
     if [ "$JSON" != "true" ]; then
-      echo $r
+      echo "Scanning $r..."
     fi
+
     instances=$(getInstances $r $profile)
     EC2_INSTANCES=$(($EC2_INSTANCES + $instances))
 
@@ -118,42 +208,76 @@ function calculateInventory {
     natgw=$(getNatGateways $r $profile)
     NAT_GATEWAYS=$(($NAT_GATEWAYS + $natgw))
 
-    ecsfargateclusters=$(getECSFargateClusters $r $profile)
-    ecsfargateclusterscount=$(echo $ecsfargateclusters | wc -w)
-    ECS_FARGATE_CLUSTERS=$(($ECS_FARGATE_CLUSTERS + $ecsfargateclusterscount))
+    ecsclusters=$(getECSClusters $r $profile)
+    ecsclusterscount=$(echo $ecsclusters | wc -w)
+    ECS_CLUSTERS=$(($ECS_CLUSTERS + $ecsclusterscount))
 
-    ecsfargaterunningtasks=$(getECSFargateRunningTasks $r $ecsfargateclusters $profile)
+    ecsfargaterunningtasks=$(getECSFargateRunningTasks $r $ecsclusters $profile)
     ECS_FARGATE_RUNNING_TASKS=$(($ECS_FARGATE_RUNNING_TASKS + $ecsfargaterunningtasks))
 
+    ecsfargaterunningcontainers=$(getECSFargateRunningContainers $r $ecsclusters $profile)
+    ECS_FARGATE_RUNNING_CONTAINERS=$(($ECS_FARGATE_RUNNING_CONTAINERS + $ecsfargaterunningcontainers))
+
+    ecsfargatetotalcontainers=$(getECSFargateTotalContainers $r $ecsclusters $profile)
+    ECS_FARGATE_TOTAL_CONTAINERS=$(($ECS_FARGATE_TOTAL_CONTAINERS + $ecsfargatetotalcontainers))
+
+    ecsec2instances=$(getECSEC2Instances $r $ecsclusters $profile)
+    ECS_EC2_INSTANCES=$(($ECS_EC2_INSTANCES + $ecsec2instances))
+
+    ecstaskdefinitions=$(getECSTaskDefinitions $r $profile)
+    ECS_TASK_DEFINITIONS=$(($ECS_TASK_DEFINITIONS + $ecstaskdefinitions))
+
+    ecsfargatesvcs=$(getECSFargateServices $r $ecsclusters $profile)
+    ECS_FARGATE_ACTIVE_SERVICES=$(($ECS_FARGATE_ACTIVE_SERVICES + $ecsfargatesvcs))
+
+    eksclusters=$(getEKSClusters $r $profile)
+    eksclusterscount=$(echo $eksclusters | wc -w)
+    EKS_CLUSTERS=$(($EKS_CLUSTERS + $eksclusterscount))
+
+    eksnodes=$(getEKSNodes $r $eksclusters $profile)
+    EKS_NODES=$(($EKS_NODES + $eksnodes))
+
+    eksfargateactiveprofiles=$(getEKSFargateActiveProfiles $r $eksclusters $profile)
+    EKS_FARGATE_ACTIVE_PROFILES=$(($EKS_FARGATE_ACTIVE_PROFILES + $eksfargateactiveprofiles))
+
     lambdafns=$(getLambdaFunctions $r $profile)
     LAMBDA_FNS=$(($LAMBDA_FNS + $lambdafns))
-    if [ $LAMBDA_FNS -gt 0 ]; then LAMBDA_FNS_EXIST="Yes"; fi 
-done
 
+done
 TOTAL=$(($EC2_INSTANCES + $RDS_INSTANCES + $REDSHIFT_CLUSTERS + $ELB_V1 + $ELB_V2 + $NAT_GATEWAYS))
+TOTAL_CONTAINERIZED_EC2S=$(($ECS_EC2_INSTANCES + $EKS_NODES))
 }
 
 function textoutput {
   echo "######################################################################"
-  echo "Lacework inventory collection complete."
+  echo "Cloud Resource Inventory"
+  echo "------------------"
+  echo "EC2 Instances:			$EC2_INSTANCES"
+  echo "RDS Instances:			$RDS_INSTANCES"
+  echo "Redshift Clusters:		$REDSHIFT_CLUSTERS"
+  echo "v1 Load Balancers:		$ELB_V1"
+  echo "v2 Load Balancers:		$ELB_V2"
+  echo "NAT Gateways:			$NAT_GATEWAYS"
+  echo "------------------"
+  echo "Total Cloud Resources:		$TOTAL"
   echo ""
-  echo "EC2 Instances:     $EC2_INSTANCES"
-  echo "RDS Instances:     $RDS_INSTANCES"
-  echo "Redshift Clusters: $REDSHIFT_CLUSTERS"
-  echo "v1 Load Balancers: $ELB_V1"
-  echo "v2 Load Balancers: $ELB_V2"
-  echo "NAT Gateways:      $NAT_GATEWAYS"
-  echo "===================="
-  echo "Total Resources:   $TOTAL"
   echo ""
-  echo "Fargate Information"
-  echo "===================="
-  echo "ECS Fargate Clusters:                 $ECS_FARGATE_CLUSTERS"
-  echo "ECS Fargate Running Containers/Tasks: $ECS_FARGATE_RUNNING_TASKS"
-  echo ""
-  echo "Additional Serverless Inventory Details (NOT included in Total Resources count above):"
-  echo "===================="
-  echo "Lambda Functions Exist:         $LAMBDA_FNS_EXIST"
+  echo "Workload Inventory"
+  echo "------------------"
+  echo "ECS Clusters:			$ECS_CLUSTERS"
+  echo "ECS Task Definitions:		$ECS_TASK_DEFINITIONS"
+  echo "ECS Fargate Running Tasks:      $ECS_FARGATE_RUNNING_TASKS"
+  echo "ECS Fargate Running Containers: $ECS_FARGATE_RUNNING_CONTAINERS"
+  echo "ECS Fargate Total Containers:   $ECS_FARGATE_TOTAL_CONTAINERS"
+  echo "ECS Fargate Active Services:    $ECS_FARGATE_ACTIVE_SERVICES"
+  echo "ECS EC2 Instances:		$ECS_EC2_INSTANCES"
+  echo "EKS Clusters:			$EKS_CLUSTERS"
+  echo "EKS Fargate Active Profiles:	$EKS_FARGATE_ACTIVE_PROFILES"
+  echo "EKS EC2 Nodes:			$EKS_NODES"
+  echo "Lambda Functions:               $LAMBDA_FNS"
+  echo "------------------"
+  echo "Total Containerized EC2s:	$TOTAL_CONTAINERIZED_EC2S"
+  echo "######################################################################"
 }
 
 function jsonoutput {
@@ -164,10 +288,19 @@ function jsonoutput {
   echo "  \"v1_lb\": \"$ELB_V1\","
   echo "  \"v2_lb\": \"$ELB_V2\","
   echo "  \"nat_gw\": \"$NAT_GATEWAYS\","
-  echo "  \"total\": \"$TOTAL\","
-  echo "  \"_ecs_fargate_clusters\": \"$ECS_FARGATE_CLUSTERS\","
-  echo "  \"_ecs_fargate_running_tasks_containers\": \"$ECS_FARGATE_RUNNING_TASKS\","
-  echo "  \"_lambda_functions_exist\": \"$LAMBDA_FNS_EXIST\""
+  echo "  \"total_resources\": \"$TOTAL\","
+  echo "  \"ecs_clusters\": \"$ECS_CLUSTERS\","
+  echo "  \"ecs_task_definitions\": \"$ECS_TASK_DEFINITIONS\","
+  echo "  \"ecs_fargate_running_tasks\": \"$ECS_FARGATE_RUNNING_TASKS\","
+  echo "  \"ecs_fargate_running_containers\": \"$ECS_FARGATE_RUNNING_CONTAINERS\","
+  echo "  \"ecs_fargate_total_containers\": \"$ECS_FARGATE_TOTAL_CONTAINERS\","
+  echo "  \"ecs_fargate_active_svcs\": \"$ECS_FARGATE_ACTIVE_SERVICES\","
+  echo "  \"ecs_ec2_instances\": \"$ECS_EC2_INSTANCES\","
+  echo "  \"eks_clusters\": \"$EKS_CLUSTERS\","
+  echo "  \"eks_fargate_active_profiles\": \"$EKS_FARGATE_ACTIVE_PROFILES\","
+  echo "  \"eks_ec2_nodes\": \"$EKS_NODES\","
+  echo "  \"lambda_functions\": \"$LAMBDA_FNS\""
+  echo "  \"total_containerized_ec2s\": \"$TOTAL_CONTAINERIZED_EC2S\","
   echo "}"
 }
 
diff --git a/bash/lw_gcp_inventory.sh b/bash/lw_gcp_inventory.sh
index 85fc64c..dc52457 100755
--- a/bash/lw_gcp_inventory.sh
+++ b/bash/lw_gcp_inventory.sh
@@ -7,6 +7,7 @@
 # Set the initial counts to zero.
 GCE_INSTANCES=0
 GKE_INSTANCES=0
+GAE_INSTANCES=0
 SQL_INSTANCES=0
 LOAD_BALANCERS=0
 GATEWAYS=0
@@ -23,11 +24,20 @@ function isComputeEnabled {
   gcloud services list --format json | jq -r '.[] | .name' | grep -q "compute.googleapis.com"
 }
 
-# NOTE - it is technically possible to have a CloudSQL instance without the 
-# sqladmin API enabled; but you cannot check the instance programatically 
+function isAppEngineEnabled {
+  if [ `gcloud app operations list --format json | jq length` -gt 0 ]
+  then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# NOTE - it is technically possible to have a CloudSQL instance without the
+# sqladmin API enabled; but you cannot check the instance programatically
 # without the API enabled
 function isCloudSQLEnabled {
-  gcloud services list --format json | jq -r '.[] | .name' | grep -q "sqladmin.googleapis.com" 
+  gcloud services list --format json | jq -r '.[] | .name' | grep -q "sqladmin.googleapis.com"
 }
 
 function getGKEInstances {
@@ -38,6 +48,10 @@ function getGCEInstances {
   gcloud compute instances list --format json | jq '[.[] | select(.name | contains("gke-") | not)] | length'
 }
 
+function getGAEInstances {
+  gcloud app instances list --format json | jq length
+}
+
 function getSQLInstances {
   gcloud sql instances list --format json | jq length
 }
@@ -82,6 +96,13 @@ for project in ${PROJECT_IDS[@]}; do
     GATEWAYS=$(($GATEWAYS + $gateways))
   fi
 
+  # Check if AppEngine is being used
+  if isAppEngineEnabled; then
+    echo "Checking for AppEngine instances."
+    gae_inst=$(getGAEInstances)
+    GAE_INSTANCES=$(($GAE_INSTANCES + $gae_inst))
+  fi
+
   # Check for SQL instances
   if isCloudSQLEnabled; then
     echo "Checking for Cloud SQL instances."
@@ -90,13 +111,15 @@ for project in ${PROJECT_IDS[@]}; do
   fi
 done
 
+echo ""
 echo "######################################################################"
 echo "Lacework inventory collection complete."
 echo ""
 echo "GCE Instances:   $GCE_INSTANCES"
 echo "GKE Instances:   $GKE_INSTANCES"
+echo "GAE Instances:   $GAE_INSTANCES"
 echo "Load Balancers:  $LOAD_BALANCERS"
 echo "Gateways:        $GATEWAYS"
 echo "SQL Instances:   $SQL_INSTANCES"
 echo "===================="
-echo "Total Resources: $(($GCE_INSTANCES + $GKE_INSTANCES + $LOAD_BALANCERS + $GATEWAYS + $SQL_INSTANCES))"
+echo "Total Resources: $(($GCE_INSTANCES + $GKE_INSTANCES + $GAE_INSTANCES + $LOAD_BALANCERS + $GATEWAYS + $SQL_INSTANCES))"