diff --git a/data/products/kubedb/databases/etcd.json b/data/products/kubedb/databases/etcd.json
new file mode 100644
index 00000000..6d73d69b
--- /dev/null
+++ b/data/products/kubedb/databases/etcd.json
@@ -0,0 +1,79 @@
+{
+  "name": "Etcd",
+  "id": "etcd",
+  "title": "Run and Manage Etcd on Kubernetes",
+  "hero": "/assets/images/databases/illustrations/kc-bg.png",
+  "summary": "Provision, Upgrade, Scaling, Volume Expansion, Monitor, Backup & Restore, Security for Etcd Clusters in Kubernetes on any Public & Private Cloud",
+  "description": "As the world's enterprises rapidly move to the cloud, and containers are taking over the world of software development, Kubernetes is the platform that lets users seamlessly deploy, scale, run containers, and manage their application life-cycle.  <br />  <br />But, running databases and stateful applications in Kubernetes has always been a challenge. And it is really difficult to **Run and Manage Production-Grade Databases on Kubernetes**. Every Enterprise needs a Production-Grade operator to deploy its databases and manage its life cycle on Kubernetes. <br />   <br />KubeDB is the leader in Kubernetes Native Database Management Solutions which simplifies and automates routine database tasks such as **Provisioning, Monitoring, Upgrading, Patching, Scaling, Volume Expansion, Backup & Restore, Failure detection, and Recovery** for various popular databases on private and public clouds. KubeDB developed the first-ever Production-Grade **Kubernetes operator for Etcd** to manage its Day-2 operations. KubeDB is a managed DBaaS that allows developers to run their databases alongside the respective application. You can simply deploy an Etcd cluster on Kubernetes and manage its Day-2 operations via KubeDB Etcd Operator.",
+  "keywords": [
+    "Provision",
+    "Failure Detection",
+    "Upgrade",
+    "Scaling",
+    "Volume Expansion",
+    "Backup & Recovery",
+    "Monitor",
+    "Data Protection for Etcd Clusters in Kubernetes on Public and Private Cloud"
+  ],
+  "features": [
+    {
+      "title": "Provisioning",
+      "image": "/assets/images/databases/illustrations/provisioning.png",
+      "description": "If you can run Kubernetes, you can simply provision Etcd clusters using KubeDB. You don't need to worry about all of the knowledge of Kubernetes Concept, Helm, and Etcd server side setup. KubeDB simplifies the whole process for you. You just have to use standard Kubernetes CLI and API to provision Etcd clusters, and KubeDB takes care of Raft membership — adding new members as learners, waiting for them to catch up, and promoting them, so the cluster never loses quorum while it grows."
+    },
+    {
+      "title": "Version Upgrade",
+      "image": "/assets/images/databases/illustrations/version-upgrade.png",
+      "description": "Upgrading the database version in Kubernetes is complicated. Upgrade operation should follow a specific order. KubeDB allows you to upgrade your running Etcd cluster version without any downtime. You can upgrade your cluster to any major or minor update of the Etcd version, one member at a time, leader last."
+    },
+    {
+      "title": "Scaling",
+      "image": "/assets/images/databases/illustrations/scaling.png",
+      "description": "To improve your database performance you have to make sure that your database is scalable. KubeDB offers both Vertical and Horizontal Scaling of Etcd clusters in Kubernetes. You can simply scale your Etcd cluster in Kubernetes using KubeDB, which grows and shrinks membership through etcd's own Raft APIs rather than just resizing a StatefulSet."
+    },
+    {
+      "title": "Volume Expansion",
+      "image": "/assets/images/databases/illustrations/volume-expansion.png",
+      "description": "Having options of increasing database volume ensures your database high availability and performance. You can expand your storage capacity of Etcd clusters in Kubernetes by using KubeDB."
+    },
+    {
+      "title": "Backup & Restore",
+      "image": "/assets/images/databases/illustrations/backup-restore.png",
+      "description": "To protect your database from any kind of accidental data loss, you will need a disaster recovery solution for your database. KubeDB offers you to Backup & Restore your Etcd cluster in Kubernetes via KubeStash, including restoring a snapshot into an Etcd cluster that already exists — not just at first bootstrap. For the case where a cluster has permanently lost Raft quorum, KubeDB can also rebuild it from a single surviving member through a deliberate, human-confirmed disaster-recovery procedure."
+    },
+    {
+      "title": "Monitoring",
+      "image": "/assets/images/databases/illustrations/monitoring.svg",
+      "description": "KubeDB comes with native support for monitoring via Prometheus. Etcd exposes its metrics natively, so you can use the builtin Prometheus scrapper or CoreOS Prometheus Operator to monitor your Etcd cluster in Kubernetes. You can use Grafana to view key operational metrics, including compute/memory/storage capacity utilization, I/O activity, and instance connections."
+    },
+    {
+      "title": "Security",
+      "image": "/assets/images/databases/illustrations/security.png",
+      "description": "To secure a database your data needs to go through a cryptographic protocol that provides end-to-end security of the data transmission over the network. You can secure your Etcd cluster with TLS using KubeDB, covering both client and Raft peer-to-peer traffic. Also, KubeDB allows you to use encrypted storage for your databases using keys you manage through your cloud provider's key management service."
+    }
+  ],
+  "example": {
+    "apiVersion": "kubedb.com/v1alpha2",
+    "kind": "Etcd",
+    "metadata": {
+      "name": "etcd-quickstart",
+      "namespace": "demo"
+    },
+    "spec": {
+      "version": "3.6.4",
+      "replicas": 3,
+      "storageType": "Durable",
+      "storage": {
+        "accessModes": [
+          "ReadWriteOnce"
+        ],
+        "resources": {
+          "requests": {
+            "storage": "1Gi"
+          }
+        }
+      },
+      "deletionPolicy": "WipeOut"
+    }
+  }
+}
diff --git a/data/products/kubedb/partners/amazon-eks.json b/data/products/kubedb/partners/amazon-eks.json
index 61f1b660..219ea243 100644
--- a/data/products/kubedb/partners/amazon-eks.json
+++ b/data/products/kubedb/partners/amazon-eks.json
@@ -172,7 +172,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/google-gke.json b/data/products/kubedb/partners/google-gke.json
index 4ded3723..d9187bba 100644
--- a/data/products/kubedb/partners/google-gke.json
+++ b/data/products/kubedb/partners/google-gke.json
@@ -172,7 +172,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/managed-service-providers.json b/data/products/kubedb/partners/managed-service-providers.json
index a79fc36e..9cf10718 100644
--- a/data/products/kubedb/partners/managed-service-providers.json
+++ b/data/products/kubedb/partners/managed-service-providers.json
@@ -136,7 +136,7 @@
       { "category": "Search", "engines": "Elasticsearch, OpenSearch, Solr" },
       { "category": "Analytics", "engines": "Druid, ClickHouse, SingleStore" },
       { "category": "Messaging", "engines": "Kafka, RabbitMQ" },
-      { "category": "Others", "engines": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL" }
+      { "category": "Others", "engines": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd" }
     ]
   },
 
diff --git a/data/products/kubedb/partners/microsoft-aks.json b/data/products/kubedb/partners/microsoft-aks.json
index 7eefb62e..0886879f 100644
--- a/data/products/kubedb/partners/microsoft-aks.json
+++ b/data/products/kubedb/partners/microsoft-aks.json
@@ -172,7 +172,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/mirantis.json b/data/products/kubedb/partners/mirantis.json
index 78c3b242..a25da118 100644
--- a/data/products/kubedb/partners/mirantis.json
+++ b/data/products/kubedb/partners/mirantis.json
@@ -275,7 +275,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/nutanix.json b/data/products/kubedb/partners/nutanix.json
index 51de8dd0..b783996c 100644
--- a/data/products/kubedb/partners/nutanix.json
+++ b/data/products/kubedb/partners/nutanix.json
@@ -269,7 +269,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/redhat.json b/data/products/kubedb/partners/redhat.json
index 9d1a42d2..4af546ab 100644
--- a/data/products/kubedb/partners/redhat.json
+++ b/data/products/kubedb/partners/redhat.json
@@ -231,7 +231,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/suse-rancher.json b/data/products/kubedb/partners/suse-rancher.json
index b71f222b..0e08d8ad 100644
--- a/data/products/kubedb/partners/suse-rancher.json
+++ b/data/products/kubedb/partners/suse-rancher.json
@@ -275,7 +275,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/products/kubedb/partners/vmware.json b/data/products/kubedb/partners/vmware.json
index c271b59b..9d39dab2 100644
--- a/data/products/kubedb/partners/vmware.json
+++ b/data/products/kubedb/partners/vmware.json
@@ -259,7 +259,7 @@
       },
       {
         "label": "Others",
-        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL"
+        "items": "Hazelcast, ZooKeeper, PgBouncer, ProxySQL, Etcd"
       }
     ]
   },
diff --git a/data/services/managed_databases.json b/data/services/managed_databases.json
index 32ed9770..95240938 100644
--- a/data/services/managed_databases.json
+++ b/data/services/managed_databases.json
@@ -283,7 +283,7 @@
   "faq": [
     {
       "question": "What databases does AppsCode manage?",
-      "answer": "AppsCode manages 20+ Database engines using KubeDB, including PostgreSQL, MySQL, MongoDB, MariaDB, Microsoft SQL Server, Elasticsearch, OpenSearch, Redis, Valkey, Kafka, RabbitMQ, Solr, ZooKeeper, Percona XtraDB, PgBouncer, Pgpool, ProxySQL, Memcached, SingleStore, ClickHouse, Cassandra, and more."
+      "answer": "AppsCode manages 20+ Database engines using KubeDB, including PostgreSQL, MySQL, MongoDB, MariaDB, Microsoft SQL Server, Elasticsearch, OpenSearch, Redis, Valkey, Kafka, RabbitMQ, Solr, ZooKeeper, Percona XtraDB, PgBouncer, Pgpool, ProxySQL, Memcached, SingleStore, ClickHouse, Cassandra, Etcd, and more."
     },
     {
       "question": "What does the managed database service include?",