diff --git a/Jenkinsfile-deploy b/Jenkinsfile-deploy
new file mode 100644
index 000000000..6a3d816ba
--- /dev/null
+++ b/Jenkinsfile-deploy
@@ -0,0 +1,53 @@
+#!groovy
+
+node {
+    try {
+        stage('Download') {
+            step([$class: 'WsCleanup'])
+
+            echo "Downloading build artifact.."
+            withCredentials([
+                string(credentialsId: "${aws_env}_aws_access_key", variable: 'AWS_ACCESS_KEY_ID'),
+                string(credentialsId: "${aws_env}_aws_secret_key", variable: 'AWS_SECRET_ACCESS_KEY')
+            ]) {
+                sh 'aws s3 cp --region eu-west-1 s3://${dns_name}-codedeploy/notifications-admin-${DEPLOY_BUILD_NUMBER}.zip source.zip'
+            }
+
+            echo "Extracting build artifact.."
+            sh 'unzip -q source.zip'
+        }
+        stage('Deploy') {
+            lock(cf_space) {
+                withCredentials([
+                    string(credentialsId: 'paas_username', variable: 'CF_USERNAME'),
+                    string(credentialsId: 'paas_password', variable: 'CF_PASSWORD')
+                ]) {
+                    sh "CF_SPACE=${cf_space} make cf-deploy-with-docker"
+                }
+            }
+        }
+    } catch(err) {
+        currentBuild.result = 'FAILURE'
+        echo "PaaS deployment to ${cf_space} failed: ${err}"
+        try {
+            slackSend channel: '#govuk-notify', message: "PaaS deployment to ${cf_space} failed: <${env.BUILD_URL}|${env.JOB_NAME} - #${env.BUILD_NUMBER}>", color: 'danger'
+        } catch(err2) {
+            echo "Sending Slack message failed: ${err2}"
+        }
+    } finally {
+        stage('Post-build') {
+            if (cf_space == 'production') {
+                try {
+                    slackSend channel: '#govuk-notify', message: "PaaS deployment to ${cf_space} finished: <${env.BUILD_URL}|${env.JOB_NAME} - #${env.BUILD_NUMBER}>", color: 'good'
+                } catch(err2) {
+                    echo "Sending Slack message failed: ${err2}"
+                }
+            }
+            try {
+                step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'notify-support+jenkins@digital.cabinet-office.gov.uk', sendToIndividuals: false])
+            } catch(err2) {
+                echo "Sending email failed: ${err2}"
+            }
+        }
+    }
+}
diff --git a/Makefile b/Makefile
index 5ad767fb1..b6249c122 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PIP_ACCEL_CACHE ?= ${CURDIR}/cache/pip-accel
 APP_VERSION_FILE = app/version.py
 
 GIT_BRANCH ?= $(shell git symbolic-ref --short HEAD 2> /dev/null || echo "detached")
-GIT_COMMIT ?= $(shell git rev-parse HEAD)
+GIT_COMMIT ?= $(shell git rev-parse HEAD 2> /dev/null || echo "")
 
 DOCKER_IMAGE_TAG := $(shell cat docker/VERSION)
 DOCKER_BUILDER_IMAGE_NAME = govuk/notify-admin-builder:${DOCKER_IMAGE_TAG}