diff --git a/config.py b/config.py
index 6a78051..ddbe7ea 100644
--- a/config.py
+++ b/config.py
@@ -139,6 +139,10 @@ ALIASES = {
         "iot": {
             "Freertos": "FreeRTOS",
         },
+        "management": {
+            "SystemsManager": "SSM",
+            "SystemsManagerParameterStore": "ParameterStore",
+        },
         "migration": {
             "ApplicationDiscoveryService": "ADS",
             "CloudendureMigration": "CEM",
diff --git a/diagrams/aws/management.py b/diagrams/aws/management.py
new file mode 100644
index 0000000..8fa4451
--- /dev/null
+++ b/diagrams/aws/management.py
@@ -0,0 +1,86 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Management(_AWS):
+    _type = "management"
+    _icon_dir = "resources/aws/management"
+
+
+class AutoScaling(_Management):
+    _icon = "auto-scaling.png"
+
+
+class Cloudformation(_Management):
+    _icon = "cloudformation.png"
+
+
+class Cloudtrail(_Management):
+    _icon = "cloudtrail.png"
+
+
+class Cloudwatch(_Management):
+    _icon = "cloudwatch.png"
+
+
+class Codeguru(_Management):
+    _icon = "codeguru.png"
+
+
+class CommandLineInterface(_Management):
+    _icon = "command-line-interface.png"
+
+
+class Config(_Management):
+    _icon = "config.png"
+
+
+class ControlTower(_Management):
+    _icon = "control-tower.png"
+
+
+class LicenseManager(_Management):
+    _icon = "license-manager.png"
+
+
+class ManagedServices(_Management):
+    _icon = "managed-services.png"
+
+
+class ManagementConsole(_Management):
+    _icon = "management-console.png"
+
+
+class Opsworks(_Management):
+    _icon = "opsworks.png"
+
+
+class Organizations(_Management):
+    _icon = "organizations.png"
+
+
+class ServiceCatalog(_Management):
+    _icon = "service-catalog.png"
+
+
+class SystemsManagerParameterStore(_Management):
+    _icon = "systems-manager-parameter-store.png"
+
+
+class SystemsManager(_Management):
+    _icon = "systems-manager.png"
+
+
+class TrustedAdvisor(_Management):
+    _icon = "trusted-advisor.png"
+
+
+class WellArchitectedTool(_Management):
+    _icon = "well-architected-tool.png"
+
+
+# Aliases
+
+SSM = SystemsManager
+ParameterStore = SystemsManagerParameterStore
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index b9cca29..148a61e 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -70,6 +70,27 @@ Node classes list of aws provider.
 - **diagrams.aws.network.TransitGateway**
 - **diagrams.aws.network.VPC**
 
+## aws.management
+
+- **diagrams.aws.management.AutoScaling**
+- **diagrams.aws.management.Cloudformation**
+- **diagrams.aws.management.Cloudtrail**
+- **diagrams.aws.management.Cloudwatch**
+- **diagrams.aws.management.Codeguru**
+- **diagrams.aws.management.CommandLineInterface**
+- **diagrams.aws.management.Config**
+- **diagrams.aws.management.ControlTower**
+- **diagrams.aws.management.LicenseManager**
+- **diagrams.aws.management.ManagedServices**
+- **diagrams.aws.management.ManagementConsole**
+- **diagrams.aws.management.Opsworks**
+- **diagrams.aws.management.Organizations**
+- **diagrams.aws.management.ServiceCatalog**
+- **diagrams.aws.management.SystemsManagerParameterStore**, **ParameterStore** (alias)
+- **diagrams.aws.management.SystemsManager**, **SSM** (alias)
+- **diagrams.aws.management.TrustedAdvisor**
+- **diagrams.aws.management.WellArchitectedTool**
+
 ## aws.storage
 
 - **diagrams.aws.storage.Backup**
diff --git a/resources/aws/management/auto-scaling.png b/resources/aws/management/auto-scaling.png
new file mode 100644
index 0000000..c4929d7
Binary files /dev/null and b/resources/aws/management/auto-scaling.png differ
diff --git a/resources/aws/management/cloudformation.png b/resources/aws/management/cloudformation.png
new file mode 100644
index 0000000..ddaa5d1
Binary files /dev/null and b/resources/aws/management/cloudformation.png differ
diff --git a/resources/aws/management/cloudtrail.png b/resources/aws/management/cloudtrail.png
new file mode 100644
index 0000000..a20301f
Binary files /dev/null and b/resources/aws/management/cloudtrail.png differ
diff --git a/resources/aws/management/cloudwatch.png b/resources/aws/management/cloudwatch.png
new file mode 100644
index 0000000..8c5f04e
Binary files /dev/null and b/resources/aws/management/cloudwatch.png differ
diff --git a/resources/aws/management/codeguru.png b/resources/aws/management/codeguru.png
new file mode 100755
index 0000000..3464ae1
Binary files /dev/null and b/resources/aws/management/codeguru.png differ
diff --git a/resources/aws/management/command-line-interface.png b/resources/aws/management/command-line-interface.png
new file mode 100644
index 0000000..3dc0147
Binary files /dev/null and b/resources/aws/management/command-line-interface.png differ
diff --git a/resources/aws/management/config.png b/resources/aws/management/config.png
new file mode 100644
index 0000000..1e34a86
Binary files /dev/null and b/resources/aws/management/config.png differ
diff --git a/resources/aws/management/control-tower.png b/resources/aws/management/control-tower.png
new file mode 100644
index 0000000..4c68956
Binary files /dev/null and b/resources/aws/management/control-tower.png differ
diff --git a/resources/aws/management/license-manager.png b/resources/aws/management/license-manager.png
new file mode 100644
index 0000000..6f404bb
Binary files /dev/null and b/resources/aws/management/license-manager.png differ
diff --git a/resources/aws/management/managed-services.png b/resources/aws/management/managed-services.png
new file mode 100644
index 0000000..88a18b6
Binary files /dev/null and b/resources/aws/management/managed-services.png differ
diff --git a/resources/aws/management/management-console.png b/resources/aws/management/management-console.png
new file mode 100644
index 0000000..06b2d62
Binary files /dev/null and b/resources/aws/management/management-console.png differ
diff --git a/resources/aws/management/opsworks.png b/resources/aws/management/opsworks.png
new file mode 100644
index 0000000..f6273b1
Binary files /dev/null and b/resources/aws/management/opsworks.png differ
diff --git a/resources/aws/management/organizations.png b/resources/aws/management/organizations.png
new file mode 100644
index 0000000..850dca0
Binary files /dev/null and b/resources/aws/management/organizations.png differ
diff --git a/resources/aws/management/service-catalog.png b/resources/aws/management/service-catalog.png
new file mode 100644
index 0000000..6a2bf15
Binary files /dev/null and b/resources/aws/management/service-catalog.png differ
diff --git a/resources/aws/management/systems-manager-parameter-store.png b/resources/aws/management/systems-manager-parameter-store.png
new file mode 100644
index 0000000..f673e10
Binary files /dev/null and b/resources/aws/management/systems-manager-parameter-store.png differ
diff --git a/resources/aws/management/systems-manager.png b/resources/aws/management/systems-manager.png
new file mode 100644
index 0000000..43de1cc
Binary files /dev/null and b/resources/aws/management/systems-manager.png differ
diff --git a/resources/aws/management/trusted-advisor.png b/resources/aws/management/trusted-advisor.png
new file mode 100644
index 0000000..c56a08b
Binary files /dev/null and b/resources/aws/management/trusted-advisor.png differ
diff --git a/resources/aws/management/well-architected-tool.png b/resources/aws/management/well-architected-tool.png
new file mode 100644
index 0000000..aaf7d48
Binary files /dev/null and b/resources/aws/management/well-architected-tool.png differ