diff --git a/.cfignore b/.cfignore
deleted file mode 120000
index 3e4e48b0b..000000000
--- a/.cfignore
+++ /dev/null
@@ -1 +0,0 @@
-.gitignore
\ No newline at end of file
diff --git a/.cfignore b/.cfignore
new file mode 100644
index 000000000..e2df42b69
--- /dev/null
+++ b/.cfignore
@@ -0,0 +1,79 @@
+# This file is a copy of .gitignore except for file/folders created by the build
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+venv/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache
+coverage.xml
+test_results.xml
+*,cover
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+.idea/
+.DS_Store
+.vscode
+
+# Frontend dependencies and compiled assets
+app/assets/stylesheets/govuk_template/.sass-cache/
+.sass-cache/
+cache/
+node_modules
+bower_components
+npm-debug.log
+
+environment.sh
+.envrc
+
+# CloudFoundry
+.cf
+package-lock.json
diff --git a/.gitignore b/.gitignore
index 2e35c0227..508249609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,6 @@ cache/
 node_modules
 bower_components
 npm-debug.log
-app/templates/vendor
 
 environment.sh
 .envrc
@@ -76,3 +75,8 @@ environment.sh
 # CloudFoundry
 .cf
 package-lock.json
+
+# Files/folders created by build so not present in .cfignore
+app/version.py
+app/static
+app/templates/vendor
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 191f96b65..000000000
--- a/app/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/version.py
-/static
diff --git a/deploy-exclude.lst b/deploy-exclude.lst
index 900f27113..a0771a474 100644
--- a/deploy-exclude.lst
+++ b/deploy-exclude.lst
@@ -9,3 +9,4 @@ target/*
 venv/*
 .envrc
 .cf/*
+.pytest_cache/*