diff --git a/public/v2/apps/cockpit.json b/public/v2/apps/cockpit.json
new file mode 100644
index 0000000..ec08a8f
--- /dev/null
+++ b/public/v2/apps/cockpit.json
@@ -0,0 +1,31 @@
+{
+  "captainVersion": "2",
+  "documentation": "Read the documentation @ https://github.com/agentejo/cockpit-docker",
+  "displayName": "Cockpit",
+  "description": "Cockpit is Simple Content Platform to manage any structured content. A self-hosted headless and api-driven CMS.",
+  "dockerCompose": {
+    "version": "3.7",
+    "services": {
+      "$$cap_appname": {
+        "image": "agentejo/cockpit:$$cap_cockpit_version",
+        "containerHttpPort": "80",
+        "volumes": [
+          "$$cap_appname-storage:/var/www/html/storage"
+        ],
+        "restart": "always"
+      }
+    }
+  },
+  "instructions": {
+    "start": "Cockpit is Simple Content Platform to manage any structured content. A self-hosted headless and api-driven CMS.",
+    "end": "Cockpit is deployed and available as $$cap_appname. \n\n IMPORTANT: Navigate to /install to finish the installation and to create an admin user!"
+  },
+  "variables": [
+    {
+        "id": "$$cap_cockpit_version",
+        "label": "cockpit version tag",
+        "description": "Checkout their docker page for the valid tags @ https://hub.docker.com/r/agentejo/cockpit/tags",
+        "defaultValue": "0.9.3"
+    }
+  ]
+}
diff --git a/public/v2/logos/cockpit.png b/public/v2/logos/cockpit.png
new file mode 100644
index 0000000..0fc925f
Binary files /dev/null and b/public/v2/logos/cockpit.png differ