diff --git a/.env b/.env
new file mode 100644
index 0000000..1e0e8be
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+IMAGE_NAME=alerta/alerta-web
diff --git a/.gitignore b/.gitignore
index 08b5c07..f7dc9ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-.env
 mongodb
 pg-data
 contrib/kubernetes/helm/alerta/charts
+
+.env.local
+.env.*.local
diff --git a/Makefile b/Makefile
index 0715ea6..4f5ac75 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,7 @@ build:
 	-t $(IMAGE_NAME):latest .
 
 push:
-	docker tag $IMAGE_NAME ${DOCKER_REPO}:$VERSION
-	docker push ${DOCKER_REPO}:$VERSION
+	docker push $(IMAGE_NAME)
 
 pull:
 	docker-compose -f docker-compose.yml pull
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d2a0735..cd29976 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   sut:
-    image: alerta/alerta-web
+    build: .
     ports:
       - 8080
     depends_on: