diff --git a/README.md b/README.md
index 2b2d8187..daa61d83 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Chatpad AI](https://github.com/deiucanta/chatpad) - Not just another ChatGPT user-interface!
 - [Code-Server](https://github.com/coder/code-server) - Web VS Code
 - [Codex.Docs](https://github.com/codex-team/codex.docst) - Free Docs app powered by Editor.js ecosystem.
+- [Crafty Controller](https://gitlab.com/crafty-controller/crafty-4) - Crafty 4 is the next iteration of our Minecraft Server Wrapper / Controller / Launcher.
 - [Conduit](https://gitlab.com/famedly/conduit) - Conduit is a simple, fast and reliable chat server written in Rust
 - [Cross-seed](https://github.com/cross-seed/cross-seed) - Fully-automatic, no false positives.
 - [DailyTXT](https://github.com/PhiTux/DailyTxT) - Encrypted Diary Web-App
diff --git a/apps/crafty/config.json b/apps/crafty/config.json
new file mode 100644
index 00000000..b2f2f99f
--- /dev/null
+++ b/apps/crafty/config.json
@@ -0,0 +1,25 @@
+{
+    "$schema": "../schema.json",
+    "name": "Crafty",
+    "available": true,
+    "exposable": true,
+    "port": 8456,
+    "id": "crafty",
+    "https": true,
+    "tipi_version": 1,
+    "version": "4.2.2",
+    "categories": [
+        "gaming"
+    ],
+    "description": "Crafty 4 is the next iteration of our Minecraft Server Wrapper / Controller / Launcher.",
+    "short_desc": "Python based Control Panel for your Minecraft Server",
+    "author": "Crafty Controller",
+    "source": "https://gitlab.com/crafty-controller/crafty-4",
+    "website": "https://craftycontrol.com/",
+    "form_fields": [],
+    "supported_architectures": [
+        "arm64", 
+        "amd64"
+    ]
+  }
+  
\ No newline at end of file
diff --git a/apps/crafty/docker-compose.yml b/apps/crafty/docker-compose.yml
new file mode 100644
index 00000000..2f92553a
--- /dev/null
+++ b/apps/crafty/docker-compose.yml
@@ -0,0 +1,46 @@
+version: "3.7"
+services:
+  crafty:
+    container_name: crafty
+    image: registry.gitlab.com/crafty-controller/crafty-4:4.2.2
+    restart: unless-stopped
+    environment:
+        - TZ=${TZ}
+    ports:
+        - ${APP_PORT}:8443
+        - 8123:8123
+        - 19132:19132/udp
+        - 25500-25600:25500-25600
+    networks:
+      - tipi_main_network
+    volumes:
+        - ${APP_DATA_DIR}/data/backups:/crafty/backups
+        - ${APP_DATA_DIR}/data/logs:/crafty/logs
+        - ${APP_DATA_DIR}/data/servers:/crafty/servers
+        - ${APP_DATA_DIR}/data/config:/crafty/app/config
+        - ${APP_DATA_DIR}/data/import:/crafty/import
+    labels:
+      # Main
+      traefik.enable: true
+      traefik.http.middlewares.crafty-docs-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.crafty-docs.loadbalancer.server.port: 8443
+      # Web
+      traefik.http.routers.crafty-docs-insecure.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.crafty-docs-insecure.entrypoints: web
+      traefik.http.routers.crafty-docs-insecure.service: crafty-docs
+      traefik.http.routers.crafty-docs-insecure.middlewares: crafty-docs-web-redirect
+      # Websecure
+      traefik.http.routers.crafty-docs.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.crafty-docs.entrypoints: websecure
+      traefik.http.routers.crafty-docs.service: crafty-docs
+      traefik.http.routers.crafty-docs.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.crafty-docs-local-insecure.rule: Host(`crafty-docs.${LOCAL_DOMAIN}`)
+      traefik.http.routers.crafty-docs-local-insecure.entrypoints: web
+      traefik.http.routers.crafty-docs-local-insecure.service: crafty-docs
+      traefik.http.routers.crafty-docs-local-insecure.middlewares: crafty-docs-web-redirect
+      # Local domain secure
+      traefik.http.routers.crafty-docs-local.rule: Host(`crafty-docs.${LOCAL_DOMAIN}`)
+      traefik.http.routers.crafty-docs-local.entrypoints: websecure
+      traefik.http.routers.crafty-docs-local.service: crafty-docs
+      traefik.http.routers.crafty-docs-local.tls: true
\ No newline at end of file
diff --git a/apps/crafty/metadata/description.md b/apps/crafty/metadata/description.md
new file mode 100644
index 00000000..7a43e3fb
--- /dev/null
+++ b/apps/crafty/metadata/description.md
@@ -0,0 +1,26 @@
+# Crafty Controller 4.2.2
+> Python based Control Panel for your Minecraft Server
+
+## Credentials
+
+Default credentials are located in `runtipi/app-data/crafty/config/default-creds.txt`
+
+## What is Crafty Controller?
+Crafty Controller is a Minecraft Server Control Panel / Launcher. The purpose
+of Crafty Controller is to launch a Minecraft Server in the background and present
+a web interface for the server administrators to interact with their servers. Crafty
+is compatible with Docker, Linux, Windows 7, Windows 8 and Windows 10.
+
+## Documentation
+Documentation available on [Crafty Docs](https://docs.craftycontrol.com)
+
+## Meta
+Project Homepage - <https://craftycontrol.com>
+
+Discord Server - <https://discord.gg/9VJPhCE>
+
+Git Repository - <https://gitlab.com/crafty-controller/crafty-4>
+
+Docker Hub - [arcadiatechnology/crafty-4](https://hub.docker.com/r/arcadiatechnology/crafty-4)
+
+
diff --git a/apps/crafty/metadata/logo.jpg b/apps/crafty/metadata/logo.jpg
new file mode 100644
index 00000000..3dc8cbc3
Binary files /dev/null and b/apps/crafty/metadata/logo.jpg differ