diff --git a/.circleci/config.yml b/.circleci/config.yml
index e151441f0379ae9c9fca4319731d5ba84f10b079..91a7ff8faa5ca835eb5b5a19d9a7af1971b4c9a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
       - checkout
       - run:
           name: build binaries
-          command: 'GOBIN=$PWD/`dirname $0`/bin GO111MODULE=on go install -v ./cmd/...'
+          command: './build.sh'
       - store_artifacts:
           path: bin/media_repo
           destination: media_repo
diff --git a/.dockerignore b/.dockerignore
index ff089bd77ac1b8f248fb08c42938727f700b9af6..ecdfdf7be9d0f55f55e571a8229a175d5ff279cd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,10 @@
+/webui
 /.idea
 /bin
 /pkg
 /logs
 /vendor
+/config
 
 media-repo*.yaml
 homeserver.yaml
diff --git a/appveyor.yml b/appveyor.yml
index a1d424a2eeb00288af6a7374532629948e34ee29..1c8ed857a6da30f2eccc9be15a92c1cba7cbc100 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,7 @@ install:
 build_script:
   - set GOBIN=%CD%/bin
   - set GO111MODULE=on
-  - go install -v ./cmd/...
+  - ./build.ps1
 
 artifacts:
   - path: bin/media_repo.exe
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..9b200c306a6ce4fc45a284625ac5f1cfdfe59ee3
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,5 @@
+$bin = (Join-Path $PWD bin)
+$Env:GOBIN=$bin
+$GitCommit = (git rev-list -1 HEAD)
+$Version = (git describe --tags)
+go install -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.GitCommit=$GitCommit -X github.com/turt2live/matrix-media-repo/common/version.Version=$Version" -v ./cmd/...
diff --git a/build.sh b/build.sh
index 9a8050f3cec57a2fb2068dab30479078640345ec..15d83fd786a2882befd728f9e7c81fe25d50ca5c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...
+GOBIN=$PWD/bin go install -ldflags "-X github.com/turt2live/matrix-media-repo/common/version.GitCommit=$(git rev-list -1 HEAD) -X github.com/turt2live/matrix-media-repo/common/version.Version=$(git describe --tags)" -v ./cmd/...