diff --git a/Makefile b/Makefile
index 6e5327f..b0b87b6 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ stop: check-deps ## Stop Planetmint
 logs: check-deps ## Attach to the logs
 	@$(DC) logs -f planetmint
 
+lint: check-deps ## Lint the Project
+	@$(DC) up lint
+
 test: check-deps test-unit test-acceptance ## Run unit and acceptance tests
 
 test-unit: check-deps ## Run all tests once
diff --git a/docker-compose.yml b/docker-compose.yml
index 331b4f1..d5936c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -114,3 +114,13 @@ services:
       - '33333:80'
     volumes:
       - ./docs/root/build/html:/usr/share/nginx/html
+
+  # Lints project according to PEP8
+  lint:
+    image: alpine/flake8
+    command: --max-line-length 119 /planetmint /acceptance /integration /tests
+    volumes:
+      - ./planetmint:/planetmint
+      - ./acceptance:/acceptance
+      - ./integration:/integration
+      - ./tests:/tests
\ No newline at end of file