diff --git a/.gitignore b/.gitignore
index 3f7cdab2e..827c22381 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,6 @@ npm-debug.log
 
 environment.sh
 .envrc
+
+# CloudFoundry
+.cf
diff --git a/Makefile b/Makefile
index f5d07b0ac..4a973501e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ CODEDEPLOY_APP_NAME ?= notify-admin
 CF_API ?= api.cloud.service.gov.uk
 CF_ORG ?= govuk-notify
 CF_SPACE ?= ${DEPLOY_ENV}
+CF_HOME ?= ${HOME}
+$(eval export CF_HOME)
 
 .PHONY: help
 help:
@@ -226,11 +228,3 @@ cf-rollback: ## Rollbacks the app to the previous release
 .PHONY: cf-push
 cf-push:
 	cf push -f manifest-${CF_SPACE}.yml
-
-.PHONY: cf-deploy-with-docker
-cf-deploy-with-docker: prepare-docker-build-image ## Deploys the app to Cloud Foundry from a new Docker container
-	$(call run_docker_container,cf-deploy,make cf-login cf-deploy)
-
-.PHONY: cf-rollback-with-docker
-cf-rollback-with-docker: prepare-docker-build-image ## Rollbacks the app on Cloud Foundry to the previous version
-	$(call run_docker_container,cf-rollback,make cf-login cf-rollback)
diff --git a/deploy-exclude.lst b/deploy-exclude.lst
index bf711491a..0aefff3b6 100644
--- a/deploy-exclude.lst
+++ b/deploy-exclude.lst
@@ -1,8 +1,10 @@
-*__pycache__*
-*.git*
-*app/assets*
-*bower_components*
-*cache*
-*node_modules*
-*target*
-*venv*
+__pycache__*
+.git/*
+app/assets/*
+bower_components/*
+cache/*
+node_modules/*
+target/*
+venv/*
+.envrc
+.cf/*