diff --git a/Dockerfile b/Dockerfile
index 6a22947..5c63992 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,5 @@ RUN pip3 install --no-cache-dir /app[full] gunicorn
 
 USER 1000:1000
 
-ENTRYPOINT ["/app/docker-entry.sh"]
+ENTRYPOINT ["/bin/sh", "/app/docker-entry.sh"]
+CMD ["run"]
diff --git a/README.md b/README.md
index 5ad1035..4b72a00 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,10 @@ Then execute
 docker-compose build --no-cache --pull
 ```
 
+Using Heroku free tier:
+
+[Deploy to Heroku](https://heroku.com/deploy?template=https://github.com/pictuga/morss)
+
 ## Run
 
 morss will auto-detect what "mode" to use.
diff --git a/app.json b/app.json
new file mode 100644
index 0000000..7d2d73b
--- /dev/null
+++ b/app.json
@@ -0,0 +1 @@
+{"stack": "container"}
diff --git a/docker-entry.sh b/docker-entry.sh
index aa7122a..620ff44 100755
--- a/docker-entry.sh
+++ b/docker-entry.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if [ ! -z "$1" ]; then
-	morss $@
+if [ -z "$1" ] || [ "$@" = "run" ]; then
+	gunicorn --bind 0.0.0.0:${PORT:-8000} -w 4 --preload --access-logfile - morss
 else
-	gunicorn --bind 0.0.0.0:8000 -w 4 --preload --access-logfile - morss
+	morss $@
 fi
diff --git a/heroku.yml b/heroku.yml
new file mode 100644
index 0000000..b3bff17
--- /dev/null
+++ b/heroku.yml
@@ -0,0 +1,9 @@
+setup:
+  config:
+    DEBUG: 1
+    CACHE: diskcache
+    CACHE_SIZE: 1073741824
+
+build: 
+  docker:
+    web: Dockerfile