diff --git a/docs/queries/all-queries.md b/docs/queries/all-queries.md
index a64936b5cb4..848034228d9 100644
--- a/docs/queries/all-queries.md
+++ b/docs/queries/all-queries.md
@@ -65,6 +65,7 @@ This page contains all queries.
 |Auto Scaling Group With No Associated ELB<br/><sup><sub>050f085f-a8db-4072-9010-2cca235cc02f</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Availability|<a href="../ansible-queries/aws/050f085f-a8db-4072-9010-2cca235cc02f" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/ec2_asg_module.html#parameter-load_balancers">Documentation</a><br/>|
 |CMK Is Unusable<br/><sup><sub>133fee21-37ef-45df-a563-4d07edc169f4</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Availability|<a href="../ansible-queries/aws/133fee21-37ef-45df-a563-4d07edc169f4" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/aws_kms_module.html#parameter-enabled">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>e69890e6-fce5-461d-98ad-cb98318dfc96</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/e69890e6-fce5-461d-98ad-cb98318dfc96" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/rds_instance_module.html#parameter-backup_retention_period">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>9232306a-f839-40aa-b3ef-b352001da9a5</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-versioning">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>17d5ba1d-7667-4729-b1a6-b11fde3db7f7</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/17d5ba1d-7667-4729-b1a6-b11fde3db7f7" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudformation_stack_set_module.html#parameter-purge_stacks">Documentation</a><br/>|
 |AMI Not Encrypted<br/><sup><sub>97707503-a22c-4cd7-b7c0-f088fa7cf830</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../ansible-queries/aws/97707503-a22c-4cd7-b7c0-f088fa7cf830" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/ec2_ami_module.html">Documentation</a><br/>|
 |CA Certificate Identifier Is Outdated<br/><sup><sub>5eccd62d-8b4d-46d3-83ea-1879f3cbd3ce</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../ansible-queries/aws/5eccd62d-8b4d-46d3-83ea-1879f3cbd3ce" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/rds_instance_module.html#parameter-ca_certificate_identifier">Documentation</a><br/>|
@@ -94,7 +95,6 @@ This page contains all queries.
 |CloudFront Logging Disabled<br/><sup><sub>d31cb911-bf5b-4eb6-9fc3-16780c77c7bd</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/d31cb911-bf5b-4eb6-9fc3-16780c77c7bd" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudfront_distribution_module.html">Documentation</a><br/>|
 |CloudTrail Logging Disabled<br/><sup><sub>d4a73c49-cbaa-4c6f-80ee-d6ef5a3a26f5</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/d4a73c49-cbaa-4c6f-80ee-d6ef5a3a26f5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudtrail_module.html#parameter-enable_logging">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>c3b9f7b0-f5a0-49ec-9cbc-f1e346b7274d</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/c3b9f7b0-f5a0-49ec-9cbc-f1e346b7274d" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-debug_botocore_endpoint_logs">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>9232306a-f839-40aa-b3ef-b352001da9a5</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-versioning">Documentation</a><br/>|
 |No Stack Policy<br/><sup><sub>ffe0fd52-7a8b-4a5c-8fc7-49844418e6c9</sub></sup>|Ansible|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../ansible-queries/aws/ffe0fd52-7a8b-4a5c-8fc7-49844418e6c9" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/cloudformation_module.html">Documentation</a><br/>|
 |Authentication Without MFA<br/><sup><sub>eee107f9-b3d8-45d3-b9c6-43b5a7263ce1</sub></sup>|Ansible|<span style="color:#edd57e">Low</span>|Access Control|<a href="../ansible-queries/aws/eee107f9-b3d8-45d3-b9c6-43b5a7263ce1" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/iam_mfa_device_info_module.html">Documentation</a><br/>|
 |ECS Service Without Running Tasks<br/><sup><sub>f5c45127-1d28-4b49-a692-0b97da1c3a84</sub></sup>|Ansible|<span style="color:#edd57e">Low</span>|Availability|<a href="../ansible-queries/aws/f5c45127-1d28-4b49-a692-0b97da1c3a84" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/ecs_service_module.html#ansible-collections-community-aws-ecs-service-module">Documentation</a><br/>|
@@ -259,13 +259,13 @@ This page contains all queries.
 |Phone Number Not Set For Security Contacts<br/><sup><sub>3e9fcc67-1f64-405f-b2f9-0a6be17598f0</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/3e9fcc67-1f64-405f-b2f9-0a6be17598f0" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/securitycontacts?tabs=json">Documentation</a><br/>|
 |AKS Dashboard Is Enabled<br/><sup><sub>c62d3b92-9a11-4ffd-b7b7-6faaae83faed</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../azureresourcemanager-queries/azure/c62d3b92-9a11-4ffd-b7b7-6faaae83faed" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.containerservice/managedclusters?tabs=json#managedclusteraddonprofile">Documentation</a><br/>|
 |AKS With Authorized IP Ranges Disabled<br/><sup><sub>2583fab1-953b-4fae-bd02-4a136a6c21f9</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/2583fab1-953b-4fae-bd02-4a136a6c21f9" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.containerservice/managedclusters?tabs=json#managedclusterapiserveraccessprofile-object">Documentation</a><br/>|
-|Standard Price Is Not Selected<br/><sup><sub>2081c7d6-2851-4cce-bda5-cb49d462da42</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/pricings?tabs=json#pricingproperties-object">Documentation</a><br/>|
 |Storage Account Allows Default Network Access<br/><sup><sub>9073f073-5d60-4b46-b569-0d6baa80ed95</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/9073f073-5d60-4b46-b569-0d6baa80ed95" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.storage/storageaccounts?tabs=json#storageaccountpropertiescreateparameters-object">Documentation</a><br/>|
 |Website with 'Http20Enabled' Disabled<br/><sup><sub>70111098-7f85-48f0-b1b4-e4261cf5f61b</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/70111098-7f85-48f0-b1b4-e4261cf5f61b" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.web/sites?tabs=json#siteproperties-object">Documentation</a><br/>|
 |Log Profile Incorrect Category<br/><sup><sub>4d522e7b-f938-4d51-a3b1-974ada528bd3</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/4d522e7b-f938-4d51-a3b1-974ada528bd3" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2016-03-01/logprofiles?tabs=json#logprofileproperties-object">Documentation</a><br/>|
 |SQL Server Database With Unrecommended Retention Days<br/><sup><sub>c09cdac2-7670-458a-bf6c-efad6880973a</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/c09cdac2-7670-458a-bf6c-efad6880973a" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/databases/auditingsettings?tabs=json">Documentation</a><br/>|
 |Unrecommended Log Profile Retention Policy<br/><sup><sub>25684eac-daaa-4c2c-94b4-8d2dbb627909</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/25684eac-daaa-4c2c-94b4-8d2dbb627909" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2016-03-01/logprofiles?tabs=json#retentionpolicy-object">Documentation</a><br/>|
 |Unrecommended Network Watcher Flow Log Retention Policy<br/><sup><sub>564b70f8-41cd-4690-aff8-bb53add86bc9</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/564b70f8-41cd-4690-aff8-bb53add86bc9" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2019-11-01/networkwatchers/flowlogs?tabs=json#retentionpolicyparameters-object">Documentation</a><br/>|
+|Standard Price Is Not Selected<br/><sup><sub>2081c7d6-2851-4cce-bda5-cb49d462da42</sub></sup>|AzureResourceManager|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/pricings?tabs=json#pricingproperties-object">Documentation</a><br/>|
 |Account Admins Not Notified By Email<br/><sup><sub>a8852cc0-fd4b-4fc7-9372-1e43fad0732e</sub></sup>|AzureResourceManager|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/a8852cc0-fd4b-4fc7-9372-1e43fad0732e" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/2017-03-01-preview/servers/securityalertpolicies?tabs=json">Documentation</a><br/>|
 |SQL Alert Policy Without Emails<br/><sup><sub>89b79fe5-49bd-4d39-84ce-55f5fc6f7764</sub></sup>|AzureResourceManager|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/89b79fe5-49bd-4d39-84ce-55f5fc6f7764" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/databases/securityalertpolicies?tabs=json">Documentation</a><br/>|
 |Email Notifications Disabled<br/><sup><sub>79c2c2c0-eb00-47c0-ac16-f8b0e2c81c92</sub></sup>|AzureResourceManager|<span style="color:#5bc0de">Info</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/79c2c2c0-eb00-47c0-ac16-f8b0e2c81c92" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/securitycontacts">Documentation</a><br/>|
@@ -321,7 +321,6 @@ This page contains all queries.
 |User Data Contains Encoded Private Key<br/><sup><sub>568cc372-ca64-420d-9015-ee347d00d288</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Encryption|<a href="../cloudformation-queries/aws/568cc372-ca64-420d-9015-ee347d00d288" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html">Documentation</a><br/>|
 |Workspace Without Encryption<br/><sup><sub>89827c57-5a8a-49eb-9731-976a606d70db</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Encryption|<a href="../cloudformation-queries/aws/89827c57-5a8a-49eb-9731-976a606d70db" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html">Documentation</a><br/>|
 |Batch Job Definition With Privileged Container Properties<br/><sup><sub>76ddf32c-85b1-4808-8935-7eef8030ab36</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/76ddf32c-85b1-4808-8935-7eef8030ab36" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html">Documentation</a><br/>|
-|IAM User LoginProfile Password Is In Plaintext<br/><sup><sub>06adef8c-c284-4de7-aad2-af43b07a8ca1</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html">Documentation</a><br/>|
 |KMS Key With Vulnerable Policy<br/><sup><sub>da905474-7454-43c0-b8d2-5756ab951aba</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/da905474-7454-43c0-b8d2-5756ab951aba" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keypolicy">Documentation</a><br/>|
 |Lambda Functions Without Unique IAM Roles<br/><sup><sub>ae03f542-1423-402f-9cef-c834e7ee9583</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/ae03f542-1423-402f-9cef-c834e7ee9583" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html">Documentation</a><br/>|
 |MQ Broker Is Publicly Accessible<br/><sup><sub>68b6a789-82f8-4cfd-85de-e95332fe6a61</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/68b6a789-82f8-4cfd-85de-e95332fe6a61" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-publiclyaccessible">Documentation</a><br/>|
@@ -350,6 +349,7 @@ This page contains all queries.
 |DMS Endpoint Password Exposed<br/><sup><sub>5f700072-b7ce-4e84-b3f3-497bf1c24a4d</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/5f700072-b7ce-4e84-b3f3-497bf1c24a4d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html">Documentation</a><br/>|
 |DocDB Cluster Master Password In Plaintext<br/><sup><sub>39423ce4-9011-46cd-b6b1-009edcd9385d</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/39423ce4-9011-46cd-b6b1-009edcd9385d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html">Documentation</a><br/>|
 |Hardcoded AWS Access Key In Lambda<br/><sup><sub>2564172f-c92b-4261-9acd-464aed511696</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/2564172f-c92b-4261-9acd-464aed511696" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-environment">Documentation</a><br/>|
+|IAM User LoginProfile Password Is In Plaintext<br/><sup><sub>06adef8c-c284-4de7-aad2-af43b07a8ca1</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html">Documentation</a><br/>|
 |RefreshToken Is Exposed<br/><sup><sub>5b48c507-0d1f-41b0-a630-76817c6b4189</sub></sup>|CloudFormation|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/5b48c507-0d1f-41b0-a630-76817c6b4189" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html#cfn-ask-skill-authenticationconfiguration">Documentation</a><br/>|
 |API Gateway Method Does Not Contains An API Key<br/><sup><sub>3641d5b4-d339-4bc2-bfb9-208fe8d3477f</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/3641d5b4-d339-4bc2-bfb9-208fe8d3477f" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html">Documentation</a><br/>|
 |API Gateway Without Configured Authorizer<br/><sup><sub>7fd0d461-5b8c-4815-898c-f2b4b117eb28</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/7fd0d461-5b8c-4815-898c-f2b4b117eb28" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html">Documentation</a><br/>|
@@ -358,6 +358,7 @@ This page contains all queries.
 |EC2 Network ACL Ineffective Denied Traffic<br/><sup><sub>2623d682-dccb-44cd-99d0-54d9fd62f8f2</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/2623d682-dccb-44cd-99d0-54d9fd62f8f2" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html">Documentation</a><br/>|
 |Elasticsearch Without IAM Authentication<br/><sup><sub>5c666ed9-b586-49ab-9873-c495a833b705</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/5c666ed9-b586-49ab-9873-c495a833b705" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-accesspolicies">Documentation</a><br/>|
 |Empty Roles For ECS Cluster Task Definitions<br/><sup><sub>7f384a5f-b5a2-4d84-8ca3-ee0a5247becb</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/7f384a5f-b5a2-4d84-8ca3-ee0a5247becb" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
+|IAM Group Inline Policies<br/><sup><sub>a58d1a2d-4078-4b80-855b-84cc3f7f4540</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |IAM Group Without Users<br/><sup><sub>8f957abd-9703-413d-87d3-c578950a753c</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/8f957abd-9703-413d-87d3-c578950a753c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |IAM Policies Attached To User<br/><sup><sub>edc95c10-7366-4f30-9b4b-f995c84eceb5</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/edc95c10-7366-4f30-9b4b-f995c84eceb5" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_managed-vs-inline.html">Documentation</a><br/>|
 |IAM Policies With Full Privileges<br/><sup><sub>953b3cdb-ce13-428a-aa12-318726506661</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/953b3cdb-ce13-428a-aa12-318726506661" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html">Documentation</a><br/>|
@@ -375,8 +376,9 @@ This page contains all queries.
 |Auto Scaling Group With No Associated ELB<br/><sup><sub>ad21e616-5026-4b9d-990d-5b007bfe679c</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/ad21e616-5026-4b9d-990d-5b007bfe679c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html">Documentation</a><br/>|
 |CMK Is Unusable<br/><sup><sub>2844c749-bd78-4cd1-90e8-b179df827602</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/2844c749-bd78-4cd1-90e8-b179df827602" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html">Documentation</a><br/>|
 |ElastiCache Nodes Not Created Across Multi AZ<br/><sup><sub>cfdef2e5-1fe4-4ef4-bea8-c56e08963150</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/cfdef2e5-1fe4-4ef4-bea8-c56e08963150" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html">Documentation</a><br/>|
-|RDS Multi-AZ Deployment Disabled<br/><sup><sub>2b1d4935-9acf-48a7-8466-10d18bf51a69</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
+|RDS Multi-AZ Deployment Disabled<br/><sup><sub>2b1d4935-9acf-48a7-8466-10d18bf51a69</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>8c415f6f-7b90-4a27-a44a-51047e1506f9</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/8c415f6f-7b90-4a27-a44a-51047e1506f9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>a227ec01-f97a-4084-91a4-47b350c1db54</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>fe974ae9-858e-4991-bbd5-e040a834679f</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/fe974ae9-858e-4991-bbd5-e040a834679f" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-autodeployment.html#cfn-cloudformation-stackset-autodeployment-retainstacksonaccountremoval">Documentation</a><br/>|
 |DynamoDB Table Point In Time Recovery Disabled<br/><sup><sub>0f04217d-488f-4e7a-bec8-f16159686cd6</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../cloudformation-queries/aws/0f04217d-488f-4e7a-bec8-f16159686cd6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-pointintimerecoveryspecification.html">Documentation</a><br/>|
 |ECS No Load Balancer Attached<br/><sup><sub>fb2b0ecf-1492-491a-a70d-ba1df579175d</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../cloudformation-queries/aws/fb2b0ecf-1492-491a-a70d-ba1df579175d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
@@ -394,7 +396,6 @@ This page contains all queries.
 |ELB Without Secure Protocol<br/><sup><sub>80908a75-586b-4c61-ab04-490f4f4525b8</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/80908a75-586b-4c61-ab04-490f4f4525b8" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html">Documentation</a><br/>|
 |EMR Security Configuration Encryption Disabled<br/><sup><sub>5b033ec8-f079-4323-b5c8-99d4620433a9</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/5b033ec8-f079-4323-b5c8-99d4620433a9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html">Documentation</a><br/>|
 |IAM Database Auth Not Enabled<br/><sup><sub>9fcd0a0a-9b6f-4670-a215-d94e6bf3f184</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/9fcd0a0a-9b6f-4670-a215-d94e6bf3f184" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-enableiamdatabaseauthentication">Documentation</a><br/>|
-|IAM Group Inline Policies<br/><sup><sub>a58d1a2d-4078-4b80-855b-84cc3f7f4540</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |KMS Key Rotation Disabled<br/><sup><sub>235ca980-eb71-48f4-9030-df0c371029eb</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/235ca980-eb71-48f4-9030-df0c371029eb" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html">Documentation</a><br/>|
 |Redshift Cluster Without KMS CMK<br/><sup><sub>de76a0d6-66d5-45c9-9022-f05545b85c78</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/de76a0d6-66d5-45c9-9022-f05545b85c78" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html">Documentation</a><br/>|
 |S3 Bucket Without SSL In Write Actions<br/><sup><sub>38c64e76-c71e-4d92-a337-60174d1de1c9</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/38c64e76-c71e-4d92-a337-60174d1de1c9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
@@ -458,7 +459,6 @@ This page contains all queries.
 |Redshift Cluster Logging Disabled<br/><sup><sub>3de2d4ff-fe53-4fc9-95d3-2f8a69bf90d6</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/3de2d4ff-fe53-4fc9-95d3-2f8a69bf90d6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-loggingproperties">Documentation</a><br/>|
 |S3 Bucket CloudTrail Logging Disabled<br/><sup><sub>c3ce69fd-e3df-49c6-be78-1db3f802261c</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/c3ce69fd-e3df-49c6-be78-1db3f802261c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>4552b71f-0a2a-4bc4-92dd-ed7ec1b4674c</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/4552b71f-0a2a-4bc4-92dd-ed7ec1b4674c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>a227ec01-f97a-4084-91a4-47b350c1db54</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
 |VPC FlowLogs Disabled<br/><sup><sub>f6d299d2-21eb-41cc-b1e1-fe12d857500b</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/f6d299d2-21eb-41cc-b1e1-fe12d857500b" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html">Documentation</a><br/>|
 |High Access Key Rotation Period<br/><sup><sub>800fa019-49dd-421b-9042-7331fdd83fa2</sub></sup>|CloudFormation|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../cloudformation-queries/aws/800fa019-49dd-421b-9042-7331fdd83fa2" target="_blank">Query details</a><br><a href="https://docs.amazonaws.cn/en_us/config/latest/developerguide/access-keys-rotated.html">Documentation</a><br/>|
 |IAM User With No Group<br/><sup><sub>06933df4-0ea7-461c-b9b5-104d27390e0e</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Access Control|<a href="../cloudformation-queries/aws/06933df4-0ea7-461c-b9b5-104d27390e0e" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/quickref-iam.html#scenario-iam-policy">Documentation</a><br/>|
@@ -482,7 +482,6 @@ This page contains all queries.
 |API Gateway With Invalid Compression<br/><sup><sub>d6653eee-2d4d-4e6a-976f-6794a497999a</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/d6653eee-2d4d-4e6a-976f-6794a497999a" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html">Documentation</a><br/>|
 |CloudTrail Log Files Not Encrypted With KMS<br/><sup><sub>050a9ba8-d1cb-4c61-a5e8-8805a70d3b85</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/050a9ba8-d1cb-4c61-a5e8-8805a70d3b85" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-kmskeyid">Documentation</a><br/>|
 |EFS Without KMS<br/><sup><sub>6d087495-2a42-4735-abf7-02ef5660a7e6</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/6d087495-2a42-4735-abf7-02ef5660a7e6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html">Documentation</a><br/>|
-|Unscanned ECR Image<br/><sup><sub>9025b2b3-e554-4842-ba87-db7aeec36d35</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagescanningconfiguration">Documentation</a><br/>|
 |API Gateway Cache Cluster Disabled<br/><sup><sub>52790cad-d60d-41d5-8483-146f9f21208d</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/52790cad-d60d-41d5-8483-146f9f21208d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclusterenabled">Documentation</a><br/>|
 |Inline Policies Are Attached To ECS Service<br/><sup><sub>9e8c89b3-7997-4d15-93e4-7911b9db99fd</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/9e8c89b3-7997-4d15-93e4-7911b9db99fd" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
 |Instance With No VPC<br/><sup><sub>8a6d36cd-0bc6-42b7-92c4-67acc8576861</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/8a6d36cd-0bc6-42b7-92c4-67acc8576861" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-vpc.html">Documentation</a><br/>|
@@ -512,6 +511,7 @@ This page contains all queries.
 |ElasticSearch Without Slow Logs<br/><sup><sub>086ea2eb-14a6-4fd4-914b-38e0bc8703e8</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/086ea2eb-14a6-4fd4-914b-38e0bc8703e8" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-logpublishingoptions">Documentation</a><br/>|
 |Lambda Functions Without X-Ray Tracing<br/><sup><sub>9488c451-074e-4cd3-aee3-7db6104f542c</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/9488c451-074e-4cd3-aee3-7db6104f542c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html">Documentation</a><br/>|
 |Stack Notifications Disabled<br/><sup><sub>837e033c-4717-40bd-807e-6abaa30161b7</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/837e033c-4717-40bd-807e-6abaa30161b7" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html">Documentation</a><br/>|
+|Unscanned ECR Image<br/><sup><sub>9025b2b3-e554-4842-ba87-db7aeec36d35</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagescanningconfiguration">Documentation</a><br/>|
 |API Gateway Stage Without API Gateway UsagePlan Associated<br/><sup><sub>7f8f1b60-43df-4c28-aa21-fb836dbd8071</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/7f8f1b60-43df-4c28-aa21-fb836dbd8071" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html">Documentation</a><br/>|
 |ECS Task Definition Invalid CPU or Memory<br/><sup><sub>f4c9b5f5-68b8-491f-9e48-4f96644a1d51</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/f4c9b5f5-68b8-491f-9e48-4f96644a1d51" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html">Documentation</a><br/>|
 |SDB Domain Declared As A Resource<br/><sup><sub>6ea57c8b-f9c0-4ec7-bae3-bd75a9dee27d</sub></sup>|CloudFormation|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/6ea57c8b-f9c0-4ec7-bae3-bd75a9dee27d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html">Documentation</a><br/>|
@@ -560,7 +560,7 @@ This page contains all queries.
 |ECS Cluster with Container Insights Disabled<br/><sup><sub>0c7a76d9-7dc5-499e-81ac-9245839177cb</sub></sup>|Crossplane|<span style="color:#edd57e">Low</span>|Observability|<a href="../crossplane-queries/aws/0c7a76d9-7dc5-499e-81ac-9245839177cb" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-aws/ecs.aws.crossplane.io/Cluster/v1alpha1@v0.42.0#spec-forProvider-settings">Documentation</a><br/>|
 |CloudWatch Without Retention Period Specified<br/><sup><sub>934613fe-b12c-4e5a-95f5-c1dcdffac1ff</sub></sup>|Crossplane|<span style="color:#5bc0de">Info</span>|Observability|<a href="../crossplane-queries/aws/934613fe-b12c-4e5a-95f5-c1dcdffac1ff" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-aws/cloudwatchlogs.aws.crossplane.io/LogGroup/v1alpha1@v0.29.0#spec-forProvider-retentionInDays">Documentation</a><br/>|
 |AKS RBAC Disabled<br/><sup><sub>b2418936-cd47-4ea2-8346-623c0bdb87bd</sub></sup>|Crossplane|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../crossplane-queries/azure/b2418936-cd47-4ea2-8346-623c0bdb87bd" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/compute.azure.crossplane.io/AKSCluster/v1alpha3@v0.19.0#spec-disableRBAC">Documentation</a><br/>|
-|Redis Cache Allows Non SSL Connections<br/><sup><sub>6c7cfec3-c686-4ed2-bf58-a1ec054b63fc</sub></sup>|Crossplane|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/cache.azure.crossplane.io/Redis/v1beta1@v0.19.0#spec-forProvider-enableNonSslPort">Documentation</a><br/>|
+|Redis Cache Allows Non SSL Connections<br/><sup><sub>6c7cfec3-c686-4ed2-bf58-a1ec054b63fc</sub></sup>|Crossplane|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/cache.azure.crossplane.io/Redis/v1beta1@v0.19.0#spec-forProvider-enableNonSslPort">Documentation</a><br/>|
 |Google Container Node Pool Auto Repair Disabled<br/><sup><sub>b4f65d13-a609-4dc1-af7c-63d2e08bffe9</sub></sup>|Crossplane|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../crossplane-queries/gcp/b4f65d13-a609-4dc1-af7c-63d2e08bffe9" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-gcp/container.gcp.crossplane.io/NodePool/v1beta1@v0.21.0#spec-forProvider-management-autoRepair">Documentation</a><br/>|
 |Cloud Storage Bucket Logging Not Enabled<br/><sup><sub>6c2d627c-de0f-45fb-b33d-dad9bffbb421</sub></sup>|Crossplane|<span style="color:#ff7213">Medium</span>|Observability|<a href="../crossplane-queries/gcp/6c2d627c-de0f-45fb-b33d-dad9bffbb421" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-gcp/storage.gcp.crossplane.io/Bucket/v1alpha3@v0.21.0#spec-logging">Documentation</a><br/>|
 |Docker Socket Mounted In Container<br/><sup><sub>d6355c88-1e8d-49e9-b2f2-f8a1ca12c75b</sub></sup>|DockerCompose|<span style="color:#bb2124">High</span>|Build Process|<a href="../dockercompose-queries/d6355c88-1e8d-49e9-b2f2-f8a1ca12c75b" target="_blank">Query details</a><br><a href="https://docs.docker.com/compose/compose-file/#volumes">Documentation</a><br/>|
@@ -627,7 +627,7 @@ This page contains all queries.
 |Run Using apt<br/><sup><sub>b84a0b47-2e99-4c9f-8933-98bcabe2b94d</sub></sup>|Dockerfile|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/b84a0b47-2e99-4c9f-8933-98bcabe2b94d" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run">Documentation</a><br/>|
 |Yum Install Allows Manual Input<br/><sup><sub>6e19193a-8753-436d-8a09-76dcff91bb03</sub></sup>|Dockerfile|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/6e19193a-8753-436d-8a09-76dcff91bb03" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
 |Zypper Install Without Version<br/><sup><sub>562952e4-0348-4dea-9826-44f3a2c6117b</sub></sup>|Dockerfile|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/562952e4-0348-4dea-9826-44f3a2c6117b" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run">Documentation</a><br/>|
-|UNIX Ports Out Of Range<br/><sup><sub>71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e</sub></sup>|Dockerfile|<span style="color:#5bc0de">Info</span>|Availability|<a href="../dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#expose">Documentation</a><br/>|
+|UNIX Ports Out Of Range<br/><sup><sub>71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e</sub></sup>|Dockerfile|<span style="color:#5bc0de">Info</span>|Networking and Firewall|<a href="../dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#expose">Documentation</a><br/>|
 |Apk Add Using Local Cache Path<br/><sup><sub>ae9c56a6-3ed1-4ac0-9b54-31267f51151d</sub></sup>|Dockerfile|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/ae9c56a6-3ed1-4ac0-9b54-31267f51151d" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
 |Apt Get Install Lists Were Not Deleted<br/><sup><sub>df746b39-6564-4fed-bf85-e9c44382303c</sub></sup>|Dockerfile|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/df746b39-6564-4fed-bf85-e9c44382303c" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/">Documentation</a><br/>|
 |APT-GET Not Avoiding Additional Packages<br/><sup><sub>7384dfb2-fcd1-4fbf-91cd-6c44c318c33c</sub></sup>|Dockerfile|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/7384dfb2-fcd1-4fbf-91cd-6c44c318c33c" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
@@ -1093,8 +1093,8 @@ This page contains all queries.
 |ECS Cluster with Container Insights Disabled<br/><sup><sub>abcefee4-a0c1-4245-9f82-a473f79a9e2f</sub></sup>|Pulumi|<span style="color:#edd57e">Low</span>|Observability|<a href="../pulumi-queries/aws/abcefee4-a0c1-4245-9f82-a473f79a9e2f" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/aws/api-docs/ecs/cluster/#settings_yaml">Documentation</a><br/>|
 |DynamoDB Table Point In Time Recovery Disabled<br/><sup><sub>327b0729-4c5c-4c44-8b5c-e476cd9c7290</sub></sup>|Pulumi|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../pulumi-queries/aws/327b0729-4c5c-4c44-8b5c-e476cd9c7290" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/aws/api-docs/dynamodb/table/#pointintimerecovery_yaml">Documentation</a><br/>|
 |EC2 Not EBS Optimized<br/><sup><sub>d991e4ae-42ab-429b-ab43-d5e5fa9ca633</sub></sup>|Pulumi|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../pulumi-queries/aws/d991e4ae-42ab-429b-ab43-d5e5fa9ca633" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/aws/api-docs/ec2/instance/#ebsoptimized_yaml">Documentation</a><br/>|
-|Redis Cache Allows Non SSL Connections<br/><sup><sub>49e30ac8-f58e-4222-b488-3dcb90158ec1</sub></sup>|Pulumi|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/cache/redis/#enablenonsslport_yaml">Documentation</a><br/>|
 |Storage Account Not Forcing HTTPS<br/><sup><sub>cb8e4bf0-903d-45c6-a278-9a947d82a27b</sub></sup>|Pulumi|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../pulumi-queries/azure/cb8e4bf0-903d-45c6-a278-9a947d82a27b" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/storageaccount/#enablehttpstrafficonly_yaml">Documentation</a><br/>|
+|Redis Cache Allows Non SSL Connections<br/><sup><sub>49e30ac8-f58e-4222-b488-3dcb90158ec1</sub></sup>|Pulumi|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/cache/redis/#enablenonsslport_yaml">Documentation</a><br/>|
 |Google Compute SSL Policy Weak Cipher In Use<br/><sup><sub>965e8830-2bec-4b9b-a7f0-24dbc200a68f</sub></sup>|Pulumi|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../pulumi-queries/gcp/965e8830-2bec-4b9b-a7f0-24dbc200a68f" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/gcp/api-docs/compute/sslpolicy/#mintlsversion_yaml">Documentation</a><br/>|
 |Cloud Storage Bucket Logging Not Enabled<br/><sup><sub>48f7e44d-d1d1-44c2-b336-9f11b65c4fb0</sub></sup>|Pulumi|<span style="color:#ff7213">Medium</span>|Observability|<a href="../pulumi-queries/gcp/48f7e44d-d1d1-44c2-b336-9f11b65c4fb0" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/gcp/api-docs/storage/bucket/#logging_yaml">Documentation</a><br/>|
 |PSP Set To Privileged<br/><sup><sub>ee305555-6b1d-4055-94cf-e22131143c34</sub></sup>|Pulumi|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../pulumi-queries/ee305555-6b1d-4055-94cf-e22131143c34" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/kubernetes/api-docs/policy/v1beta1/podsecuritypolicy/#privileged_yaml">Documentation</a><br/>|
@@ -1342,10 +1342,11 @@ This page contains all queries.
 |CMK Is Unusable<br/><sup><sub>7350fa23-dcf7-4938-916d-6a60b0c73b50</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Availability|<a href="../terraform-queries/aws/7350fa23-dcf7-4938-916d-6a60b0c73b50" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key#is_enabled">Documentation</a><br/>|
 |ElastiCache Nodes Not Created Across Multi AZ<br/><sup><sub>6db03a91-f933-4f13-ab38-a8b87a7de54d</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Availability|<a href="../terraform-queries/aws/6db03a91-f933-4f13-ab38-a8b87a7de54d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster">Documentation</a><br/>|
 |ElastiCache Redis Cluster Without Backup<br/><sup><sub>8fdb08a0-a868-4fdf-9c27-ccab0237f1ab</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/8fdb08a0-a868-4fdf-9c27-ccab0237f1ab" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#snapshot_retention_limit">Documentation</a><br/>|
+|RDS Cluster With Backup Disabled<br/><sup><sub>e542bd46-58c4-4e0f-a52a-1fb4f9548e02</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/rds_cluster#backup_retention_period">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>1dc73fb4-5b51-430c-8c5f-25dcf9090b02</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/1dc73fb4-5b51-430c-8c5f-25dcf9090b02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>568a4d22-3517-44a6-a7ad-6a7eed88722c</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#versioning">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>6e0e2f68-3fd9-4cd8-a5e4-e2213ef0df97</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/6e0e2f68-3fd9-4cd8-a5e4-e2213ef0df97" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack_set_instance#stack_set_name">Documentation</a><br/>|
 |ALB Not Dropping Invalid Headers<br/><sup><sub>6e3fd2ed-5c83-4c68-9679-7700d224d379</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../terraform-queries/aws/6e3fd2ed-5c83-4c68-9679-7700d224d379" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb#drop_invalid_header_fields">Documentation</a><br/>|
-|RDS Cluster With Backup Disabled<br/><sup><sub>e542bd46-58c4-4e0f-a52a-1fb4f9548e02</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/rds_cluster#backup_retention_period">Documentation</a><br/>|
 |AMI Not Encrypted<br/><sup><sub>8bbb242f-6e38-4127-86d4-d8f0b2687ae2</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/8bbb242f-6e38-4127-86d4-d8f0b2687ae2" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami">Documentation</a><br/>|
 |CA Certificate Identifier Is Outdated<br/><sup><sub>9f40c07e-699e-4410-8856-3ba0f2e3a2dd</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/9f40c07e-699e-4410-8856-3ba0f2e3a2dd" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance">Documentation</a><br/>|
 |Cloudfront Viewer Protocol Policy Allows HTTP<br/><sup><sub>55af1353-2f62-4fa0-a8e1-a210ca2708f5</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/55af1353-2f62-4fa0-a8e1-a210ca2708f5" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution">Documentation</a><br/>|
@@ -1376,6 +1377,7 @@ This page contains all queries.
 |S3 Bucket Without Ignore Public ACL<br/><sup><sub>4fa66806-0dd9-4f8d-9480-3174d39c7c91</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/4fa66806-0dd9-4f8d-9480-3174d39c7c91" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block">Documentation</a><br/>|
 |S3 Bucket Without Restriction Of Public Bucket<br/><sup><sub>1ec253ab-c220-4d63-b2de-5b40e0af9293</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/1ec253ab-c220-4d63-b2de-5b40e0af9293" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block">Documentation</a><br/>|
 |Service Control Policies Disabled<br/><sup><sub>5ba6229c-8057-433e-91d0-21cf13569ca9</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/5ba6229c-8057-433e-91d0-21cf13569ca9" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/organizations_policy">Documentation</a><br/>|
+|Default VPC Exists<br/><sup><sub>96ed3526-0179-4c73-b1b2-372fde2e0d13</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Insecure Defaults|<a href="../terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/default_vpc">Documentation</a><br/>|
 |Vulnerable Default SSL Certificate<br/><sup><sub>3a1e94df-6847-4c0e-a3b6-6c6af4e128ef</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Insecure Defaults|<a href="../terraform-queries/aws/3a1e94df-6847-4c0e-a3b6-6c6af4e128ef" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution">Documentation</a><br/>|
 |ALB Is Not Integrated With WAF<br/><sup><sub>0afa6ab8-a047-48cf-be07-93a2f8c34cf7</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Networking and Firewall|<a href="../terraform-queries/aws/0afa6ab8-a047-48cf-be07-93a2f8c34cf7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/wafregional_web_acl_association">Documentation</a><br/>|
 |ALB Listening on HTTP<br/><sup><sub>de7f5e83-da88-4046-871f-ea18504b1d43</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Networking and Firewall|<a href="../terraform-queries/aws/de7f5e83-da88-4046-871f-ea18504b1d43" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb_listener">Documentation</a><br/>|
@@ -1410,7 +1412,6 @@ This page contains all queries.
 |CloudWatch S3 policy Change Alarm Missing<br/><sup><sub>27c6a499-895a-4dc7-9617-5c485218db13</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/27c6a499-895a-4dc7-9617-5c485218db13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
 |Cloudwatch Security Group Changes Alarm Missing<br/><sup><sub>4beaf898-9f8b-4237-89e2-5ffdc7ee6006</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/4beaf898-9f8b-4237-89e2-5ffdc7ee6006" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
 |CloudWatch VPC Changes Alarm Missing<br/><sup><sub>9d0d4512-1959-43a2-a17f-72360ff06d1b</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/9d0d4512-1959-43a2-a17f-72360ff06d1b" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
-|Default VPC Exists<br/><sup><sub>96ed3526-0179-4c73-b1b2-372fde2e0d13</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/default_vpc">Documentation</a><br/>|
 |DocDB Logging Is Disabled<br/><sup><sub>56f6a008-1b14-4af4-b9b2-ab7cf7e27641</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/56f6a008-1b14-4af4-b9b2-ab7cf7e27641" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/docdb_cluster#enabled_cloudwatch_logs_exports">Documentation</a><br/>|
 |EC2 Instance Monitoring Disabled<br/><sup><sub>23b70e32-032e-4fa6-ba5c-82f56b9980e6</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/23b70e32-032e-4fa6-ba5c-82f56b9980e6" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/instance#monitoring">Documentation</a><br/>|
 |EKS cluster logging is not enabled<br/><sup><sub>37304d3f-f852-40b8-ae3f-725e87a7cedf</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/37304d3f-f852-40b8-ae3f-725e87a7cedf" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_cluster#enabled_cluster_log_types">Documentation</a><br/>|
@@ -1426,7 +1427,6 @@ This page contains all queries.
 |Redshift Cluster Logging Disabled<br/><sup><sub>15ffbacc-fa42-4f6f-a57d-2feac7365caa</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/15ffbacc-fa42-4f6f-a57d-2feac7365caa" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/redshift_cluster#enable">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>f861041c-8c9f-4156-acfc-5e6e524f5884</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/f861041c-8c9f-4156-acfc-5e6e524f5884" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket">Documentation</a><br/>|
 |S3 Bucket Object Level CloudTrail Logging Disabled<br/><sup><sub>a8fc2180-b3ac-4c93-bd0d-a55b974e4b07</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/a8fc2180-b3ac-4c93-bd0d-a55b974e4b07" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudtrail#event_selector">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>568a4d22-3517-44a6-a7ad-6a7eed88722c</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#versioning">Documentation</a><br/>|
 |Stack Notifications Disabled<br/><sup><sub>b72d0026-f649-4c91-a9ea-15d8f681ac09</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/b72d0026-f649-4c91-a9ea-15d8f681ac09" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack">Documentation</a><br/>|
 |VPC FlowLogs Disabled<br/><sup><sub>f83121ea-03da-434f-9277-9cd247ab3047</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/f83121ea-03da-434f-9277-9cd247ab3047" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc">Documentation</a><br/>|
 |No Stack Policy<br/><sup><sub>2f01fb2d-828a-499d-b98e-b83747305052</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../terraform-queries/aws/2f01fb2d-828a-499d-b98e-b83747305052" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack">Documentation</a><br/>|
@@ -1453,11 +1453,10 @@ This page contains all queries.
 |DOCDB Cluster Encrypted With AWS Managed Key<br/><sup><sub>2134641d-30a4-4b16-8ffc-2cd4c4ffd15d</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/2134641d-30a4-4b16-8ffc-2cd4c4ffd15d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/docdb_cluster#kms_key_id">Documentation</a><br/>|
 |ECR Repository Not Encrypted With CMK<br/><sup><sub>0e32d561-4b5a-4664-a6e3-a3fa85649157</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/0e32d561-4b5a-4664-a6e3-a3fa85649157" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#encryption_configuration">Documentation</a><br/>|
 |EFS Without KMS<br/><sup><sub>25d251f3-f348-4f95-845c-1090e41a615c</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/25d251f3-f348-4f95-845c-1090e41a615c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/efs_file_system#kms_key_id">Documentation</a><br/>|
-|Redis Disabled<br/><sup><sub>4bd15dd9-8d5e-4008-8532-27eb0c3706d3</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#engine">Documentation</a><br/>|
-|Unscanned ECR Image<br/><sup><sub>9630336b-3fed-4096-8173-b9afdfe346a7</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#scan_on_push">Documentation</a><br/>|
 |AWS Password Policy With Unchangeable Passwords<br/><sup><sub>9ef7d25d-9764-4224-9968-fa321c56ef76</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/9ef7d25d-9764-4224-9968-fa321c56ef76" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_account_password_policy">Documentation</a><br/>|
 |IAM User Policy Without MFA<br/><sup><sub>b5681959-6c09-4f55-b42b-c40fa12d03ec</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/b5681959-6c09-4f55-b42b-c40fa12d03ec" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_configure-api-require.html">Documentation</a><br/>|
 |Instance With No VPC<br/><sup><sub>a31a5a29-718a-4ff4-8001-a69e5e4d029e</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/a31a5a29-718a-4ff4-8001-a69e5e4d029e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/instance">Documentation</a><br/>|
+|Redis Disabled<br/><sup><sub>4bd15dd9-8d5e-4008-8532-27eb0c3706d3</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#engine">Documentation</a><br/>|
 |Redshift Cluster Without VPC<br/><sup><sub>0a494a6a-ebe2-48a0-9d77-cf9d5125e1b3</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/0a494a6a-ebe2-48a0-9d77-cf9d5125e1b3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/redshift_cluster#vpc_security_group_ids">Documentation</a><br/>|
 |S3 Bucket Without Enabled MFA Delete<br/><sup><sub>c5b31ab9-0f26-4a49-b8aa-4cc064392f4d</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/c5b31ab9-0f26-4a49-b8aa-4cc064392f4d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#mfa_delete">Documentation</a><br/>|
 |Dynamodb VPC Endpoint Without Route Table Association<br/><sup><sub>0bc534c5-13d1-4353-a7fe-b8665d5c1d7d</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../terraform-queries/aws/0bc534c5-13d1-4353-a7fe-b8665d5c1d7d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_endpoint#vpc_id">Documentation</a><br/>|
@@ -1486,6 +1485,7 @@ This page contains all queries.
 |ElasticSearch Without Slow Logs<br/><sup><sub>e979fcbc-df6c-422d-9458-c33d65e71c45</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/e979fcbc-df6c-422d-9458-c33d65e71c45" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticsearch_domain#log_publishing_options">Documentation</a><br/>|
 |KMS Key With No Deletion Window<br/><sup><sub>0b530315-0ea4-497f-b34c-4ff86268f59d</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/0b530315-0ea4-497f-b34c-4ff86268f59d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key">Documentation</a><br/>|
 |Lambda Functions Without X-Ray Tracing<br/><sup><sub>8152e0cf-d2f0-47ad-96d5-d003a76eabd1</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/8152e0cf-d2f0-47ad-96d5-d003a76eabd1" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function#tracing_config">Documentation</a><br/>|
+|Unscanned ECR Image<br/><sup><sub>9630336b-3fed-4096-8173-b9afdfe346a7</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#scan_on_push">Documentation</a><br/>|
 |API Gateway Stage Without API Gateway UsagePlan Associated<br/><sup><sub>c999cf62-0920-40f8-8dda-0caccd66ed7e</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../terraform-queries/aws/c999cf62-0920-40f8-8dda-0caccd66ed7e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/api_gateway_stage">Documentation</a><br/>|
 |Security Group Not Used<br/><sup><sub>4849211b-ac39-479e-ae78-5694d506cb24</sub></sup>|Terraform|<span style="color:#5bc0de">Info</span>|Access Control|<a href="../terraform-queries/aws/4849211b-ac39-479e-ae78-5694d506cb24" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group">Documentation</a><br/>|
 |DynamoDB Table Point In Time Recovery Disabled<br/><sup><sub>741f1291-47ac-4a85-a07b-3d32a9d6bd3e</sub></sup>|Terraform|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../terraform-queries/aws/741f1291-47ac-4a85-a07b-3d32a9d6bd3e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/dynamodb_table#point_in_time_recovery">Documentation</a><br/>|
@@ -1655,8 +1655,8 @@ This page contains all queries.
 |Service Account with Improper Privileges<br/><sup><sub>cefdad16-0dd5-4ac5-8ed2-a37502c78672</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../terraform-queries/gcp/cefdad16-0dd5-4ac5-8ed2-a37502c78672" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |High Google KMS Crypto Key Rotation Period<br/><sup><sub>d8c57c4e-bf6f-4e32-a2bf-8643532de77b</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../terraform-queries/gcp/d8c57c4e-bf6f-4e32-a2bf-8643532de77b" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/kms_crypto_key">Documentation</a><br/>|
 |Project-wide SSH Keys Are Enabled In VM Instances<br/><sup><sub>3e4d5ce6-3280-4027-8010-c26eeea1ec01</sub></sup>|Terraform|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../terraform-queries/gcp/3e4d5ce6-3280-4027-8010-c26eeea1ec01" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance">Documentation</a><br/>|
+|User with IAM Role<br/><sup><sub>704fcc44-a58f-4af5-82e2-93f2a58ef918</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Access Control|<a href="../terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |Outdated GKE Version<br/><sup><sub>128df7ec-f185-48bc-8913-ce756a3ccb85</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../terraform-queries/gcp/128df7ec-f185-48bc-8913-ce756a3ccb85" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#master_version">Documentation</a><br/>|
-|User with IAM Role<br/><sup><sub>704fcc44-a58f-4af5-82e2-93f2a58ef918</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |Cluster Labels Disabled<br/><sup><sub>65c1bc7a-4835-4ac4-a2b6-13d310b0648d</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/65c1bc7a-4835-4ac4-a2b6-13d310b0648d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster">Documentation</a><br/>|
 |COS Node Image Not Used<br/><sup><sub>8a893e46-e267-485a-8690-51f39951de58</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/8a893e46-e267-485a-8690-51f39951de58" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_node_pool#node_config">Documentation</a><br/>|
 |Legacy Client Certificate Auth Enabled<br/><sup><sub>73fb21a1-b19a-45b1-b648-b47b1678681e</sub></sup>|Terraform|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/73fb21a1-b19a-45b1-b648-b47b1678681e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster">Documentation</a><br/>|
diff --git a/docs/queries/ansible-queries.md b/docs/queries/ansible-queries.md
index 858a2f301b4..bb1a60c7092 100644
--- a/docs/queries/ansible-queries.md
+++ b/docs/queries/ansible-queries.md
@@ -70,6 +70,7 @@ Below are listed queries related to Ansible AWS:
 |Auto Scaling Group With No Associated ELB<br/><sup><sub>050f085f-a8db-4072-9010-2cca235cc02f</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../ansible-queries/aws/050f085f-a8db-4072-9010-2cca235cc02f" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/ec2_asg_module.html#parameter-load_balancers">Documentation</a><br/>|
 |CMK Is Unusable<br/><sup><sub>133fee21-37ef-45df-a563-4d07edc169f4</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../ansible-queries/aws/133fee21-37ef-45df-a563-4d07edc169f4" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/aws_kms_module.html#parameter-enabled">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>e69890e6-fce5-461d-98ad-cb98318dfc96</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/e69890e6-fce5-461d-98ad-cb98318dfc96" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/rds_instance_module.html#parameter-backup_retention_period">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>9232306a-f839-40aa-b3ef-b352001da9a5</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-versioning">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>17d5ba1d-7667-4729-b1a6-b11fde3db7f7</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../ansible-queries/aws/17d5ba1d-7667-4729-b1a6-b11fde3db7f7" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudformation_stack_set_module.html#parameter-purge_stacks">Documentation</a><br/>|
 |AMI Not Encrypted<br/><sup><sub>97707503-a22c-4cd7-b7c0-f088fa7cf830</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../ansible-queries/aws/97707503-a22c-4cd7-b7c0-f088fa7cf830" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/ec2_ami_module.html">Documentation</a><br/>|
 |CA Certificate Identifier Is Outdated<br/><sup><sub>5eccd62d-8b4d-46d3-83ea-1879f3cbd3ce</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../ansible-queries/aws/5eccd62d-8b4d-46d3-83ea-1879f3cbd3ce" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/rds_instance_module.html#parameter-ca_certificate_identifier">Documentation</a><br/>|
@@ -99,7 +100,6 @@ Below are listed queries related to Ansible AWS:
 |CloudFront Logging Disabled<br/><sup><sub>d31cb911-bf5b-4eb6-9fc3-16780c77c7bd</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/d31cb911-bf5b-4eb6-9fc3-16780c77c7bd" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudfront_distribution_module.html">Documentation</a><br/>|
 |CloudTrail Logging Disabled<br/><sup><sub>d4a73c49-cbaa-4c6f-80ee-d6ef5a3a26f5</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/d4a73c49-cbaa-4c6f-80ee-d6ef5a3a26f5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/cloudtrail_module.html#parameter-enable_logging">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>c3b9f7b0-f5a0-49ec-9cbc-f1e346b7274d</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/c3b9f7b0-f5a0-49ec-9cbc-f1e346b7274d" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-debug_botocore_endpoint_logs">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>9232306a-f839-40aa-b3ef-b352001da9a5</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/s3_bucket_module.html#parameter-versioning">Documentation</a><br/>|
 |No Stack Policy<br/><sup><sub>ffe0fd52-7a8b-4a5c-8fc7-49844418e6c9</sub></sup>|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../ansible-queries/aws/ffe0fd52-7a8b-4a5c-8fc7-49844418e6c9" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/amazon/aws/cloudformation_module.html">Documentation</a><br/>|
 |Authentication Without MFA<br/><sup><sub>eee107f9-b3d8-45d3-b9c6-43b5a7263ce1</sub></sup>|<span style="color:#edd57e">Low</span>|Access Control|<a href="../ansible-queries/aws/eee107f9-b3d8-45d3-b9c6-43b5a7263ce1" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/iam_mfa_device_info_module.html">Documentation</a><br/>|
 |ECS Service Without Running Tasks<br/><sup><sub>f5c45127-1d28-4b49-a692-0b97da1c3a84</sub></sup>|<span style="color:#edd57e">Low</span>|Availability|<a href="../ansible-queries/aws/f5c45127-1d28-4b49-a692-0b97da1c3a84" target="_blank">Query details</a><br><a href="https://docs.ansible.com/ansible/latest/collections/community/aws/ecs_service_module.html#ansible-collections-community-aws-ecs-service-module">Documentation</a><br/>|
diff --git a/docs/queries/ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5.md b/docs/queries/ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5.md
index 9600948d7fe..32476ead786 100644
--- a/docs/queries/ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5.md
+++ b/docs/queries/ansible-queries/aws/9232306a-f839-40aa-b3ef-b352001da9a5.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** S3 Bucket Without Versioning
 -   **Platform:** Ansible
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Observability
+-   **Category:** Backup
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/ansible/aws/s3_bucket_without_versioning)
 
 ### Description
diff --git a/docs/queries/azureresourcemanager-queries.md b/docs/queries/azureresourcemanager-queries.md
index 7e45b7efaae..57a8645bdbf 100644
--- a/docs/queries/azureresourcemanager-queries.md
+++ b/docs/queries/azureresourcemanager-queries.md
@@ -35,13 +35,13 @@ This page contains all queries from AzureResourceManager.
 |Phone Number Not Set For Security Contacts<br/><sup><sub>3e9fcc67-1f64-405f-b2f9-0a6be17598f0</sub></sup>|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/3e9fcc67-1f64-405f-b2f9-0a6be17598f0" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/securitycontacts?tabs=json">Documentation</a><br/>|
 |AKS Dashboard Is Enabled<br/><sup><sub>c62d3b92-9a11-4ffd-b7b7-6faaae83faed</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../azureresourcemanager-queries/azure/c62d3b92-9a11-4ffd-b7b7-6faaae83faed" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.containerservice/managedclusters?tabs=json#managedclusteraddonprofile">Documentation</a><br/>|
 |AKS With Authorized IP Ranges Disabled<br/><sup><sub>2583fab1-953b-4fae-bd02-4a136a6c21f9</sub></sup>|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/2583fab1-953b-4fae-bd02-4a136a6c21f9" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.containerservice/managedclusters?tabs=json#managedclusterapiserveraccessprofile-object">Documentation</a><br/>|
-|Standard Price Is Not Selected<br/><sup><sub>2081c7d6-2851-4cce-bda5-cb49d462da42</sub></sup>|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/pricings?tabs=json#pricingproperties-object">Documentation</a><br/>|
 |Storage Account Allows Default Network Access<br/><sup><sub>9073f073-5d60-4b46-b569-0d6baa80ed95</sub></sup>|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/9073f073-5d60-4b46-b569-0d6baa80ed95" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.storage/storageaccounts?tabs=json#storageaccountpropertiescreateparameters-object">Documentation</a><br/>|
 |Website with 'Http20Enabled' Disabled<br/><sup><sub>70111098-7f85-48f0-b1b4-e4261cf5f61b</sub></sup>|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/70111098-7f85-48f0-b1b4-e4261cf5f61b" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.web/sites?tabs=json#siteproperties-object">Documentation</a><br/>|
 |Log Profile Incorrect Category<br/><sup><sub>4d522e7b-f938-4d51-a3b1-974ada528bd3</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/4d522e7b-f938-4d51-a3b1-974ada528bd3" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2016-03-01/logprofiles?tabs=json#logprofileproperties-object">Documentation</a><br/>|
 |SQL Server Database With Unrecommended Retention Days<br/><sup><sub>c09cdac2-7670-458a-bf6c-efad6880973a</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/c09cdac2-7670-458a-bf6c-efad6880973a" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/databases/auditingsettings?tabs=json">Documentation</a><br/>|
 |Unrecommended Log Profile Retention Policy<br/><sup><sub>25684eac-daaa-4c2c-94b4-8d2dbb627909</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/25684eac-daaa-4c2c-94b4-8d2dbb627909" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2016-03-01/logprofiles?tabs=json#retentionpolicy-object">Documentation</a><br/>|
 |Unrecommended Network Watcher Flow Log Retention Policy<br/><sup><sub>564b70f8-41cd-4690-aff8-bb53add86bc9</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../azureresourcemanager-queries/azure/564b70f8-41cd-4690-aff8-bb53add86bc9" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2019-11-01/networkwatchers/flowlogs?tabs=json#retentionpolicyparameters-object">Documentation</a><br/>|
+|Standard Price Is Not Selected<br/><sup><sub>2081c7d6-2851-4cce-bda5-cb49d462da42</sub></sup>|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/pricings?tabs=json#pricingproperties-object">Documentation</a><br/>|
 |Account Admins Not Notified By Email<br/><sup><sub>a8852cc0-fd4b-4fc7-9372-1e43fad0732e</sub></sup>|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/a8852cc0-fd4b-4fc7-9372-1e43fad0732e" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/2017-03-01-preview/servers/securityalertpolicies?tabs=json">Documentation</a><br/>|
 |SQL Alert Policy Without Emails<br/><sup><sub>89b79fe5-49bd-4d39-84ce-55f5fc6f7764</sub></sup>|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../azureresourcemanager-queries/azure/89b79fe5-49bd-4d39-84ce-55f5fc6f7764" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.sql/servers/databases/securityalertpolicies?tabs=json">Documentation</a><br/>|
 |Email Notifications Disabled<br/><sup><sub>79c2c2c0-eb00-47c0-ac16-f8b0e2c81c92</sub></sup>|<span style="color:#5bc0de">Info</span>|Networking and Firewall|<a href="../azureresourcemanager-queries/azure/79c2c2c0-eb00-47c0-ac16-f8b0e2c81c92" target="_blank">Query details</a><br><a href="https://docs.microsoft.com/en-us/azure/templates/microsoft.security/securitycontacts">Documentation</a><br/>|
diff --git a/docs/queries/azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42.md b/docs/queries/azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42.md
index e19d7153c3f..ce960e0475d 100644
--- a/docs/queries/azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42.md
+++ b/docs/queries/azureresourcemanager-queries/azure/2081c7d6-2851-4cce-bda5-cb49d462da42.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Standard Price Is Not Selected
 -   **Platform:** AzureResourceManager
 -   **Severity:** <span style="color:#edd57e">Low</span>
--   **Category:** Networking and Firewall
+-   **Category:** Resource Management
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/azureResourceManager/standard_price_not_selected)
 
 ### Description
diff --git a/docs/queries/cloudformation-queries.md b/docs/queries/cloudformation-queries.md
index 4bd438b101d..f37be3d2fc1 100644
--- a/docs/queries/cloudformation-queries.md
+++ b/docs/queries/cloudformation-queries.md
@@ -55,7 +55,6 @@ Below are listed queries related to CloudFormation AWS:
 |User Data Contains Encoded Private Key<br/><sup><sub>568cc372-ca64-420d-9015-ee347d00d288</sub></sup>|<span style="color:#bb2124">High</span>|Encryption|<a href="../cloudformation-queries/aws/568cc372-ca64-420d-9015-ee347d00d288" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html">Documentation</a><br/>|
 |Workspace Without Encryption<br/><sup><sub>89827c57-5a8a-49eb-9731-976a606d70db</sub></sup>|<span style="color:#bb2124">High</span>|Encryption|<a href="../cloudformation-queries/aws/89827c57-5a8a-49eb-9731-976a606d70db" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html">Documentation</a><br/>|
 |Batch Job Definition With Privileged Container Properties<br/><sup><sub>76ddf32c-85b1-4808-8935-7eef8030ab36</sub></sup>|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/76ddf32c-85b1-4808-8935-7eef8030ab36" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html">Documentation</a><br/>|
-|IAM User LoginProfile Password Is In Plaintext<br/><sup><sub>06adef8c-c284-4de7-aad2-af43b07a8ca1</sub></sup>|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html">Documentation</a><br/>|
 |KMS Key With Vulnerable Policy<br/><sup><sub>da905474-7454-43c0-b8d2-5756ab951aba</sub></sup>|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/da905474-7454-43c0-b8d2-5756ab951aba" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keypolicy">Documentation</a><br/>|
 |Lambda Functions Without Unique IAM Roles<br/><sup><sub>ae03f542-1423-402f-9cef-c834e7ee9583</sub></sup>|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/ae03f542-1423-402f-9cef-c834e7ee9583" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html">Documentation</a><br/>|
 |MQ Broker Is Publicly Accessible<br/><sup><sub>68b6a789-82f8-4cfd-85de-e95332fe6a61</sub></sup>|<span style="color:#bb2124">High</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/68b6a789-82f8-4cfd-85de-e95332fe6a61" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-publiclyaccessible">Documentation</a><br/>|
@@ -84,6 +83,7 @@ Below are listed queries related to CloudFormation AWS:
 |DMS Endpoint Password Exposed<br/><sup><sub>5f700072-b7ce-4e84-b3f3-497bf1c24a4d</sub></sup>|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/5f700072-b7ce-4e84-b3f3-497bf1c24a4d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html">Documentation</a><br/>|
 |DocDB Cluster Master Password In Plaintext<br/><sup><sub>39423ce4-9011-46cd-b6b1-009edcd9385d</sub></sup>|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/39423ce4-9011-46cd-b6b1-009edcd9385d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html">Documentation</a><br/>|
 |Hardcoded AWS Access Key In Lambda<br/><sup><sub>2564172f-c92b-4261-9acd-464aed511696</sub></sup>|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/2564172f-c92b-4261-9acd-464aed511696" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-environment">Documentation</a><br/>|
+|IAM User LoginProfile Password Is In Plaintext<br/><sup><sub>06adef8c-c284-4de7-aad2-af43b07a8ca1</sub></sup>|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html">Documentation</a><br/>|
 |RefreshToken Is Exposed<br/><sup><sub>5b48c507-0d1f-41b0-a630-76817c6b4189</sub></sup>|<span style="color:#bb2124">High</span>|Secret Management|<a href="../cloudformation-queries/aws/5b48c507-0d1f-41b0-a630-76817c6b4189" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html#cfn-ask-skill-authenticationconfiguration">Documentation</a><br/>|
 |API Gateway Method Does Not Contains An API Key<br/><sup><sub>3641d5b4-d339-4bc2-bfb9-208fe8d3477f</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/3641d5b4-d339-4bc2-bfb9-208fe8d3477f" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html">Documentation</a><br/>|
 |API Gateway Without Configured Authorizer<br/><sup><sub>7fd0d461-5b8c-4815-898c-f2b4b117eb28</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/7fd0d461-5b8c-4815-898c-f2b4b117eb28" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html">Documentation</a><br/>|
@@ -92,6 +92,7 @@ Below are listed queries related to CloudFormation AWS:
 |EC2 Network ACL Ineffective Denied Traffic<br/><sup><sub>2623d682-dccb-44cd-99d0-54d9fd62f8f2</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/2623d682-dccb-44cd-99d0-54d9fd62f8f2" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-acl-entry.html">Documentation</a><br/>|
 |Elasticsearch Without IAM Authentication<br/><sup><sub>5c666ed9-b586-49ab-9873-c495a833b705</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/5c666ed9-b586-49ab-9873-c495a833b705" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-accesspolicies">Documentation</a><br/>|
 |Empty Roles For ECS Cluster Task Definitions<br/><sup><sub>7f384a5f-b5a2-4d84-8ca3-ee0a5247becb</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/7f384a5f-b5a2-4d84-8ca3-ee0a5247becb" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
+|IAM Group Inline Policies<br/><sup><sub>a58d1a2d-4078-4b80-855b-84cc3f7f4540</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |IAM Group Without Users<br/><sup><sub>8f957abd-9703-413d-87d3-c578950a753c</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/8f957abd-9703-413d-87d3-c578950a753c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |IAM Policies Attached To User<br/><sup><sub>edc95c10-7366-4f30-9b4b-f995c84eceb5</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/edc95c10-7366-4f30-9b4b-f995c84eceb5" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_managed-vs-inline.html">Documentation</a><br/>|
 |IAM Policies With Full Privileges<br/><sup><sub>953b3cdb-ce13-428a-aa12-318726506661</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../cloudformation-queries/aws/953b3cdb-ce13-428a-aa12-318726506661" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html">Documentation</a><br/>|
@@ -109,8 +110,9 @@ Below are listed queries related to CloudFormation AWS:
 |Auto Scaling Group With No Associated ELB<br/><sup><sub>ad21e616-5026-4b9d-990d-5b007bfe679c</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/ad21e616-5026-4b9d-990d-5b007bfe679c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html">Documentation</a><br/>|
 |CMK Is Unusable<br/><sup><sub>2844c749-bd78-4cd1-90e8-b179df827602</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/2844c749-bd78-4cd1-90e8-b179df827602" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html">Documentation</a><br/>|
 |ElastiCache Nodes Not Created Across Multi AZ<br/><sup><sub>cfdef2e5-1fe4-4ef4-bea8-c56e08963150</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/cfdef2e5-1fe4-4ef4-bea8-c56e08963150" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html">Documentation</a><br/>|
-|RDS Multi-AZ Deployment Disabled<br/><sup><sub>2b1d4935-9acf-48a7-8466-10d18bf51a69</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
+|RDS Multi-AZ Deployment Disabled<br/><sup><sub>2b1d4935-9acf-48a7-8466-10d18bf51a69</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>8c415f6f-7b90-4a27-a44a-51047e1506f9</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/8c415f6f-7b90-4a27-a44a-51047e1506f9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>a227ec01-f97a-4084-91a4-47b350c1db54</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>fe974ae9-858e-4991-bbd5-e040a834679f</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../cloudformation-queries/aws/fe974ae9-858e-4991-bbd5-e040a834679f" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-autodeployment.html#cfn-cloudformation-stackset-autodeployment-retainstacksonaccountremoval">Documentation</a><br/>|
 |DynamoDB Table Point In Time Recovery Disabled<br/><sup><sub>0f04217d-488f-4e7a-bec8-f16159686cd6</sub></sup>|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../cloudformation-queries/aws/0f04217d-488f-4e7a-bec8-f16159686cd6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-pointintimerecoveryspecification.html">Documentation</a><br/>|
 |ECS No Load Balancer Attached<br/><sup><sub>fb2b0ecf-1492-491a-a70d-ba1df579175d</sub></sup>|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../cloudformation-queries/aws/fb2b0ecf-1492-491a-a70d-ba1df579175d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
@@ -128,7 +130,6 @@ Below are listed queries related to CloudFormation AWS:
 |ELB Without Secure Protocol<br/><sup><sub>80908a75-586b-4c61-ab04-490f4f4525b8</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/80908a75-586b-4c61-ab04-490f4f4525b8" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html">Documentation</a><br/>|
 |EMR Security Configuration Encryption Disabled<br/><sup><sub>5b033ec8-f079-4323-b5c8-99d4620433a9</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/5b033ec8-f079-4323-b5c8-99d4620433a9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html">Documentation</a><br/>|
 |IAM Database Auth Not Enabled<br/><sup><sub>9fcd0a0a-9b6f-4670-a215-d94e6bf3f184</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/9fcd0a0a-9b6f-4670-a215-d94e6bf3f184" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-enableiamdatabaseauthentication">Documentation</a><br/>|
-|IAM Group Inline Policies<br/><sup><sub>a58d1a2d-4078-4b80-855b-84cc3f7f4540</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html">Documentation</a><br/>|
 |KMS Key Rotation Disabled<br/><sup><sub>235ca980-eb71-48f4-9030-df0c371029eb</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/235ca980-eb71-48f4-9030-df0c371029eb" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html">Documentation</a><br/>|
 |Redshift Cluster Without KMS CMK<br/><sup><sub>de76a0d6-66d5-45c9-9022-f05545b85c78</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/de76a0d6-66d5-45c9-9022-f05545b85c78" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html">Documentation</a><br/>|
 |S3 Bucket Without SSL In Write Actions<br/><sup><sub>38c64e76-c71e-4d92-a337-60174d1de1c9</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../cloudformation-queries/aws/38c64e76-c71e-4d92-a337-60174d1de1c9" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
@@ -192,7 +193,6 @@ Below are listed queries related to CloudFormation AWS:
 |Redshift Cluster Logging Disabled<br/><sup><sub>3de2d4ff-fe53-4fc9-95d3-2f8a69bf90d6</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/3de2d4ff-fe53-4fc9-95d3-2f8a69bf90d6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-loggingproperties">Documentation</a><br/>|
 |S3 Bucket CloudTrail Logging Disabled<br/><sup><sub>c3ce69fd-e3df-49c6-be78-1db3f802261c</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/c3ce69fd-e3df-49c6-be78-1db3f802261c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>4552b71f-0a2a-4bc4-92dd-ed7ec1b4674c</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/4552b71f-0a2a-4bc4-92dd-ed7ec1b4674c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>a227ec01-f97a-4084-91a4-47b350c1db54</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html">Documentation</a><br/>|
 |VPC FlowLogs Disabled<br/><sup><sub>f6d299d2-21eb-41cc-b1e1-fe12d857500b</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../cloudformation-queries/aws/f6d299d2-21eb-41cc-b1e1-fe12d857500b" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html">Documentation</a><br/>|
 |High Access Key Rotation Period<br/><sup><sub>800fa019-49dd-421b-9042-7331fdd83fa2</sub></sup>|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../cloudformation-queries/aws/800fa019-49dd-421b-9042-7331fdd83fa2" target="_blank">Query details</a><br><a href="https://docs.amazonaws.cn/en_us/config/latest/developerguide/access-keys-rotated.html">Documentation</a><br/>|
 |IAM User With No Group<br/><sup><sub>06933df4-0ea7-461c-b9b5-104d27390e0e</sub></sup>|<span style="color:#edd57e">Low</span>|Access Control|<a href="../cloudformation-queries/aws/06933df4-0ea7-461c-b9b5-104d27390e0e" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/quickref-iam.html#scenario-iam-policy">Documentation</a><br/>|
@@ -216,7 +216,6 @@ Below are listed queries related to CloudFormation AWS:
 |API Gateway With Invalid Compression<br/><sup><sub>d6653eee-2d4d-4e6a-976f-6794a497999a</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/d6653eee-2d4d-4e6a-976f-6794a497999a" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html">Documentation</a><br/>|
 |CloudTrail Log Files Not Encrypted With KMS<br/><sup><sub>050a9ba8-d1cb-4c61-a5e8-8805a70d3b85</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/050a9ba8-d1cb-4c61-a5e8-8805a70d3b85" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-kmskeyid">Documentation</a><br/>|
 |EFS Without KMS<br/><sup><sub>6d087495-2a42-4735-abf7-02ef5660a7e6</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/6d087495-2a42-4735-abf7-02ef5660a7e6" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html">Documentation</a><br/>|
-|Unscanned ECR Image<br/><sup><sub>9025b2b3-e554-4842-ba87-db7aeec36d35</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagescanningconfiguration">Documentation</a><br/>|
 |API Gateway Cache Cluster Disabled<br/><sup><sub>52790cad-d60d-41d5-8483-146f9f21208d</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/52790cad-d60d-41d5-8483-146f9f21208d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclusterenabled">Documentation</a><br/>|
 |Inline Policies Are Attached To ECS Service<br/><sup><sub>9e8c89b3-7997-4d15-93e4-7911b9db99fd</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/9e8c89b3-7997-4d15-93e4-7911b9db99fd" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html">Documentation</a><br/>|
 |Instance With No VPC<br/><sup><sub>8a6d36cd-0bc6-42b7-92c4-67acc8576861</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../cloudformation-queries/aws/8a6d36cd-0bc6-42b7-92c4-67acc8576861" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-vpc.html">Documentation</a><br/>|
@@ -246,6 +245,7 @@ Below are listed queries related to CloudFormation AWS:
 |ElasticSearch Without Slow Logs<br/><sup><sub>086ea2eb-14a6-4fd4-914b-38e0bc8703e8</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/086ea2eb-14a6-4fd4-914b-38e0bc8703e8" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-logpublishingoptions">Documentation</a><br/>|
 |Lambda Functions Without X-Ray Tracing<br/><sup><sub>9488c451-074e-4cd3-aee3-7db6104f542c</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/9488c451-074e-4cd3-aee3-7db6104f542c" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html">Documentation</a><br/>|
 |Stack Notifications Disabled<br/><sup><sub>837e033c-4717-40bd-807e-6abaa30161b7</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/837e033c-4717-40bd-807e-6abaa30161b7" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html">Documentation</a><br/>|
+|Unscanned ECR Image<br/><sup><sub>9025b2b3-e554-4842-ba87-db7aeec36d35</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagescanningconfiguration">Documentation</a><br/>|
 |API Gateway Stage Without API Gateway UsagePlan Associated<br/><sup><sub>7f8f1b60-43df-4c28-aa21-fb836dbd8071</sub></sup>|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/7f8f1b60-43df-4c28-aa21-fb836dbd8071" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html">Documentation</a><br/>|
 |ECS Task Definition Invalid CPU or Memory<br/><sup><sub>f4c9b5f5-68b8-491f-9e48-4f96644a1d51</sub></sup>|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/f4c9b5f5-68b8-491f-9e48-4f96644a1d51" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html">Documentation</a><br/>|
 |SDB Domain Declared As A Resource<br/><sup><sub>6ea57c8b-f9c0-4ec7-bae3-bd75a9dee27d</sub></sup>|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../cloudformation-queries/aws/6ea57c8b-f9c0-4ec7-bae3-bd75a9dee27d" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html">Documentation</a><br/>|
diff --git a/docs/queries/cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1.md b/docs/queries/cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1.md
index e4e29fcf714..797d07369e1 100644
--- a/docs/queries/cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1.md
+++ b/docs/queries/cloudformation-queries/aws/06adef8c-c284-4de7-aad2-af43b07a8ca1.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** IAM User LoginProfile Password Is In Plaintext
 -   **Platform:** CloudFormation
 -   **Severity:** <span style="color:#bb2124">High</span>
--   **Category:** Insecure Configurations
+-   **Category:** Secret Management
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/cloudFormation/aws/iam_user_login_profile_password_is_in_plaintext)
 
 ### Description
diff --git a/docs/queries/cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69.md b/docs/queries/cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69.md
index 91c8a7fac97..13336854cfc 100644
--- a/docs/queries/cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69.md
+++ b/docs/queries/cloudformation-queries/aws/2b1d4935-9acf-48a7-8466-10d18bf51a69.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** RDS Multi-AZ Deployment Disabled
 -   **Platform:** CloudFormation
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Backup
+-   **Category:** Availability
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/cloudFormation/aws/rds_multi_az_deployment_disabled)
 
 ### Description
diff --git a/docs/queries/cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35.md b/docs/queries/cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35.md
index 37c7460bec3..38c062c84b9 100644
--- a/docs/queries/cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35.md
+++ b/docs/queries/cloudformation-queries/aws/9025b2b3-e554-4842-ba87-db7aeec36d35.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Unscanned ECR Image
 -   **Platform:** CloudFormation
 -   **Severity:** <span style="color:#edd57e">Low</span>
--   **Category:** Encryption
+-   **Category:** Observability
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/cloudFormation/aws/unscanned_ecr_image)
 
 ### Description
diff --git a/docs/queries/cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54.md b/docs/queries/cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54.md
index 26acb5ad07d..e79eb7050f8 100644
--- a/docs/queries/cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54.md
+++ b/docs/queries/cloudformation-queries/aws/a227ec01-f97a-4084-91a4-47b350c1db54.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** S3 Bucket Without Versioning
 -   **Platform:** CloudFormation
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Observability
+-   **Category:** Backup
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/cloudFormation/aws/s3_bucket_without_versioning)
 
 ### Description
diff --git a/docs/queries/cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540.md b/docs/queries/cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540.md
index 9ef78f98eb1..2cbf5857679 100644
--- a/docs/queries/cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540.md
+++ b/docs/queries/cloudformation-queries/aws/a58d1a2d-4078-4b80-855b-84cc3f7f4540.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** IAM Group Inline Policies
 -   **Platform:** CloudFormation
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Encryption
+-   **Category:** Access Control
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/cloudFormation/aws/iam_groups_inline_policies)
 
 ### Description
diff --git a/docs/queries/crossplane-queries.md b/docs/queries/crossplane-queries.md
index dfc6a3c8dfb..03fc80c3c3d 100644
--- a/docs/queries/crossplane-queries.md
+++ b/docs/queries/crossplane-queries.md
@@ -31,7 +31,7 @@ Below are listed queries related to Crossplane AZURE:
 |            Query             |Severity|Category|More info|
 |------------------------------|--------|--------|-----------|
 |AKS RBAC Disabled<br/><sup><sub>b2418936-cd47-4ea2-8346-623c0bdb87bd</sub></sup>|<span style="color:#ff7213">Medium</span>|Access Control|<a href="../crossplane-queries/azure/b2418936-cd47-4ea2-8346-623c0bdb87bd" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/compute.azure.crossplane.io/AKSCluster/v1alpha3@v0.19.0#spec-disableRBAC">Documentation</a><br/>|
-|Redis Cache Allows Non SSL Connections<br/><sup><sub>6c7cfec3-c686-4ed2-bf58-a1ec054b63fc</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/cache.azure.crossplane.io/Redis/v1beta1@v0.19.0#spec-forProvider-enableNonSslPort">Documentation</a><br/>|
+|Redis Cache Allows Non SSL Connections<br/><sup><sub>6c7cfec3-c686-4ed2-bf58-a1ec054b63fc</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc" target="_blank">Query details</a><br><a href="https://doc.crds.dev/github.com/crossplane/provider-azure/cache.azure.crossplane.io/Redis/v1beta1@v0.19.0#spec-forProvider-enableNonSslPort">Documentation</a><br/>|
 
 ### GCP
 Below are listed queries related to Crossplane GCP:
diff --git a/docs/queries/crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc.md b/docs/queries/crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc.md
index 17e5cc427b4..659cafe80eb 100644
--- a/docs/queries/crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc.md
+++ b/docs/queries/crossplane-queries/azure/6c7cfec3-c686-4ed2-bf58-a1ec054b63fc.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Redis Cache Allows Non SSL Connections
 -   **Platform:** Crossplane
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Encryption
+-   **Category:** Insecure Configurations
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/crossplane/azure/redis_cache_allows_non_ssl_connections)
 
 ### Description
diff --git a/docs/queries/dockerfile-queries.md b/docs/queries/dockerfile-queries.md
index b8285198c27..4afff5ac246 100644
--- a/docs/queries/dockerfile-queries.md
+++ b/docs/queries/dockerfile-queries.md
@@ -46,7 +46,7 @@ This page contains all queries from Dockerfile.
 |Run Using apt<br/><sup><sub>b84a0b47-2e99-4c9f-8933-98bcabe2b94d</sub></sup>|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/b84a0b47-2e99-4c9f-8933-98bcabe2b94d" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run">Documentation</a><br/>|
 |Yum Install Allows Manual Input<br/><sup><sub>6e19193a-8753-436d-8a09-76dcff91bb03</sub></sup>|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/6e19193a-8753-436d-8a09-76dcff91bb03" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
 |Zypper Install Without Version<br/><sup><sub>562952e4-0348-4dea-9826-44f3a2c6117b</sub></sup>|<span style="color:#edd57e">Low</span>|Supply-Chain|<a href="../dockerfile-queries/562952e4-0348-4dea-9826-44f3a2c6117b" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run">Documentation</a><br/>|
-|UNIX Ports Out Of Range<br/><sup><sub>71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e</sub></sup>|<span style="color:#5bc0de">Info</span>|Availability|<a href="../dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#expose">Documentation</a><br/>|
+|UNIX Ports Out Of Range<br/><sup><sub>71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e</sub></sup>|<span style="color:#5bc0de">Info</span>|Networking and Firewall|<a href="../dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#expose">Documentation</a><br/>|
 |Apk Add Using Local Cache Path<br/><sup><sub>ae9c56a6-3ed1-4ac0-9b54-31267f51151d</sub></sup>|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/ae9c56a6-3ed1-4ac0-9b54-31267f51151d" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
 |Apt Get Install Lists Were Not Deleted<br/><sup><sub>df746b39-6564-4fed-bf85-e9c44382303c</sub></sup>|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/df746b39-6564-4fed-bf85-e9c44382303c" target="_blank">Query details</a><br><a href="https://docs.docker.com/develop/develop-images/dockerfile_best-practices/">Documentation</a><br/>|
 |APT-GET Not Avoiding Additional Packages<br/><sup><sub>7384dfb2-fcd1-4fbf-91cd-6c44c318c33c</sub></sup>|<span style="color:#5bc0de">Info</span>|Supply-Chain|<a href="../dockerfile-queries/7384dfb2-fcd1-4fbf-91cd-6c44c318c33c" target="_blank">Query details</a><br><a href="https://docs.docker.com/engine/reference/builder/#run">Documentation</a><br/>|
diff --git a/docs/queries/dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e.md b/docs/queries/dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e.md
index b4f7a69a225..2b6c0ccb41a 100644
--- a/docs/queries/dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e.md
+++ b/docs/queries/dockerfile-queries/71bf8cf8-f0a1-42fa-b9d2-d10525e0a38e.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** UNIX Ports Out Of Range
 -   **Platform:** Dockerfile
 -   **Severity:** <span style="color:#5bc0de">Info</span>
--   **Category:** Availability
+-   **Category:** Networking and Firewall
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/dockerfile/unix_ports_out_of_range)
 
 ### Description
diff --git a/docs/queries/pulumi-queries.md b/docs/queries/pulumi-queries.md
index 93e43216de3..011004deff8 100644
--- a/docs/queries/pulumi-queries.md
+++ b/docs/queries/pulumi-queries.md
@@ -31,8 +31,8 @@ Below are listed queries related to Pulumi AZURE:
 
 |            Query             |Severity|Category|More info|
 |------------------------------|--------|--------|-----------|
-|Redis Cache Allows Non SSL Connections<br/><sup><sub>49e30ac8-f58e-4222-b488-3dcb90158ec1</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/cache/redis/#enablenonsslport_yaml">Documentation</a><br/>|
 |Storage Account Not Forcing HTTPS<br/><sup><sub>cb8e4bf0-903d-45c6-a278-9a947d82a27b</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../pulumi-queries/azure/cb8e4bf0-903d-45c6-a278-9a947d82a27b" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/storage/storageaccount/#enablehttpstrafficonly_yaml">Documentation</a><br/>|
+|Redis Cache Allows Non SSL Connections<br/><sup><sub>49e30ac8-f58e-4222-b488-3dcb90158ec1</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1" target="_blank">Query details</a><br><a href="https://www.pulumi.com/registry/packages/azure-native/api-docs/cache/redis/#enablenonsslport_yaml">Documentation</a><br/>|
 
 ### GCP
 Below are listed queries related to Pulumi GCP:
diff --git a/docs/queries/pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1.md b/docs/queries/pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1.md
index e4e71958e9f..f9d7b2f4b32 100644
--- a/docs/queries/pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1.md
+++ b/docs/queries/pulumi-queries/azure/49e30ac8-f58e-4222-b488-3dcb90158ec1.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Redis Cache Allows Non SSL Connections
 -   **Platform:** Pulumi
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Encryption
+-   **Category:** Insecure Configurations
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/pulumi/azure/redis_cache_allows_non_ssl_connections)
 
 ### Description
diff --git a/docs/queries/terraform-queries.md b/docs/queries/terraform-queries.md
index df3d788134e..034a284cecb 100644
--- a/docs/queries/terraform-queries.md
+++ b/docs/queries/terraform-queries.md
@@ -249,10 +249,11 @@ Below are listed queries related to Terraform AWS:
 |CMK Is Unusable<br/><sup><sub>7350fa23-dcf7-4938-916d-6a60b0c73b50</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../terraform-queries/aws/7350fa23-dcf7-4938-916d-6a60b0c73b50" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key#is_enabled">Documentation</a><br/>|
 |ElastiCache Nodes Not Created Across Multi AZ<br/><sup><sub>6db03a91-f933-4f13-ab38-a8b87a7de54d</sub></sup>|<span style="color:#ff7213">Medium</span>|Availability|<a href="../terraform-queries/aws/6db03a91-f933-4f13-ab38-a8b87a7de54d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster">Documentation</a><br/>|
 |ElastiCache Redis Cluster Without Backup<br/><sup><sub>8fdb08a0-a868-4fdf-9c27-ccab0237f1ab</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/8fdb08a0-a868-4fdf-9c27-ccab0237f1ab" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#snapshot_retention_limit">Documentation</a><br/>|
+|RDS Cluster With Backup Disabled<br/><sup><sub>e542bd46-58c4-4e0f-a52a-1fb4f9548e02</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/rds_cluster#backup_retention_period">Documentation</a><br/>|
 |RDS With Backup Disabled<br/><sup><sub>1dc73fb4-5b51-430c-8c5f-25dcf9090b02</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/1dc73fb4-5b51-430c-8c5f-25dcf9090b02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance">Documentation</a><br/>|
+|S3 Bucket Without Versioning<br/><sup><sub>568a4d22-3517-44a6-a7ad-6a7eed88722c</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#versioning">Documentation</a><br/>|
 |Stack Retention Disabled<br/><sup><sub>6e0e2f68-3fd9-4cd8-a5e4-e2213ef0df97</sub></sup>|<span style="color:#ff7213">Medium</span>|Backup|<a href="../terraform-queries/aws/6e0e2f68-3fd9-4cd8-a5e4-e2213ef0df97" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack_set_instance#stack_set_name">Documentation</a><br/>|
 |ALB Not Dropping Invalid Headers<br/><sup><sub>6e3fd2ed-5c83-4c68-9679-7700d224d379</sub></sup>|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../terraform-queries/aws/6e3fd2ed-5c83-4c68-9679-7700d224d379" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb#drop_invalid_header_fields">Documentation</a><br/>|
-|RDS Cluster With Backup Disabled<br/><sup><sub>e542bd46-58c4-4e0f-a52a-1fb4f9548e02</sub></sup>|<span style="color:#ff7213">Medium</span>|Best Practices|<a href="../terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/rds_cluster#backup_retention_period">Documentation</a><br/>|
 |AMI Not Encrypted<br/><sup><sub>8bbb242f-6e38-4127-86d4-d8f0b2687ae2</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/8bbb242f-6e38-4127-86d4-d8f0b2687ae2" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami">Documentation</a><br/>|
 |CA Certificate Identifier Is Outdated<br/><sup><sub>9f40c07e-699e-4410-8856-3ba0f2e3a2dd</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/9f40c07e-699e-4410-8856-3ba0f2e3a2dd" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/db_instance">Documentation</a><br/>|
 |Cloudfront Viewer Protocol Policy Allows HTTP<br/><sup><sub>55af1353-2f62-4fa0-a8e1-a210ca2708f5</sub></sup>|<span style="color:#ff7213">Medium</span>|Encryption|<a href="../terraform-queries/aws/55af1353-2f62-4fa0-a8e1-a210ca2708f5" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution">Documentation</a><br/>|
@@ -283,6 +284,7 @@ Below are listed queries related to Terraform AWS:
 |S3 Bucket Without Ignore Public ACL<br/><sup><sub>4fa66806-0dd9-4f8d-9480-3174d39c7c91</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/4fa66806-0dd9-4f8d-9480-3174d39c7c91" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block">Documentation</a><br/>|
 |S3 Bucket Without Restriction Of Public Bucket<br/><sup><sub>1ec253ab-c220-4d63-b2de-5b40e0af9293</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/1ec253ab-c220-4d63-b2de-5b40e0af9293" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block">Documentation</a><br/>|
 |Service Control Policies Disabled<br/><sup><sub>5ba6229c-8057-433e-91d0-21cf13569ca9</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Configurations|<a href="../terraform-queries/aws/5ba6229c-8057-433e-91d0-21cf13569ca9" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/organizations_policy">Documentation</a><br/>|
+|Default VPC Exists<br/><sup><sub>96ed3526-0179-4c73-b1b2-372fde2e0d13</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Defaults|<a href="../terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/default_vpc">Documentation</a><br/>|
 |Vulnerable Default SSL Certificate<br/><sup><sub>3a1e94df-6847-4c0e-a3b6-6c6af4e128ef</sub></sup>|<span style="color:#ff7213">Medium</span>|Insecure Defaults|<a href="../terraform-queries/aws/3a1e94df-6847-4c0e-a3b6-6c6af4e128ef" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudfront_distribution">Documentation</a><br/>|
 |ALB Is Not Integrated With WAF<br/><sup><sub>0afa6ab8-a047-48cf-be07-93a2f8c34cf7</sub></sup>|<span style="color:#ff7213">Medium</span>|Networking and Firewall|<a href="../terraform-queries/aws/0afa6ab8-a047-48cf-be07-93a2f8c34cf7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/wafregional_web_acl_association">Documentation</a><br/>|
 |ALB Listening on HTTP<br/><sup><sub>de7f5e83-da88-4046-871f-ea18504b1d43</sub></sup>|<span style="color:#ff7213">Medium</span>|Networking and Firewall|<a href="../terraform-queries/aws/de7f5e83-da88-4046-871f-ea18504b1d43" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lb_listener">Documentation</a><br/>|
@@ -317,7 +319,6 @@ Below are listed queries related to Terraform AWS:
 |CloudWatch S3 policy Change Alarm Missing<br/><sup><sub>27c6a499-895a-4dc7-9617-5c485218db13</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/27c6a499-895a-4dc7-9617-5c485218db13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
 |Cloudwatch Security Group Changes Alarm Missing<br/><sup><sub>4beaf898-9f8b-4237-89e2-5ffdc7ee6006</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/4beaf898-9f8b-4237-89e2-5ffdc7ee6006" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
 |CloudWatch VPC Changes Alarm Missing<br/><sup><sub>9d0d4512-1959-43a2-a17f-72360ff06d1b</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/9d0d4512-1959-43a2-a17f-72360ff06d1b" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_metric_filter#pattern">Documentation</a><br/>|
-|Default VPC Exists<br/><sup><sub>96ed3526-0179-4c73-b1b2-372fde2e0d13</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/default_vpc">Documentation</a><br/>|
 |DocDB Logging Is Disabled<br/><sup><sub>56f6a008-1b14-4af4-b9b2-ab7cf7e27641</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/56f6a008-1b14-4af4-b9b2-ab7cf7e27641" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/docdb_cluster#enabled_cloudwatch_logs_exports">Documentation</a><br/>|
 |EC2 Instance Monitoring Disabled<br/><sup><sub>23b70e32-032e-4fa6-ba5c-82f56b9980e6</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/23b70e32-032e-4fa6-ba5c-82f56b9980e6" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/instance#monitoring">Documentation</a><br/>|
 |EKS cluster logging is not enabled<br/><sup><sub>37304d3f-f852-40b8-ae3f-725e87a7cedf</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/37304d3f-f852-40b8-ae3f-725e87a7cedf" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_cluster#enabled_cluster_log_types">Documentation</a><br/>|
@@ -333,7 +334,6 @@ Below are listed queries related to Terraform AWS:
 |Redshift Cluster Logging Disabled<br/><sup><sub>15ffbacc-fa42-4f6f-a57d-2feac7365caa</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/15ffbacc-fa42-4f6f-a57d-2feac7365caa" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/redshift_cluster#enable">Documentation</a><br/>|
 |S3 Bucket Logging Disabled<br/><sup><sub>f861041c-8c9f-4156-acfc-5e6e524f5884</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/f861041c-8c9f-4156-acfc-5e6e524f5884" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket">Documentation</a><br/>|
 |S3 Bucket Object Level CloudTrail Logging Disabled<br/><sup><sub>a8fc2180-b3ac-4c93-bd0d-a55b974e4b07</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/a8fc2180-b3ac-4c93-bd0d-a55b974e4b07" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudtrail#event_selector">Documentation</a><br/>|
-|S3 Bucket Without Versioning<br/><sup><sub>568a4d22-3517-44a6-a7ad-6a7eed88722c</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#versioning">Documentation</a><br/>|
 |Stack Notifications Disabled<br/><sup><sub>b72d0026-f649-4c91-a9ea-15d8f681ac09</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/b72d0026-f649-4c91-a9ea-15d8f681ac09" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack">Documentation</a><br/>|
 |VPC FlowLogs Disabled<br/><sup><sub>f83121ea-03da-434f-9277-9cd247ab3047</sub></sup>|<span style="color:#ff7213">Medium</span>|Observability|<a href="../terraform-queries/aws/f83121ea-03da-434f-9277-9cd247ab3047" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc">Documentation</a><br/>|
 |No Stack Policy<br/><sup><sub>2f01fb2d-828a-499d-b98e-b83747305052</sub></sup>|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../terraform-queries/aws/2f01fb2d-828a-499d-b98e-b83747305052" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudformation_stack">Documentation</a><br/>|
@@ -360,11 +360,10 @@ Below are listed queries related to Terraform AWS:
 |DOCDB Cluster Encrypted With AWS Managed Key<br/><sup><sub>2134641d-30a4-4b16-8ffc-2cd4c4ffd15d</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/2134641d-30a4-4b16-8ffc-2cd4c4ffd15d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/docdb_cluster#kms_key_id">Documentation</a><br/>|
 |ECR Repository Not Encrypted With CMK<br/><sup><sub>0e32d561-4b5a-4664-a6e3-a3fa85649157</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/0e32d561-4b5a-4664-a6e3-a3fa85649157" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#encryption_configuration">Documentation</a><br/>|
 |EFS Without KMS<br/><sup><sub>25d251f3-f348-4f95-845c-1090e41a615c</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/25d251f3-f348-4f95-845c-1090e41a615c" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/efs_file_system#kms_key_id">Documentation</a><br/>|
-|Redis Disabled<br/><sup><sub>4bd15dd9-8d5e-4008-8532-27eb0c3706d3</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#engine">Documentation</a><br/>|
-|Unscanned ECR Image<br/><sup><sub>9630336b-3fed-4096-8173-b9afdfe346a7</sub></sup>|<span style="color:#edd57e">Low</span>|Encryption|<a href="../terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#scan_on_push">Documentation</a><br/>|
 |AWS Password Policy With Unchangeable Passwords<br/><sup><sub>9ef7d25d-9764-4224-9968-fa321c56ef76</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/9ef7d25d-9764-4224-9968-fa321c56ef76" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_account_password_policy">Documentation</a><br/>|
 |IAM User Policy Without MFA<br/><sup><sub>b5681959-6c09-4f55-b42b-c40fa12d03ec</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/b5681959-6c09-4f55-b42b-c40fa12d03ec" target="_blank">Query details</a><br><a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_configure-api-require.html">Documentation</a><br/>|
 |Instance With No VPC<br/><sup><sub>a31a5a29-718a-4ff4-8001-a69e5e4d029e</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/a31a5a29-718a-4ff4-8001-a69e5e4d029e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/instance">Documentation</a><br/>|
+|Redis Disabled<br/><sup><sub>4bd15dd9-8d5e-4008-8532-27eb0c3706d3</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticache_cluster#engine">Documentation</a><br/>|
 |Redshift Cluster Without VPC<br/><sup><sub>0a494a6a-ebe2-48a0-9d77-cf9d5125e1b3</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/0a494a6a-ebe2-48a0-9d77-cf9d5125e1b3" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/redshift_cluster#vpc_security_group_ids">Documentation</a><br/>|
 |S3 Bucket Without Enabled MFA Delete<br/><sup><sub>c5b31ab9-0f26-4a49-b8aa-4cc064392f4d</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/aws/c5b31ab9-0f26-4a49-b8aa-4cc064392f4d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket#mfa_delete">Documentation</a><br/>|
 |Dynamodb VPC Endpoint Without Route Table Association<br/><sup><sub>0bc534c5-13d1-4353-a7fe-b8665d5c1d7d</sub></sup>|<span style="color:#edd57e">Low</span>|Networking and Firewall|<a href="../terraform-queries/aws/0bc534c5-13d1-4353-a7fe-b8665d5c1d7d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_endpoint#vpc_id">Documentation</a><br/>|
@@ -393,6 +392,7 @@ Below are listed queries related to Terraform AWS:
 |ElasticSearch Without Slow Logs<br/><sup><sub>e979fcbc-df6c-422d-9458-c33d65e71c45</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/e979fcbc-df6c-422d-9458-c33d65e71c45" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/elasticsearch_domain#log_publishing_options">Documentation</a><br/>|
 |KMS Key With No Deletion Window<br/><sup><sub>0b530315-0ea4-497f-b34c-4ff86268f59d</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/0b530315-0ea4-497f-b34c-4ff86268f59d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key">Documentation</a><br/>|
 |Lambda Functions Without X-Ray Tracing<br/><sup><sub>8152e0cf-d2f0-47ad-96d5-d003a76eabd1</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/8152e0cf-d2f0-47ad-96d5-d003a76eabd1" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function#tracing_config">Documentation</a><br/>|
+|Unscanned ECR Image<br/><sup><sub>9630336b-3fed-4096-8173-b9afdfe346a7</sub></sup>|<span style="color:#edd57e">Low</span>|Observability|<a href="../terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ecr_repository#scan_on_push">Documentation</a><br/>|
 |API Gateway Stage Without API Gateway UsagePlan Associated<br/><sup><sub>c999cf62-0920-40f8-8dda-0caccd66ed7e</sub></sup>|<span style="color:#edd57e">Low</span>|Resource Management|<a href="../terraform-queries/aws/c999cf62-0920-40f8-8dda-0caccd66ed7e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/api_gateway_stage">Documentation</a><br/>|
 |Security Group Not Used<br/><sup><sub>4849211b-ac39-479e-ae78-5694d506cb24</sub></sup>|<span style="color:#5bc0de">Info</span>|Access Control|<a href="../terraform-queries/aws/4849211b-ac39-479e-ae78-5694d506cb24" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group">Documentation</a><br/>|
 |DynamoDB Table Point In Time Recovery Disabled<br/><sup><sub>741f1291-47ac-4a85-a07b-3d32a9d6bd3e</sub></sup>|<span style="color:#5bc0de">Info</span>|Best Practices|<a href="../terraform-queries/aws/741f1291-47ac-4a85-a07b-3d32a9d6bd3e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/dynamodb_table#point_in_time_recovery">Documentation</a><br/>|
@@ -594,8 +594,8 @@ Below are listed queries related to Terraform GCP:
 |Service Account with Improper Privileges<br/><sup><sub>cefdad16-0dd5-4ac5-8ed2-a37502c78672</sub></sup>|<span style="color:#ff7213">Medium</span>|Resource Management|<a href="../terraform-queries/gcp/cefdad16-0dd5-4ac5-8ed2-a37502c78672" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |High Google KMS Crypto Key Rotation Period<br/><sup><sub>d8c57c4e-bf6f-4e32-a2bf-8643532de77b</sub></sup>|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../terraform-queries/gcp/d8c57c4e-bf6f-4e32-a2bf-8643532de77b" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/kms_crypto_key">Documentation</a><br/>|
 |Project-wide SSH Keys Are Enabled In VM Instances<br/><sup><sub>3e4d5ce6-3280-4027-8010-c26eeea1ec01</sub></sup>|<span style="color:#ff7213">Medium</span>|Secret Management|<a href="../terraform-queries/gcp/3e4d5ce6-3280-4027-8010-c26eeea1ec01" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance">Documentation</a><br/>|
+|User with IAM Role<br/><sup><sub>704fcc44-a58f-4af5-82e2-93f2a58ef918</sub></sup>|<span style="color:#edd57e">Low</span>|Access Control|<a href="../terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |Outdated GKE Version<br/><sup><sub>128df7ec-f185-48bc-8913-ce756a3ccb85</sub></sup>|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../terraform-queries/gcp/128df7ec-f185-48bc-8913-ce756a3ccb85" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster#master_version">Documentation</a><br/>|
-|User with IAM Role<br/><sup><sub>704fcc44-a58f-4af5-82e2-93f2a58ef918</sub></sup>|<span style="color:#edd57e">Low</span>|Best Practices|<a href="../terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/iam_policy#role">Documentation</a><br/>|
 |Cluster Labels Disabled<br/><sup><sub>65c1bc7a-4835-4ac4-a2b6-13d310b0648d</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/65c1bc7a-4835-4ac4-a2b6-13d310b0648d" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster">Documentation</a><br/>|
 |COS Node Image Not Used<br/><sup><sub>8a893e46-e267-485a-8690-51f39951de58</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/8a893e46-e267-485a-8690-51f39951de58" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_node_pool#node_config">Documentation</a><br/>|
 |Legacy Client Certificate Auth Enabled<br/><sup><sub>73fb21a1-b19a-45b1-b648-b47b1678681e</sub></sup>|<span style="color:#edd57e">Low</span>|Insecure Configurations|<a href="../terraform-queries/gcp/73fb21a1-b19a-45b1-b648-b47b1678681e" target="_blank">Query details</a><br><a href="https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/container_cluster">Documentation</a><br/>|
diff --git a/docs/queries/terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3.md b/docs/queries/terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3.md
index a8ff89f6b95..e1a7da4bb4a 100644
--- a/docs/queries/terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3.md
+++ b/docs/queries/terraform-queries/aws/4bd15dd9-8d5e-4008-8532-27eb0c3706d3.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Redis Disabled
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#edd57e">Low</span>
--   **Category:** Encryption
+-   **Category:** Insecure Configurations
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/aws/redis_disabled)
 
 ### Description
diff --git a/docs/queries/terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c.md b/docs/queries/terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c.md
index 4fb0609ca4d..0395fe1d4ce 100644
--- a/docs/queries/terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c.md
+++ b/docs/queries/terraform-queries/aws/568a4d22-3517-44a6-a7ad-6a7eed88722c.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** S3 Bucket Without Versioning
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Observability
+-   **Category:** Backup
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/aws/s3_bucket_without_versioning)
 
 ### Description
diff --git a/docs/queries/terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7.md b/docs/queries/terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7.md
index 820f5618894..7256b4c85ae 100644
--- a/docs/queries/terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7.md
+++ b/docs/queries/terraform-queries/aws/9630336b-3fed-4096-8173-b9afdfe346a7.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Unscanned ECR Image
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#edd57e">Low</span>
--   **Category:** Encryption
+-   **Category:** Observability
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/aws/unscanned_ecr_image)
 
 ### Description
diff --git a/docs/queries/terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13.md b/docs/queries/terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13.md
index 12880b74dd5..7eddf7014f8 100644
--- a/docs/queries/terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13.md
+++ b/docs/queries/terraform-queries/aws/96ed3526-0179-4c73-b1b2-372fde2e0d13.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** Default VPC Exists
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Observability
+-   **Category:** Insecure Defaults
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/aws/default_vpc_exists)
 
 ### Description
diff --git a/docs/queries/terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02.md b/docs/queries/terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02.md
index 21f4fb53847..8b55e857e99 100644
--- a/docs/queries/terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02.md
+++ b/docs/queries/terraform-queries/aws/e542bd46-58c4-4e0f-a52a-1fb4f9548e02.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** RDS Cluster With Backup Disabled
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#ff7213">Medium</span>
--   **Category:** Best Practices
+-   **Category:** Backup
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/aws/rds_cluster_with_backup_disabled)
 
 ### Description
diff --git a/docs/queries/terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918.md b/docs/queries/terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918.md
index 61800770990..c1a99168259 100644
--- a/docs/queries/terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918.md
+++ b/docs/queries/terraform-queries/gcp/704fcc44-a58f-4af5-82e2-93f2a58ef918.md
@@ -19,7 +19,7 @@ hide:
 -   **Query name:** User with IAM Role
 -   **Platform:** Terraform
 -   **Severity:** <span style="color:#edd57e">Low</span>
--   **Category:** Best Practices
+-   **Category:** Access Control
 -   **URL:** [Github](https://github.com/Checkmarx/kics/tree/master/assets/queries/terraform/gcp/user_with_iam_role)
 
 ### Description