diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3bbaaed
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.gitlab
diff --git a/Makefile b/Makefile
index c196881..f5ca9c1 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ IMAGE ?= $(shell cat IMAGE):$(VERSION)
 IMAGE_LATEST ?= $(shell cat IMAGE):latest
 PWD ?= $(shell pwd)
 STASH ?= "common-update-stash"
+MAKE_BRANCH ?= main
 
 include .gitlab/make/docker.makefile
 include .gitlab/make/helm.makefile
@@ -14,6 +15,7 @@ include .gitlab/make/truenas.makefile
 include .gitlab/make/git.makefile
 include .gitlab/make/kubectl.makefile
 
+# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
 .PHONY: make-update
 make-update:
-	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
+	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
diff --git a/make/docker.makefile b/make/docker.makefile
index 23e4a52..08fa671 100644
--- a/make/docker.makefile
+++ b/make/docker.makefile
@@ -3,27 +3,21 @@ docker-init:
 	@touch VERSION
 	@touch IMAGE
 
-.PHONY: buildx-context
-buildx-context:
-	docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
+.PHONY: docker-buildx-context
+docker-buildx-context:
+	@docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
 
-.PHONY: buildx-clear
-buildx-clear:
-	docker buildx rm container-builder
+.PHONY: docker-buildx-clear
+docker-buildx-clear:
+	@docker buildx rm container-builder
 
-.PHONY: build
-build:
-	docker buildx build --load . -t $(IMAGE)
-	@docker buildx build --load . -t $(IMAGE_LATEST)
+.PHONY: docker-build
+docker-build:
+	docker build . -t $(IMAGE)
 
-.PHONY: push
-push:
-	-make buildx-clear
-	@make buildx-context
+.PHONY: docker-push
+docker-push:
+	-make docker-buildx-clear
+	@make docker-buildx-context
 	docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE)
 	@docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST)
-
-.PHONY: docker-release
-docker-release:
-	@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
-	@make push