diff --git a/apps/minecraft-server/config.json b/apps/minecraft-server/config.json
new file mode 100644
index 00000000..6967b90c
--- /dev/null
+++ b/apps/minecraft-server/config.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "../schema.json",
+  "name": "Minecraft Server",
+  "available": true,
+  "exposable": true,
+  "no_gui": true,
+  "port": 25565,
+  "id": "minecraft-server",
+  "tipi_version": 1,
+  "version": "latest",
+  "categories": ["gaming"],
+  "description": "Minecraft Server",
+  "short_desc": "Run a minecraft server",
+  "author": "Geoff Bourne",
+  "source": "https://github.com/itzg/docker-minecraft-server",
+  "form_fields": [
+    {
+      "type": "text",
+      "label": "Minecraft version",
+      "hint": "The version of Minecraft to use, leave empty for latest",
+      "placeholder": "1.18.2",
+      "required": false,
+      "env_variable": "MC_VERSION"
+    }
+  ]
+}
diff --git a/apps/minecraft-server/docker-compose.yml b/apps/minecraft-server/docker-compose.yml
new file mode 100644
index 00000000..b5f3725b
--- /dev/null
+++ b/apps/minecraft-server/docker-compose.yml
@@ -0,0 +1,25 @@
+version: "3.7"
+
+services:
+  minecraft-server:
+    container_name: minecraft-server
+    image: itzg/minecraft-server
+    ports:
+      - ${APP_PORT}:25565
+    environment:
+      EULA: "TRUE"
+      VERSION: ${MC_VERSION:-LATEST}
+    tty: true
+    stdin_open: true
+    restart: unless-stopped
+    volumes:
+      - ${APP_DATA_DIR}/data/minecraft-data:/data
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.minecraft-server.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.minecraft-server.entrypoints: websecure
+      traefik.http.routers.minecraft-server.service: minecraft-server
+      traefik.http.routers.minecraft-server.tls.certresolver: myresolver
+      traefik.http.services.minecraft-server.loadbalancer.server.port: 25565
\ No newline at end of file
diff --git a/apps/minecraft-server/metadata/description.md b/apps/minecraft-server/metadata/description.md
new file mode 100644
index 00000000..d4cec3df
--- /dev/null
+++ b/apps/minecraft-server/metadata/description.md
@@ -0,0 +1,9 @@
+Minecraft Server that will automatically download selected version at startup
+
+Once you have installed the app, the server will be available on port 25565 (default Minecraft port).
+
+In order to enter the server console run the following command on your server:
+
+```
+docker exec -i mc rcon-cli
+```
diff --git a/apps/minecraft-server/metadata/logo.jpg b/apps/minecraft-server/metadata/logo.jpg
new file mode 100644
index 00000000..26464862
Binary files /dev/null and b/apps/minecraft-server/metadata/logo.jpg differ
diff --git a/apps/schema.json b/apps/schema.json
index 73146734..1bf8e1cd 100644
--- a/apps/schema.json
+++ b/apps/schema.json
@@ -15,6 +15,9 @@
     "exposable": {
       "type": "boolean"
     },
+    "no_gui": {
+      "type": "boolean"
+    },
     "port": {
       "type": "integer",
       "minimum": 0,