diff --git a/.github/workflows/build-snapshot.yml b/.github/workflows/build-snapshot.yml
index f5c12a92..58c130b4 100644
--- a/.github/workflows/build-snapshot.yml
+++ b/.github/workflows/build-snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with: 
           name: dist
-          path: dist/OliveTin-**
+          path: dist/OliveTin*.*
 
       - name: Archive integration tests
         uses: actions/upload-artifact@v2
diff --git a/.goreleaser.yml b/.goreleaser.yml
index b0dfd696..8b78f4e6 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -66,3 +66,78 @@ archives:
     format_overrides:
       - goos: windows
         format: zip
+
+dockers:
+  - image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-amd64"
+    dockerfile: Dockerfile
+    goos: linux
+    goarch: amd64
+    skip_push: false
+    use: docker
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
+    extra_files:
+      - webui
+
+  - image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-arm64"
+    dockerfile: Dockerfile
+    goos: linux
+    goarch: arm64
+    skip_push: false
+    use: docker
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
+    extra_files:
+      - webui
+
+  - image_templates:
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-armv5"
+    dockerfile: Dockerfile
+    goos: linux
+    goarm: 5
+    goarch: arm
+    skip_push: false
+    use: docker
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Tag}}"
+    extra_files:
+      - webui
+
+docker_manifests:
+  - name_template: docker.io/jamesread/olivetin:{{ .Version }}
+    image_templates:
+      - docker.io/jamesread/olivetin:{{ .Version }}-amd64
+      - docker.io/jamesread/olivetin:{{ .Version }}-arm64
+      - docker.io/jamesread/olivetin:{{ .Version }}-armv5
+
+nfpms:
+  - maintainer: James Read <contact@jread.com>
+    description: OliveTin is a web interface for running Linux shell commands.
+    homepage: https://github.com/jamesread/OliveTin
+    license: AGPL-3.0
+    formats:
+      - deb
+      - rpm
+      - apk
+
+    contents:
+      - src: OliveTin.service
+        dst: /etc/systemd/system/OliveTin.service
+
+      - src: webui
+        dst: /var/www/olivetin/
+
+      - src: config.yaml
+        dst: /etc/OliveTin/config.yaml
+        type: "config|noreplace"
diff --git a/internal/httpservers/webuiServer.go b/internal/httpservers/webuiServer.go
index 8e81d0fd..3ce2f734 100644
--- a/internal/httpservers/webuiServer.go
+++ b/internal/httpservers/webuiServer.go
@@ -23,7 +23,6 @@ type webUISettings struct {
 func findWebuiDir() string {
 	directoriesToSearch := []string{
 		"./webui",
-		"/usr/share/OliveTin/webui/",
 		"/var/www/olivetin/",
 		"/etc/OliveTin/webui/",
 	}