diff --git a/.travis.yml b/.travis.yml
index f9ebe0a..c1464fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,10 @@ services:
 
 install:
   - pip install pipenv
-  - pipenv install --dev --system --deploy --ignore-pipfile
+  - pipenv install --deploy --ignore-pipfile --dev
 
 before_script:
-  - cookiecutter . --no-input
+  - pipenv run cookiecutter . --no-input
   - cd cookiecutter_drf
   - bash scripts/travis/before_install.sh
 
diff --git a/{{ cookiecutter.project_slug }}/Dockerfile.heroku b/{{ cookiecutter.project_slug }}/Dockerfile.heroku
index ecbad77..8c8436f 100644
--- a/{{ cookiecutter.project_slug }}/Dockerfile.heroku	
+++ b/{{ cookiecutter.project_slug }}/Dockerfile.heroku	
@@ -1,17 +1,16 @@
 FROM python:3-alpine
 ENV PYTHONUNBUFFERED 1
 
-# Add system dependencies
+# Add dependencies
 RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev libffi-dev make
-
-# Allows docker to cache installed dependencies between builds
-COPY Pipfile* ./
 RUN pip install pipenv
-RUN pipenv install --system --deploy --ignore-pipfile
 
 # Adds our application code to the image
 COPY . /code/
 WORKDIR /code
 
+# Install dependencies
+RUN pipenv install --deploy --ignore-pipfile
+
 # Expose Django's port
 EXPOSE $PORT
diff --git a/{{ cookiecutter.project_slug }}/Dockerfile.local b/{{ cookiecutter.project_slug }}/Dockerfile.local
index 569c143..7efea91 100644
--- a/{{ cookiecutter.project_slug }}/Dockerfile.local	
+++ b/{{ cookiecutter.project_slug }}/Dockerfile.local	
@@ -1,17 +1,16 @@
 FROM python:3-alpine
 ENV PYTHONUNBUFFERED 1
 
-# Add system dependencies
+# Add dependencies
 RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev libffi-dev make
-
-# Allows docker to cache installed dependencies between builds
-COPY Pipfile* ./
 RUN pip install pipenv
-RUN pipenv install --dev --system --deploy --ignore-pipfile
 
 # Adds our application code to the image
 COPY . /code/
 WORKDIR /code
 
+# Install dependencies
+RUN pipenv install --deploy --ignore-pipfile --dev
+
 # Expose Django's port
 EXPOSE $PORT
diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh
index aca33b2..0e6effe 100755
--- a/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/heroku/deploy_web.sh	
@@ -1,3 +1,3 @@
-#!/bin/bash
-python manage.py migrate
-python manage.py collectstatic --noinput
+#!/bin/sh
+pipenv run python manage.py migrate
+pipenv run python manage.py collectstatic --noinput
diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh
index c7cd625..9f3c898 100755
--- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery.sh	
@@ -1,2 +1,2 @@
 #!/bin/sh
-celery -A config.celery worker -l info
+pipenv run celery -A config.celery worker -l info
diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh
index fd54b6b..cb8847d 100755
--- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_celery_beat.sh	
@@ -1,2 +1,2 @@
 #!/bin/sh
-celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
+pipenv run celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
diff --git a/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh b/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh
index 9d32ee3..c11af16 100755
--- a/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/heroku/run_web.sh	
@@ -1,2 +1,2 @@
 #!/bin/sh
-gunicorn config.wsgi:application -b 0.0.0.0:${PORT} -k config.server.production.ProductionUvicornWorker --access-logfile -
+pipenv run gunicorn config.wsgi:application -b 0.0.0.0:${PORT} -k config.server.production.ProductionUvicornWorker --access-logfile -
diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh
index 6dd774b..0c67e1a 100755
--- a/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/local/run_celery.sh	
@@ -1,2 +1,2 @@
 #!/bin/sh
-watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery worker -l info
+pipenv run watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery worker -l info
diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh
index 056dd44..8368ffa 100755
--- a/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/local/run_celery_beat.sh	
@@ -1,2 +1,2 @@
 #!/bin/sh
-watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
+pipenv run watchmedo auto-restart --patterns="*.py" -d api -- celery -A config.celery beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
diff --git a/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh b/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh
index 6b078ae..eac03e9 100755
--- a/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/local/run_web.sh	
@@ -1,4 +1,4 @@
 #!/bin/sh
-python scripts/local/wait_for_postgres.py
-python manage.py migrate
-python manage.py runserver 0.0.0.0:8000
+pipenv run python scripts/local/wait_for_postgres.py
+pipenv run python manage.py migrate
+pipenv run python manage.py runserver 0.0.0.0:8000
diff --git a/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh b/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh
index 688d2c3..983ec68 100755
--- a/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh	
+++ b/{{ cookiecutter.project_slug }}/scripts/travis/run_tests.sh	
@@ -1,5 +1,7 @@
 #!/bin/sh
-flake8 . &&
-black --check . &&
-python scripts/local/wait_for_postgres.py &&
-pytest --cov=./
+pipenv run "
+  flake8 . &&
+  black --check . &&
+  python scripts/local/wait_for_postgres.py &&
+  pytest --cov=./
+"