diff --git a/.travis.sh b/.travis.sh
index 2e111f01..55872b82 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -39,9 +39,7 @@ case "$1" in
     ;;
 
   deploy)
-    if [[ "$TEST_MODE" = "local" ]]; then
-      make deploy
-    fi
+    make deploy
     ;;
 
   install)
diff --git a/.travis.yml b/.travis.yml
index 0dd77cf4..e7717b3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ deploy:
     on:  # yamllint disable rule:truthy
       repo: ascoderu/opwen-cloudserver
       tags: true
+      condition: $TEST_MODE = local
 
   - provider: pages
     skip-cleanup: true
@@ -51,3 +52,4 @@ deploy:
     on:  # yamllint disable rule:truthy
       repo: ascoderu/opwen-cloudserver
       tags: true
+      condition: $TEST_MODE = local
diff --git a/docker-compose.yml b/docker-compose.yml
index a8b785f3..2a4d9e69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -62,6 +62,7 @@ services:
       - webapp
 
   statuspage:
+    image: ${DOCKER_REPO}/opwenstatuspage:${BUILD_TAG}
     build:
       context: .
       dockerfile: docker/statuspage/Dockerfile
diff --git a/makefile b/makefile
index 31695278..d9927e13 100644
--- a/makefile
+++ b/makefile
@@ -129,7 +129,9 @@ release-docker:
   ) done
 
 release-gh-pages:
-	docker cp "$(shell docker-compose images statuspage | grep statuspage | cut -f1 -d' '):/app/opwen-statuspage" ./build
+	docker container create --name statuspage "$(DOCKER_USERNAME)/opwenstatuspage:$(DOCKER_TAG)" && \
+  docker cp "statuspage:/app/opwen-statuspage" ./build && \
+  docker container rm statuspage
 
 release: release-docker release-gh-pages