diff --git a/public/v2/apps/etherpad.json b/public/v2/apps/etherpad.json
new file mode 100644
index 0000000..38a61c5
--- /dev/null
+++ b/public/v2/apps/etherpad.json
@@ -0,0 +1,68 @@
+{
+    "captainVersion": "2",
+    "documentation": "https://github.com/ether/etherpad-lite/blob/develop/doc/docker.md ",
+    "displayName": "Etherpad",
+    "description": "Etherpad is a real-time collaborative editor for the web",
+    "dockerCompose": {
+        "version": "3.8",
+        "services": {
+            "$$cap_appname": {
+            "image": "etherpad/etherpad:$$cap_etherpad_version",
+            "containerHttpPort": "9001",
+            "depends_on": [
+                "$$cap_appname-db"
+            ],
+            "environment": {
+                "NODE_ENV": "production",
+                "DB_TYPE": "mysql",
+                "DB_HOST": "srv-captain--$$cap_appname-db",
+                "DB_PORT": "3306",
+                "DB_NAME": "etherpad",
+                "DB_USER": "etherpad",
+                "DB_PASS": "$$cap_db_pass",
+                "DB_CHARSET": "utf8mb4",
+                "TRUST_PROXY": "true"
+             }
+            },
+            "$$cap_appname-db": {
+            "image": "mysql:$$cap_mysql_version",
+            "notExposeAsWebApp": "true",
+                "volumes": [
+                    "$$cap_appname-db-data:/var/lib/mysql"
+                ],
+                "restart": "always",
+                "environment": {
+                    "MYSQL_ROOT_PASSWORD": "$$cap_db_pass",
+                    "MYSQL_DATABASE": "etherpad",
+                    "MYSQL_USER": "etherpad",
+                    "MYSQL_PASSWORD": "$$cap_db_pass"
+             }
+            }
+        }
+    },
+    "instructions": {
+        "start": "Etherpad is a real-time collaborative editor for the web",
+        "end": "Etherpad is a real-time collaborative editor for the web is deployed and available as srv-captain--$$cap_appname.  Note that the application may take some time to become available."
+      },
+      "variables": [
+        {
+          "id": "$$cap_etherpad_version",
+          "label": "Etherpad Docker Image",
+          "defaultValue": "1.8.0",
+          "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/etherpad/etherpad/tags - default is 1.8.0 as of 2020-04-09"
+        },
+        {
+            "id": "$$cap_db_pass",
+            "label": "Database password",
+            "description": "",
+            "validRegex": "/.{1,}/"
+        },
+        {
+            "id": "$$cap_mysql_version",
+            "label": "MySQL Version",
+            "defaultValue": "5.7",
+            "description": "Check out their Docker page for the valid tags https://hub.docker.com/r/library/mysql/tags/",
+            "validRegex": "/^([^\\s^\\/])+$/"
+        }
+    ]
+}
diff --git a/public/v2/logos/etherpad.png b/public/v2/logos/etherpad.png
new file mode 100644
index 0000000..e66944d
Binary files /dev/null and b/public/v2/logos/etherpad.png differ