diff --git a/{{cookiecutter.project_name}}/.gitignore b/{{cookiecutter.project_name}}/.gitignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/{{cookiecutter.project_name}}/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/{{cookiecutter.project_name}}/Makefile b/{{cookiecutter.project_name}}/Makefile
new file mode 100644
index 0000000..ce3cc0c
--- /dev/null
+++ b/{{cookiecutter.project_name}}/Makefile
@@ -0,0 +1,17 @@
+.PHONY: jupyter apistar run run-daemon
+
+run: jupyter apistar
+	docker-compose up
+
+run-daemon:
+	docker-compose up -d
+
+jupyter:
+	docker-compose build $@
+
+apistar:
+	docker-compose build $@
+
+clean:
+	docker-compose rm -fv
+	docker-compose down -v
diff --git a/{{cookiecutter.project_name}}/services/apistar/Dockerfile b/{{cookiecutter.project_name}}/services/apistar/Dockerfile
index 4a683b2..dcadbd3 100644
--- a/{{cookiecutter.project_name}}/services/apistar/Dockerfile
+++ b/{{cookiecutter.project_name}}/services/apistar/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.6
 
 WORKDIR /usr/src/app