diff --git a/config.py b/config.py
index e19f7a79..d770019c 100644
--- a/config.py
+++ b/config.py
@@ -62,7 +62,7 @@ UPPER_WORDS = {
         "api", "cm", "ccm", "crb", "crd", "ds", "etcd", "hpa", "k8s", "ns", "psp", "pv", "pvc", "rb", "rs",
         "sa", "sc", "sts", "svc",
     ),
-    "oci": ("oci",),
+    "oci": ("oci", "oke", "ocir"),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
 }
@@ -360,8 +360,14 @@ ALIASES = {
             "VmWhite": "VirtualMachineWhite",
             "Bm": "BareMetal",
             "BmWhite": "BareMetalWhite",
+            "OCIR": "OCIRegistry",
+            "OCIRWhite": "OCIRegistryWhite",
+            "OKE": "ContainerEngine",
+            "OKEWhite": "ContainerEngineWhite",
         },
         "database": {
+            "AutonomousDatabase": "ADB",
+            "AutonomousDatabaseWhite": "ADBWhite",
             "Databaseservice": "DBService",
             "DatabaseserviceWhite": "DBServiceWhite",
         }
diff --git a/diagrams/oci/compute.py b/diagrams/oci/compute.py
index 315adefa..57733f0e 100644
--- a/diagrams/oci/compute.py
+++ b/diagrams/oci/compute.py
@@ -8,6 +8,14 @@ class _Compute(_OCI):
     _icon_dir = "resources/oci/compute"
 
 
+class AutoScaleWhite(_Compute):
+    _icon = "autoscale-white.png"
+
+
+class AutoScale(_Compute):
+    _icon = "autoscale.png"
+
+
 class BmWhite(_Compute):
     _icon = "bm-white.png"
 
@@ -24,6 +32,38 @@ class Container(_Compute):
     _icon = "container.png"
 
 
+class FunctionsWhite(_Compute):
+    _icon = "functions-white.png"
+
+
+class Functions(_Compute):
+    _icon = "functions.png"
+
+
+class InstancePoolsWhite(_Compute):
+    _icon = "instancepools.png"
+
+
+class InstancePools(_Compute):
+    _icon = "instancepools.png"
+
+
+class OCIRWhite(_Compute):
+    _icon = "ociregistry-white.png"
+
+
+class OCIR(_Compute):
+    _icon = "ociregistry.png"
+
+
+class OKEWhite(_Compute):
+    _icon = "containerengine-white.png"
+
+
+class OKE(_Compute):
+    _icon = "containerengine.png"
+
+
 class VmWhite(_Compute):
     _icon = "vm-white.png"
 
diff --git a/diagrams/oci/database.py b/diagrams/oci/database.py
index d0131c6c..fe99663b 100644
--- a/diagrams/oci/database.py
+++ b/diagrams/oci/database.py
@@ -8,6 +8,14 @@ class _Database(_OCI):
     _icon_dir = "resources/oci/database"
 
 
+class AutonomousDatabaseWhite(_Database):
+    _icon = "autonomous-white.png"
+
+
+class AutonomousDatabase(_Database):
+    _icon = "autonomous.png"
+
+
 class DatabaseserviceWhite(_Database):
     _icon = "databaseservice-white.png"
 
@@ -18,5 +26,7 @@ class Databaseservice(_Database):
 
 # Aliases
 
+ADB = AutonomousDatabase
+ADBWhite = AutonomousDatabaseWhite
 DBService = Databaseservice
 DBServiceWhite = DatabaseserviceWhite
diff --git a/diagrams/oci/devops.py b/diagrams/oci/devops.py
index e6940cb7..0af5715e 100644
--- a/diagrams/oci/devops.py
+++ b/diagrams/oci/devops.py
@@ -8,6 +8,14 @@ class _Devops(_OCI):
     _icon_dir = "resources/oci/devops"
 
 
+class ApigatewayWhite(_Devops):
+    _icon = "apigateway-white.png"
+
+
+class Apigateway(_Devops):
+    _icon = "apigateway.png"
+
+
 class ApiserviceWhite(_Devops):
     _icon = "apiservice-white.png"
 
diff --git a/diagrams/oci/network.py b/diagrams/oci/network.py
index a145af51..f48b169b 100644
--- a/diagrams/oci/network.py
+++ b/diagrams/oci/network.py
@@ -40,6 +40,14 @@ class Loadbalance(_Network):
     _icon = "loadbalance.png"
 
 
+class NATgatewayWhite(_Network):
+    _icon = "natgateway-white.png"
+
+
+class NATgateway(_Network):
+    _icon = "natgateway.png"
+
+
 class RoutetableWhite(_Network):
     _icon = "routetable-white.png"
 
diff --git a/diagrams/oci/security.py b/diagrams/oci/security.py
index 41d0c730..efe15718 100644
--- a/diagrams/oci/security.py
+++ b/diagrams/oci/security.py
@@ -16,6 +16,14 @@ class Audit(_Security):
     _icon = "audit.png"
 
 
+class CloudGuardWhite(_Security):
+    _icon = "cloudguard-white.png"
+
+
+class CloudGuard(_Security):
+    _icon = "cloudguard.png"
+
+
 class CompartmentsWhite(_Security):
     _icon = "compartments-white.png"
 
@@ -88,4 +96,12 @@ class Tagging(_Security):
     _icon = "tagging.png"
 
 
+class VaultWhite(_Security):
+    _icon = "vault-white.png"
+
+
+class Vault(_Security):
+    _icon = "vault.png"
+
+
 # Aliases
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index 1e6a0f01..f752cf82 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -7,10 +7,20 @@ Node classes list of oci provider.
 
 ## oci.compute
 
+- **diagrams.oci.compute.AutoScaleWhite**
+- **diagrams.oci.compute.AutoScale**
 - **diagrams.oci.compute.BmWhite**, **BareMetalWhite** (alias)
 - **diagrams.oci.compute.Bm**, **BareMetal** (alias)
 - **diagrams.oci.compute.ContainerWhite**
 - **diagrams.oci.compute.Container**
+- **diagrams.oci.compute.FunctionsWhite**
+- **diagrams.oci.compute.Functions**
+- **diagrams.oci.compute.InstancePoolsWhite**
+- **diagrams.oci.compute.InstancePools**
+- **diagrams.oci.compute.OCIRWhite**, **OCIRegistryWhite** (alias)
+- **diagrams.oci.compute.OCIR**, **OCIRegistry** (alias)
+- **diagrams.oci.compute.OKEWhite**, **ContainerEngineWhite** (aliass)
+- **diagrams.oci.compute.OKE**, **ContainerEngine** (alias)
 - **diagrams.oci.compute.VmWhite**, **VirtualMachineWhite** (alias)
 - **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
 
@@ -29,11 +39,15 @@ Node classes list of oci provider.
 
 ## oci.database
 
+- **diagrams.oci.database.AutonomousDatabaseWhite**, **ADBWhite** (alias)
+- **diagrams.oci.database.AutonomousDatabase**, **ADB** (alias)
 - **diagrams.oci.database.DatabaseserviceWhite**, **DBServiceWhite** (alias)
 - **diagrams.oci.database.Databaseservice**, **DBService** (alias)
 
 ## oci.devops
 
+- **diagrams.oci.devops.ApigatewayWhite**
+- **diagrams.oci.devops.Apigateway**
 - **diagrams.oci.devops.ApiserviceWhite**
 - **diagrams.oci.devops.Apiservice**
 - **diagrams.oci.devops.ResourcemgmtWhite**
@@ -83,6 +97,8 @@ Node classes list of oci provider.
 - **diagrams.oci.network.Internetgateway**
 - **diagrams.oci.network.LoadbalanceWhite**
 - **diagrams.oci.network.Loadbalance**
+- **diagrams.oci.network.NATgatewayWhite**
+- **diagrams.oci.network.NATgateway**
 - **diagrams.oci.network.RoutetableWhite**
 - **diagrams.oci.network.Routetable**
 - **diagrams.oci.network.SecuritylistsWhite**
@@ -98,6 +114,8 @@ Node classes list of oci provider.
 - **diagrams.oci.security.Audit**
 - **diagrams.oci.security.CompartmentsWhite**
 - **diagrams.oci.security.Compartments**
+- **diagrams.oci.security.CloudGuardWhite**
+- **diagrams.oci.security.CloudGuard**
 - **diagrams.oci.security.DdosWhite**
 - **diagrams.oci.security.Ddos**
 - **diagrams.oci.security.EncryptionWhite**
@@ -114,6 +132,8 @@ Node classes list of oci provider.
 - **diagrams.oci.security.Policies**
 - **diagrams.oci.security.TaggingWhite**
 - **diagrams.oci.security.Tagging**
+- **diagrams.oci.security.VaultWhite**
+- **diagrams.oci.security.Vault**
 
 ## oci.storage
 
diff --git a/resources/oci/compute/autonomous-white.png b/resources/oci/compute/autonomous-white.png
new file mode 100755
index 00000000..6f5180a7
Binary files /dev/null and b/resources/oci/compute/autonomous-white.png differ
diff --git a/resources/oci/compute/autonomous.png b/resources/oci/compute/autonomous.png
new file mode 100755
index 00000000..005dda77
Binary files /dev/null and b/resources/oci/compute/autonomous.png differ
diff --git a/resources/oci/compute/autoscale-white.png b/resources/oci/compute/autoscale-white.png
new file mode 100755
index 00000000..3cbbbd76
Binary files /dev/null and b/resources/oci/compute/autoscale-white.png differ
diff --git a/resources/oci/compute/autoscale.png b/resources/oci/compute/autoscale.png
new file mode 100755
index 00000000..8b17924a
Binary files /dev/null and b/resources/oci/compute/autoscale.png differ
diff --git a/resources/oci/compute/containerengine-white.png b/resources/oci/compute/containerengine-white.png
new file mode 100755
index 00000000..2a900dea
Binary files /dev/null and b/resources/oci/compute/containerengine-white.png differ
diff --git a/resources/oci/compute/containerengine.png b/resources/oci/compute/containerengine.png
new file mode 100755
index 00000000..313cdae4
Binary files /dev/null and b/resources/oci/compute/containerengine.png differ
diff --git a/resources/oci/compute/functions-white.png b/resources/oci/compute/functions-white.png
new file mode 100755
index 00000000..3d7c40ac
Binary files /dev/null and b/resources/oci/compute/functions-white.png differ
diff --git a/resources/oci/compute/functions.png b/resources/oci/compute/functions.png
new file mode 100755
index 00000000..048be8fb
Binary files /dev/null and b/resources/oci/compute/functions.png differ
diff --git a/resources/oci/compute/instancepools-white.png b/resources/oci/compute/instancepools-white.png
new file mode 100755
index 00000000..8846da28
Binary files /dev/null and b/resources/oci/compute/instancepools-white.png differ
diff --git a/resources/oci/compute/instancepools.png b/resources/oci/compute/instancepools.png
new file mode 100755
index 00000000..b9f15214
Binary files /dev/null and b/resources/oci/compute/instancepools.png differ
diff --git a/resources/oci/compute/natgateway-white.png b/resources/oci/compute/natgateway-white.png
new file mode 100755
index 00000000..12a1307b
Binary files /dev/null and b/resources/oci/compute/natgateway-white.png differ
diff --git a/resources/oci/compute/natgateway.png b/resources/oci/compute/natgateway.png
new file mode 100755
index 00000000..8491a82a
Binary files /dev/null and b/resources/oci/compute/natgateway.png differ
diff --git a/resources/oci/compute/ociregistry-white.png b/resources/oci/compute/ociregistry-white.png
new file mode 100755
index 00000000..502c9834
Binary files /dev/null and b/resources/oci/compute/ociregistry-white.png differ
diff --git a/resources/oci/compute/ociregistry.png b/resources/oci/compute/ociregistry.png
new file mode 100755
index 00000000..c86b7534
Binary files /dev/null and b/resources/oci/compute/ociregistry.png differ
diff --git a/resources/oci/devops/apigateway-white.png b/resources/oci/devops/apigateway-white.png
new file mode 100755
index 00000000..8cbb2a91
Binary files /dev/null and b/resources/oci/devops/apigateway-white.png differ
diff --git a/resources/oci/devops/apigateway.png b/resources/oci/devops/apigateway.png
new file mode 100755
index 00000000..d68b2d2f
Binary files /dev/null and b/resources/oci/devops/apigateway.png differ
diff --git a/resources/oci/security/cloudguard-white.png b/resources/oci/security/cloudguard-white.png
new file mode 100755
index 00000000..39450a4f
Binary files /dev/null and b/resources/oci/security/cloudguard-white.png differ
diff --git a/resources/oci/security/cloudguard.png b/resources/oci/security/cloudguard.png
new file mode 100755
index 00000000..8448f8cf
Binary files /dev/null and b/resources/oci/security/cloudguard.png differ
diff --git a/resources/oci/security/vault-white.png b/resources/oci/security/vault-white.png
new file mode 100755
index 00000000..1f723930
Binary files /dev/null and b/resources/oci/security/vault-white.png differ
diff --git a/resources/oci/security/vault.png b/resources/oci/security/vault.png
new file mode 100755
index 00000000..7b898512
Binary files /dev/null and b/resources/oci/security/vault.png differ