diff --git a/handler/.golangci.yml b/handler/.golangci.yml
index a744e82..204d4a3 100644
--- a/handler/.golangci.yml
+++ b/handler/.golangci.yml
@@ -28,6 +28,9 @@ linters-settings:
     lines: 100
     statements: 50
 
+run:
+  timeout: 5m
+
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
@@ -51,4 +54,4 @@ linters:
     - typecheck
     - unconvert
     - unparam
-    - unused
\ No newline at end of file
+    - unused
diff --git a/handler/inv/init.go b/handler/inv/init.go
index 9fd685c..cc20053 100644
--- a/handler/inv/init.go
+++ b/handler/inv/init.go
@@ -167,6 +167,7 @@ func init() {
 			{FriendlyName: "State", FieldName: "State"},
 			{FriendlyName: "CidrBlock", FieldName: "CidrBlock"},
 			{FriendlyName: "AvailabilityZone", FieldName: "AvailabilityZone"},
+			{FriendlyName: "AvailabilityZoneId", FieldName: "AvailabilityZoneId"},
 		}}
 	})
 	spreadsheet.RegisterSheet(helpers.SheetSecurityGroups, func() *spreadsheet.Sheet {