diff --git a/.gitignore b/.gitignore
index 684f927..414e371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ cert.pem
 *.gob
 docker-compose.yml
 mdb-local
-LICENSES
\ No newline at end of file
+LICENSES
+LICENSES.zip
\ No newline at end of file
diff --git a/.goreleaser.yml b/.goreleaser.yml
index a5811bf..b547b1f 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -19,22 +19,24 @@ builds:
       # - darwin
     goarch:
       - amd64
-dockers:
-  - image_templates:
-    - "ghcr.io/stieneee/mumble-discord-bridge:latest"
-    - "ghcr.io/stieneee/mumble-discord-bridge:{{ .Tag }}"
-    - "stieneee/mumble-discord-bridge:latest"
-    - "stieneee/mumble-discord-bridge:{{ .Tag }}"
-    skip_push: "false"
-    dockerfile: Dockerfile
-    use: docker
-    build_flag_templates:
-    - "--pull"
-    - "--label=org.opencontainers.image.created={{.Date}}"
-    - "--label=org.opencontainers.image.title={{.ProjectName}}"
-    - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-    - "--label=org.opencontainers.image.version={{.Version}}"
-    - "--platform=linux/arm64"
+# dockers:
+#   - goos: linux
+#     goarch: amd64
+#     image_templates:
+#     - "ghcr.io/stieneee/mumble-discord-bridge:latest"
+#     - "ghcr.io/stieneee/mumble-discord-bridge:{{ .Tag }}"
+#     - "stieneee/mumble-discord-bridge:latest"
+#     - "stieneee/mumble-discord-bridge:{{ .Tag }}"
+#     skip_push: "false"
+#     dockerfile: Dockerfile
+#     use: docker
+#     build_flag_templates:
+#     - "--pull"
+#     - "--label=org.opencontainers.image.created={{.Date}}"
+#     - "--label=org.opencontainers.image.title={{.ProjectName}}"
+#     - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+#     - "--label=org.opencontainers.image.version={{.Version}}"
+#     - "--platform=linux/amd64"
     # push_flags:
     # - --tls-verify=false
     # extra_files:
@@ -47,7 +49,7 @@ snapshot:
   name_template: "{{ .Tag }}-next"
 release:
   extra_files:
-    - glob: "./LICENSES/*"
+    - glob: "./LICENSES.zip"
 changelog:
   sort: asc
   filters:
diff --git a/Makefile b/Makefile
index 35ca008..4089388 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 GOFILES=$(shell find ./ -type f -name '*.go')
+LATEST_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`)
 
 mumble-discord-bridge: $(GOFILES) .goreleaser.yml
 	goreleaser build --skip-validate --rm-dist --single-target --auto-snapshot
 
 release: 
-	go-licenses save ./cmd/mumble-discord-bridge --force --save_path="./LICENSES"
+	rm -rf LICENSES.zip LICENSES
+	go-licenses save ./cmd/mumble-discord-bridge --save_path="./LICENSES"
+	zip -r -9 LICENSES.zip ./LICENSES
 	goreleaser release --rm-dist
 
 dev: $(GOFILES) .goreleaser.yml
@@ -23,16 +26,24 @@ test-chart:
 	psrecord --plot docs/test-cpu-memory.png $$(pidof mumble-discord-bridge.test)
 
 docker-latest:
-	docker build -t stieneee/mumble-discord-bridge:latest .
+	docker build -t stieneee/mumble-discord-bridge:latest -t stieneee/mumble-discord-bridge:$(LATEST_TAG) -t ghcr.io/stieneee/mumble-discord-bridge:latest -t ghcr.io/stieneee/mumble-discord-bridge:$(LATEST_TAG) .
 
 docker-latest-run:
 	docker run --env-file .env -it stieneee/mumble-discord-bridge:latest
 
+docker-release: 
+	docker push stieneee/mumble-discord-bridge:latest
+	docker push stieneee/mumble-discord-bridge:$(LATEST_TAG)
+	docker push ghcr.io/stieneee/mumble-discord-bridge:latest
+	docker push ghcr.io/stieneee/mumble-discord-bridge:$(LATEST_TAG)
+
 docker-next:
-	docker build -t stieneee/mumble-discord-bridge:next .
+	docker build -t stieneee/mumble-discord-bridge:next -t ghcr.io/stieneee/mumble-discord-bridge:next .
 	docker push stieneee/mumble-discord-bridge:next
+	docker push ghcr.io/stieneee/mumble-discord-bridge:next
 
 clean:
-	rm -f mumble-discord-bridge
+	rm -rf dist
+	rm -rf LICENSES.zip LICENSES
 
-.PHONY: release docker-latest docker-latest-push clean
\ No newline at end of file
+.PHONY: release dev dev-profile dev-race test-chart docker-latest docker-latest-release docker-release docker-next clean
\ No newline at end of file