diff --git a/diagrams/aws/analytics.py b/diagrams/aws/analytics.py
index 883dda91..2b789c4b 100644
--- a/diagrams/aws/analytics.py
+++ b/diagrams/aws/analytics.py
@@ -8,6 +8,10 @@ class _Analytics(_AWS):
     _icon_dir = "resources/aws/analytics"
 
 
+class AmazonOpensearchService(_Analytics):
+    _icon = "amazon-opensearch-service.png"
+
+
 class Analytics(_Analytics):
     _icon = "analytics.png"
 
@@ -104,10 +108,6 @@ class ManagedStreamingForKafka(_Analytics):
     _icon = "managed-streaming-for-kafka.png"
 
 
-class Opensearch(_Analytics):
-    _icon = "opensearch.png"
-
-
 class Quicksight(_Analytics):
     _icon = "quicksight.png"
 
diff --git a/diagrams/aws/management.py b/diagrams/aws/management.py
index 641ab241..730a68cd 100644
--- a/diagrams/aws/management.py
+++ b/diagrams/aws/management.py
@@ -8,6 +8,10 @@ class _Management(_AWS):
     _icon_dir = "resources/aws/management"
 
 
+class AmazonDevopsGuru(_Management):
+    _icon = "amazon-devops-guru.png"
+
+
 class AmazonManagedGrafana(_Management):
     _icon = "amazon-managed-grafana.png"
 
@@ -84,10 +88,6 @@ class ControlTower(_Management):
     _icon = "control-tower.png"
 
 
-class DevopsGuru(_Management):
-    _icon = "devops-guru.png"
-
-
 class LicenseManager(_Management):
     _icon = "license-manager.png"
 
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index c073599d..cf9e2cf6 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -8,6 +8,9 @@ Node classes list of the aws provider.
 ## aws.analytics
 
 
+<img width="30" src="/img/resources/aws/analytics/amazon-opensearch-service.png" alt="AmazonOpensearchService" style="float: left; padding-right: 5px;" >
+**diagrams.aws.analytics.AmazonOpensearchService**
+
 <img width="30" src="/img/resources/aws/analytics/analytics.png" alt="Analytics" style="float: left; padding-right: 5px;" >
 **diagrams.aws.analytics.Analytics**
 
@@ -80,9 +83,6 @@ Node classes list of the aws provider.
 <img width="30" src="/img/resources/aws/analytics/managed-streaming-for-kafka.png" alt="ManagedStreamingForKafka" style="float: left; padding-right: 5px;" >
 **diagrams.aws.analytics.ManagedStreamingForKafka**
 
-<img width="30" src="/img/resources/aws/analytics/opensearch.png" alt="Opensearch" style="float: left; padding-right: 5px;" >
-**diagrams.aws.analytics.Opensearch**
-
 <img width="30" src="/img/resources/aws/analytics/quicksight.png" alt="Quicksight" style="float: left; padding-right: 5px;" >
 **diagrams.aws.analytics.Quicksight**
 
@@ -806,6 +806,9 @@ Node classes list of the aws provider.
 ## aws.management
 
 
+<img width="30" src="/img/resources/aws/management/amazon-devops-guru.png" alt="AmazonDevopsGuru" style="float: left; padding-right: 5px;" >
+**diagrams.aws.management.AmazonDevopsGuru**
+
 <img width="30" src="/img/resources/aws/management/amazon-managed-grafana.png" alt="AmazonManagedGrafana" style="float: left; padding-right: 5px;" >
 **diagrams.aws.management.AmazonManagedGrafana**
 
@@ -863,9 +866,6 @@ Node classes list of the aws provider.
 <img width="30" src="/img/resources/aws/management/control-tower.png" alt="ControlTower" style="float: left; padding-right: 5px;" >
 **diagrams.aws.management.ControlTower**
 
-<img width="30" src="/img/resources/aws/management/devops-guru.png" alt="DevopsGuru" style="float: left; padding-right: 5px;" >
-**diagrams.aws.management.DevopsGuru**
-
 <img width="30" src="/img/resources/aws/management/license-manager.png" alt="LicenseManager" style="float: left; padding-right: 5px;" >
 **diagrams.aws.management.LicenseManager**
 
diff --git a/resources/aws/analytics/opensearch.png b/resources/aws/analytics/amazon-opensearch-service.png
similarity index 100%
rename from resources/aws/analytics/opensearch.png
rename to resources/aws/analytics/amazon-opensearch-service.png
diff --git a/resources/aws/management/devops-guru.png b/resources/aws/management/amazon-devops-guru.png
similarity index 100%
rename from resources/aws/management/devops-guru.png
rename to resources/aws/management/amazon-devops-guru.png
diff --git a/website/static/img/resources/aws/analytics/amazon-opensearch-service.png b/website/static/img/resources/aws/analytics/amazon-opensearch-service.png
new file mode 100644
index 00000000..e1d5a6a7
Binary files /dev/null and b/website/static/img/resources/aws/analytics/amazon-opensearch-service.png differ
diff --git a/website/static/img/resources/aws/management/amazon-devops-guru.png b/website/static/img/resources/aws/management/amazon-devops-guru.png
new file mode 100644
index 00000000..f9129c19
Binary files /dev/null and b/website/static/img/resources/aws/management/amazon-devops-guru.png differ