diff --git a/aws-cli/.gitignore b/aws-cli/.gitignore
index f85f5c1..8865661 100644
--- a/aws-cli/.gitignore
+++ b/aws-cli/.gitignore
@@ -3,3 +3,4 @@
 !Dockerfile
 !README.md
 !run.sh
+!Makefile
diff --git a/aws-cli/Makefile b/aws-cli/Makefile
new file mode 100644
index 0000000..116cfd4
--- /dev/null
+++ b/aws-cli/Makefile
@@ -0,0 +1,27 @@
+DOCKER_REGISTRY = dr.ys-dev.cz
+DOCKER_PUBLIC_REGISTRY = yoursystemcz
+APP_NAME = aws-cli
+
+all: build release clean
+
+version/3.5: IMAGE_VERSION=3.5
+version/latest: IMAGE_VERSION=3.6
+
+version/%:
+	docker build -t $(DOCKER_REGISTRY)/$(APP_NAME):$* --build-arg "IMAGE_NAME=alpine" --build-arg "IMAGE_VERSION=$(IMAGE_VERSION)" .
+
+release/%:
+	docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$* $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
+	docker push $(DOCKER_REGISTRY)/$(APP_NAME):$*
+	docker push $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
+
+clean/%:
+	docker rmi $(DOCKER_REGISTRY)/$(APP_NAME):$*
+	docker rmi $(DOCKER_PUBLIC_REGISTRY)/$(APP_NAME):$*
+
+
+build: version/3.5 version/latest
+
+release: release/3.5 release/latest
+
+clean: clean/3.5 clean/latest
diff --git a/aws-cli/run.sh b/aws-cli/run.sh
index 7e3c530..ed54d81 100755
--- a/aws-cli/run.sh
+++ b/aws-cli/run.sh
@@ -3,7 +3,7 @@
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
 IMAGE_NAME="alpine"
-IMAGE_VERSION="3.4"
+IMAGE_VERSION="3.6"
 
 SERVICE_NAME=aws-cli