diff --git a/CloudronManifest.json b/CloudronManifest.json
index 455bbde..281ffef 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,7 +4,7 @@
   "author": "TerminusDB",
   "description": "TerminusDB is an open-source graph database and document store. It is designed for collaboratively building data-intensive applications and knowledge graphs.",
   "tagline": "If you want to collaborate with colleagues or build data-intensive applications, nothing will make you more productive.",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "healthCheckPath": "/",
   "httpPort": 3000,
   "addons": {
diff --git a/Dockerfile b/Dockerfile
index 4d87b51..2ee1a07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,14 +6,14 @@ WORKDIR /app/code
 
 RUN sudo apt-add-repository ppa:swi-prolog/stable && apt-get update && apt-get install cargo swi-prolog -y && apt-get clean
 RUN swipl -g "pack_install(terminus_store_prolog, [interactive(false)])"
-RUN git clone https://github.com/terminusdb/terminusdb \
-	&& cd terminusdb \
-	&& make
+RUN git clone https://github.com/terminusdb/terminusdb . && make
 
 RUN mkdir -p /app/data
 
-COPY start.sh /app/code/start.sh
+COPY start.sh /app/code/
 RUN chmod +x /app/code/start.sh
 
+COPY CloudronManifest.json /app/code/
+
 CMD /app/code/start.sh
 
diff --git a/start.sh b/start.sh
index d89c79b..74ffc7c 100644
--- a/start.sh
+++ b/start.sh
@@ -13,10 +13,10 @@ export TERMINUSDB_HTTPS_ENABLED=false
 
 if [[ ! -f /app/data/.initialized ]]; then
 	echo "First start, initializing default database at '/app/data'"
-	/usr/local/bin/gosu cloudron:cloudron /app/code/terminusdb/terminusdb store init
+	/usr/local/bin/gosu cloudron:cloudron /app/code/terminusdb store init
 	touch /app/data/.initialized
 	echo "Done."
 fi
 
-exec /usr/local/bin/gosu cloudron:cloudron /app/code/terminusdb/terminusdb serve
+exec /usr/local/bin/gosu cloudron:cloudron /app/code/terminusdb serve