diff --git a/extras/scanner/Dockerfile b/extras/scanner/Dockerfile
new file mode 100644
index 000000000..b570d189a
--- /dev/null
+++ b/extras/scanner/Dockerfile
@@ -0,0 +1,10 @@
+FROM       alpine:3.8
+RUN        apk add --no-cache ca-certificates
+COPY       scanner /bin/scanner
+EXPOSE     6060
+ENTRYPOINT [ "/bin/scanner" ]
+
+ARG revision
+LABEL org.opencontainers.image.title="scanner" \
+      org.opencontainers.image.source="https://github.com/weaveworks/scope/app/multitenant/scanner" \
+      org.opencontainers.image.revision="${revision}"
diff --git a/extras/scanner/Makefile b/extras/scanner/Makefile
new file mode 100644
index 000000000..4187a7f6e
--- /dev/null
+++ b/extras/scanner/Makefile
@@ -0,0 +1,24 @@
+.PHONY: all vet lint build test clean
+GIT_REVISION := $(shell git rev-parse HEAD)
+GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -s -w" -tags netgo
+
+all: build test vet lint
+
+vet:
+	go vet ./...
+
+lint:
+	golint .
+
+build:
+	go build $(GO_BUILD_FLAGS)
+
+test:
+	go test
+
+docker:
+	docker build --build-arg=revision=$(GIT_REVISION) -t quay.io/weaveworks/scope-deleter .
+
+clean:
+	go clean
+
diff --git a/app/multitenant/scanner/main.go b/extras/scanner/main.go
similarity index 100%
rename from app/multitenant/scanner/main.go
rename to extras/scanner/main.go