diff --git a/config.py b/config.py
index 313277aac..c9b418f26 100644
--- a/config.py
+++ b/config.py
@@ -47,7 +47,7 @@
 TMPL_MODULE = "module.tmpl"
 
 UPPER_WORDS = {
-    "aws": ("aws", "api", "ebs", "ec2", "efs", "emr", "rds", "ml", "mq", "vpc", "waf"),
+    "aws": ("aws", "api", "ebs", "ec2", "efs", "emr", "rds", "ml", "mq", "nat", "vpc", "waf"),
     "azure": ("ad", "b2c", "ai", "api", "cdn", "ddos", "dns", "fxt", "hana", "hd", "id", "sap", "sql", "vm"),
     "gcp": ("gcp", "ai", "api", "cdn", "dns", "gke", "gpu", "ml", "nat", "os", "sdk", "sql", "tpu", "vpn"),
     "k8s": (
diff --git a/diagrams/aws/network.py b/diagrams/aws/network.py
index be9cd6e0e..b3963d45f 100644
--- a/diagrams/aws/network.py
+++ b/diagrams/aws/network.py
@@ -40,6 +40,14 @@ class GlobalAccelerator(_Network):
     _icon = "global-accelerator.png"
 
 
+class InternetGateway(_Network):
+    _icon = "internet-gateway.png"
+
+
+class NATGateway(_Network):
+    _icon = "nat-gateway.png"
+
+
 class NetworkingAndContentDelivery(_Network):
     _icon = "networking-and-content-delivery.png"
 
diff --git a/diagrams/onprem/client.py b/diagrams/onprem/client.py
new file mode 100644
index 000000000..722906089
--- /dev/null
+++ b/diagrams/onprem/client.py
@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Client(_OnPrem):
+    _type = "client"
+    _icon_dir = "resources/onprem/client"
+
+
+class Client(_Client):
+    _icon = "client.png"
+
+
+class User(_Client):
+    _icon = "user.png"
+
+
+class Users(_Client):
+    _icon = "users.png"
+
+
+# Aliases
diff --git a/diagrams/onprem/compute.py b/diagrams/onprem/compute.py
index f9e1314aa..0e07cf280 100644
--- a/diagrams/onprem/compute.py
+++ b/diagrams/onprem/compute.py
@@ -8,6 +8,10 @@ class _Compute(_OnPrem):
     _icon_dir = "resources/onprem/compute"
 
 
+class Nomad(_Compute):
+    _icon = "nomad.png"
+
+
 class Server(_Compute):
     _icon = "server.png"
 
diff --git a/diagrams/onprem/network.py b/diagrams/onprem/network.py
index cdea293c2..d92ad97a4 100644
--- a/diagrams/onprem/network.py
+++ b/diagrams/onprem/network.py
@@ -32,6 +32,10 @@ class Haproxy(_Network):
     _icon = "haproxy.png"
 
 
+class Internet(_Network):
+    _icon = "internet.png"
+
+
 class Istio(_Network):
     _icon = "istio.png"
 
diff --git a/diagrams/onprem/security.py b/diagrams/onprem/security.py
new file mode 100644
index 000000000..1af5f7cae
--- /dev/null
+++ b/diagrams/onprem/security.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Security(_OnPrem):
+    _type = "security"
+    _icon_dir = "resources/onprem/security"
+
+
+class Vault(_Security):
+    _icon = "vault.png"
+
+
+# Aliases
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 148a61ea2..a2184250f 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -63,6 +63,8 @@ Node classes list of aws provider.
 - **diagrams.aws.network.DirectConnect**
 - **diagrams.aws.network.ElasticLoadBalancing**, **ELB** (alias)
 - **diagrams.aws.network.GlobalAccelerator**, **GAX** (alias)
+- **diagrams.aws.network.InternetGateway**
+- **diagrams.aws.network.NATGateway**
 - **diagrams.aws.network.NetworkingAndContentDelivery**
 - **diagrams.aws.network.Privatelink**
 - **diagrams.aws.network.Route53**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index b8b42fa4a..43e611e27 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -20,6 +20,10 @@ Node classes list of onprem provider.
 - **diagrams.onprem.database.Oracle**
 - **diagrams.onprem.database.Postgresql**, **PostgreSQL** (alias)
 
+## onprem.security
+
+- **diagrams.onprem.security.Vault**
+
 ## onprem.ci
 
 - **diagrams.onprem.ci.Circleci**, **CircleCI** (alias)
@@ -34,6 +38,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.network.Envoy**
 - **diagrams.onprem.network.Etcd**, **ETCD** (alias)
 - **diagrams.onprem.network.Haproxy**, **HAProxy** (alias)
+- **diagrams.onprem.network.Internet**
 - **diagrams.onprem.network.Istio**
 - **diagrams.onprem.network.Kong**
 - **diagrams.onprem.network.Linkerd**
@@ -61,6 +66,7 @@ Node classes list of onprem provider.
 
 ## onprem.compute
 
+- **diagrams.onprem.compute.Nomad**
 - **diagrams.onprem.compute.Server**
 
 ## onprem.workflow
@@ -88,6 +94,12 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Prometheus**
 - **diagrams.onprem.monitoring.Splunk**
 
+## onprem.client
+
+- **diagrams.onprem.client.Client**
+- **diagrams.onprem.client.User**
+- **diagrams.onprem.client.Users**
+
 ## onprem.logging
 
 - **diagrams.onprem.logging.Fluentd**
diff --git a/resources/aws/network/internet-gateway.png b/resources/aws/network/internet-gateway.png
new file mode 100644
index 000000000..bcaf71a4b
Binary files /dev/null and b/resources/aws/network/internet-gateway.png differ
diff --git a/resources/aws/network/nat-gateway.png b/resources/aws/network/nat-gateway.png
new file mode 100644
index 000000000..a2c6e5926
Binary files /dev/null and b/resources/aws/network/nat-gateway.png differ
diff --git a/resources/onprem/client/client.png b/resources/onprem/client/client.png
new file mode 100644
index 000000000..2d9a8f767
Binary files /dev/null and b/resources/onprem/client/client.png differ
diff --git a/resources/onprem/client/user.png b/resources/onprem/client/user.png
new file mode 100644
index 000000000..fb91f7426
Binary files /dev/null and b/resources/onprem/client/user.png differ
diff --git a/resources/onprem/client/users.png b/resources/onprem/client/users.png
new file mode 100644
index 000000000..5cb409b7a
Binary files /dev/null and b/resources/onprem/client/users.png differ
diff --git a/resources/onprem/compute/nomad.png b/resources/onprem/compute/nomad.png
new file mode 100644
index 000000000..b937933b1
Binary files /dev/null and b/resources/onprem/compute/nomad.png differ
diff --git a/resources/onprem/network/internet.png b/resources/onprem/network/internet.png
new file mode 100644
index 000000000..9c7c20f29
Binary files /dev/null and b/resources/onprem/network/internet.png differ
diff --git a/resources/onprem/security/vault.png b/resources/onprem/security/vault.png
new file mode 100644
index 000000000..cd36e58e7
Binary files /dev/null and b/resources/onprem/security/vault.png differ