diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..e78273d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.gitignore
+.gitlab/*
+.gitlab-ci.yml
+README.md
+.git/*
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b6cf9b..3bf54f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,8 @@
 stages:
+  - lint
+  # - build
   - deploy
+
 deploy:
   stage: deploy
   only:
@@ -15,3 +18,35 @@ deploy:
   tags:
     - deploy-remote
 
+flake8:
+  stage: lint
+  before_script: 
+    - pip install flake8_formatter_junit_xml
+    - export PATH="$HOME/.local/bin:$PATH"
+  script:
+    - set -x
+    - FLIST=$(git --no-pager diff --diff-filter=d --name-only $(git merge-base --fork-point origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME) $CI_COMMIT_SHA  | egrep ".py$" | grep -v ".docker/"|| true)
+    - >
+      if [ ! -z "$FLIST" ];
+      then
+        mkdir -p build/reports;
+        flake8 --format junit-xml $FLIST > build/reports/flake8-junit.xml || flake8 $FLIST;
+      else
+        echo "No files to lint"
+        true;
+      fi
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - "*.py"
+      - "**/*.py"
+  tags:
+    - deploy-remote
+  artifacts:
+    reports:
+      junit: ./build/reports/flake8-junit.xml
+    expire_in: 7 days
+  allow_failure: false
+
+  
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
index 6caa3b1..62ca752 100644
--- a/.gitlab/merge_request_templates/Default.md
+++ b/.gitlab/merge_request_templates/Default.md
@@ -1,4 +1,10 @@
+<<<<<<< HEAD
 ### Changes:
+=======
+# %{source_branch} MR to %{target_branch}
+
+## Changes:
+>>>>>>> 05c7168 (add flake 8 integration and remove front)
 %{all_commits}
 
 /assign_reviewer @elizavetanikolaeva
diff --git a/docker-compose.yml b/docker-compose.yml
index cd27149..5aadede 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,11 +17,9 @@ x-frontend-variables: &frontend-variables
   DOMAIN: "${DOMAIN}"
   REACT_APP_DOMAIN_URL: "https://${DOMAIN}/"
 
-
 x-martin-variables: &martin-variables
   MARTIN_PORT: "${MARTIN_PORT}"
 
-
 services:
   django:
     container_name: ${CONTAINERS_NAME}_django
@@ -72,23 +70,3 @@ services:
       - db
       - django
     restart: always
-
-  frontend:
-    container_name: ${CONTAINERS_NAME}_frontend
-    build: postamates_frontend
-    volumes:
-      - ./dist/:/usr/src/postamates_frontend/dist/
-    command:
-      sh -c "yarn build"
-    environment:
-      <<: *frontend-variables
-    depends_on:
-      - db
-      - martin
-      - django
-    deploy:
-      resources:
-        limits:
-          memory: 4096M
-        reservations:
-          memory: 4096M
diff --git a/postamates/urls.py b/postamates/urls.py
index 7904df3..b3744e7 100644
--- a/postamates/urls.py
+++ b/postamates/urls.py
@@ -9,4 +9,5 @@ urlpatterns = [
     path('api/', include('service.urls')),
     path('accounts/', include('rest_registration.api.urls')),
 ]
-urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
+
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)