diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c72910123..83490731b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -7,7 +7,7 @@
 * Pando85
 * Alberto Planas (aplanas)
 * Jake (slipperyBishop)
-* Charcol
+* Charelle (Charcol)
 * Leigh (excitedleigh)
 * Jamie (JJJollyjim)
 * Triss Healy (NiryaAestus)
diff --git a/Makefile b/Makefile
index 458fbe07f..a94a7a7c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: help build/kanidmd build/radiusd test/kanidmd push/kanidmd push/radiusd vendor-prep doc install-tools prep
 
 IMAGE_BASE ?= kanidm
-IMAGE_VERSION ?= latest
+IMAGE_VERSION ?= alpha
 
 .DEFAULT: help
 help:
@@ -16,6 +16,30 @@ build/radiusd:
 	@docker build -f kanidm_rlm_python/Dockerfile -t $(IMAGE_BASE)/radius:$(IMAGE_VERSION) \
 		kanidm_rlm_python
 
+build: build/kanidmd build/radiusd
+
+tag/kanidmd:
+	@docker tag $(IMAGE_BASE)/server:$(IMAGE_VERSION) $(IMAGE_BASE)/server:latest
+
+tag/radiusd:
+	@docker tag $(IMAGE_BASE)/radius:$(IMAGE_VERSION) $(IMAGE_BASE)/radius:latest
+
+tag: tag/kanidmd tag/radiusd
+
+push/kanidmd:	## push kanidmd images
+push/kanidmd:
+	@docker push $(IMAGE_BASE)/server:$(IMAGE_VERSION)
+
+push/radiusd:	## push radiusd image
+push/radiusd:
+	@docker push $(IMAGE_BASE)/radius:$(IMAGE_VERSION)
+
+push: build push/kanidmd push/radiusd
+
+pushlatest: build tag push
+	@docker push $(IMAGE_BASE)/server:latest
+	@docker push $(IMAGE_BASE)/radius:latest
+
 test/kanidmd:	## test kanidmd
 test/kanidmd:
 	@docker build -f kanidmd/Dockerfile \
@@ -26,14 +50,6 @@ test/kanidmd:
 
 test/radiusd:	build/radiusd	## test radiusd
 
-push/kanidmd:	## push kanidmd images
-push/kanidmd:
-	@docker push $(IMAGE_BASE)/server:$(IMAGE_VERSION)
-
-push/radiusd:	## push radiusd image
-push/radiusd:
-	@docker push $(IMAGE_BASE)/radius:$(IMAGE_VERSION)
-
 vendor-prep:
 	cargo vendor
 	tar -czf vendor.tar.gz vendor
@@ -54,3 +70,13 @@ update-version: ## update version form VERSION file in all Cargo.toml manifests
 update-version: */Cargo.toml
 	@VERSION=`cat VERSION`; sed -i "0,/^version\ \= .*$$/{s//version = \"$$VERSION\"/}" */Cargo.toml
 	@echo updated to version "`cat VERSION`" cargo files
+
+publish:
+	cd kanidm_proto; cargo package
+	cd kanidm_proto; cargo publish
+	cd kanidmd; cargo package
+	cd kanidmd; cargo publish
+	cd kanidm_client; cargo package
+	cd kanidm_client; cargo publish
+	cd kanidm_tools; cargo package
+	cd kanidm_tools; cargo publish
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 21dfab27e..721d5a791 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,7 +17,7 @@ and help of many people. I would especially like to thank:
 * Pando85
 * Alberto Planas (aplanas)
 * Jake (slipperyBishop)
-* Charcol
+* Charelle (Charcol)
 * Leigh (excitedleigh)
 * Jamie (JJJollyjim)
 * Triss Healy (NiryaAestus)
diff --git a/VERSION b/VERSION
index 950f8ca20..1c6f7dee7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0-rc10
+1.1.0-alpha