diff --git a/cookiecutter.json b/cookiecutter.json
index 0efab97..69bc5d1 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,5 +1,6 @@
 {
     "project_name": "project_name",
+    "jupyter_image": ["base-notebook", "minimal-notebook", "r-notebook", "scipy-notebook", "tensorflow-notebook", "datascience-notebook", "pyspark-notebook", "all-spark-notebook"],
     "jupyter_password": "changeme1234",
     "postgres_db_password": "changeme1234",
     "shared_db_password": "changeme1234",
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
 
diff --git a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile
index ce6bdb2..80626d5 100644
--- a/{{cookiecutter.project_name}}/services/jupyter/Dockerfile
+++ b/{{cookiecutter.project_name}}/services/jupyter/Dockerfile
@@ -1,4 +1,4 @@
-FROM jupyter/scipy-notebook
+FROM jupyter/{{cookiecutter.jupyter_image}}
 
 USER root