diff --git a/CloudronManifest.json b/CloudronManifest.json
index e296dea..a2c4771 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,5 +1,5 @@
 {
-  "id": "io.concourse.cloudron",
+  "id": "ci.concourse.cloudron",
   "title": "Concourse",
   "description": "file://DESCRIPTION.md",
   "tagline": "CI that scales with your project",
diff --git a/Makefile b/Makefile
index 0817bd2..cce775e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ default: build
 build:
 	cloudron build
 
-install: build
+install:
 	cloudron install
 
 uninstall:
@@ -20,5 +20,5 @@ debug:
 no-debug:
 	cloudron configure --no-debug
 
-startworker:
+run-worker:
 	./concourse_worker.sh
diff --git a/README.md b/README.md
index 1888ac9..ab7a4c2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,30 @@
-# concourse-app
+# Concourse Cloudron App
 
-Cloudron packaged version of Concourse ATC/TSA
+This repository contains the Cloudron app package source for [Concourse](https://concourse.ci/) ATC and TSA.
+
+## Installation
+
+[![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=ci.concourse.cloudron)
+
+or using the [Cloudron command line tooling](https://cloudron.io/references/cli.html)
+
+```
+cloudron install --appstore-id ci.concourse.cloudron
+```
+
+## Building
+
+The app package can be built using the [Cloudron command line tooling](https://cloudron.io/references/cli.html).
+
+```
+make build      # Builds the Cloudron app
+make install    # Installs the app into Cloudron and runs it
+make run        # Ensures app is installed and prints all logs and begins tailing them 
+make uninstall  # Uninstalls the app from Cloudron
+make debug      # Changes the current configuration to debug to set filesystem to read/write
+make no-debug   # Changes the current configuration out of debug
+make run-worker # Runs a worker in an attached process
+```
 
 ### Legal
 
diff --git a/concourse_worker.sh b/concourse_worker.sh
index 5050c6c..252350d 100755
--- a/concourse_worker.sh
+++ b/concourse_worker.sh
@@ -5,7 +5,8 @@
 tsa_container=$(cloudron list | awk '/io.concourse.cloudron/{print $1;}')
 tsa_hostname=$(cloudron exec --app $tsa_container env | grep HOSTNAME | sed s/.*=//)
 tsa_port=$(cloudron exec --app $tsa_container env | grep TSA_PORT | sed s/.*=//)
-sudo docker run -d \
+docker run \
+  --rm \
   --name concourse_worker \
   --privileged \
   --network cloudron \