diff --git a/contrib/alertmanager-arm64/v0.15.0/Dockerfile b/contrib/alertmanager-arm64/0.15.0/Dockerfile
similarity index 100%
rename from contrib/alertmanager-arm64/v0.15.0/Dockerfile
rename to contrib/alertmanager-arm64/0.15.0/Dockerfile
diff --git a/contrib/alertmanager-arm64/0.15.0/Makefile b/contrib/alertmanager-arm64/0.15.0/Makefile
new file mode 100644
index 00000000..d7b7b40d
--- /dev/null
+++ b/contrib/alertmanager-arm64/0.15.0/Makefile
@@ -0,0 +1,7 @@
+.PHONY: ci-arm64-build
+ci-arm64-build:
+	docker build -t functions/alertmanager:0.15.0-arm64 .
+
+.PHONY: ci-arm64-push
+ci-arm64-push:
+	docker push functions/alertmanager:0.15.0-arm64
\ No newline at end of file
diff --git a/contrib/alertmanager-arm64/0.15.0/README.md b/contrib/alertmanager-arm64/0.15.0/README.md
new file mode 100644
index 00000000..55479d84
--- /dev/null
+++ b/contrib/alertmanager-arm64/0.15.0/README.md
@@ -0,0 +1,13 @@
+# Alertmanager for ARM64
+
+## Building:
+
+```bash
+make ci-arm64-build
+```
+
+## Pushing:
+
+```bash
+make ci-arm64-push
+```
diff --git a/contrib/alertmanager-arm64/v0.15.0/Makefile b/contrib/alertmanager-arm64/v0.15.0/Makefile
deleted file mode 100644
index 97ad3434..00000000
--- a/contrib/alertmanager-arm64/v0.15.0/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-build:
-	docker build -t functions/alertmanager:v0.15.0-arm64 .
\ No newline at end of file
diff --git a/contrib/alertmanager-arm64/v0.15.0/README.md b/contrib/alertmanager-arm64/v0.15.0/README.md
deleted file mode 100644
index 8ad780e4..00000000
--- a/contrib/alertmanager-arm64/v0.15.0/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Building:
-
-```bash
-docker build -t functions/alertmanager:0.15.0-rc.0-arm64 .
-docker push functions/alertmanager:0.15.0-rc.0-arm64
-```
diff --git a/contrib/alertmanager-armhf/0.15.0/Makefile b/contrib/alertmanager-armhf/0.15.0/Makefile
index 6d4773d2..dbc45436 100644
--- a/contrib/alertmanager-armhf/0.15.0/Makefile
+++ b/contrib/alertmanager-armhf/0.15.0/Makefile
@@ -1,3 +1,7 @@
-build:
-	docker build -t alexellis2/alertmanager:v0.15.0-armv7 .
+.PHONY: ci-armhf-build
+ci-armhf-build:
+	docker build -t functions/alertmanager:0.15.0-armhf .
 
+.PHONY: ci-armhf-push
+ci-armhf-push:
+	docker push functions/alertmanager:0.15.0-armhf
\ No newline at end of file
diff --git a/contrib/alertmanager-armhf/0.15.0/README.md b/contrib/alertmanager-armhf/0.15.0/README.md
new file mode 100644
index 00000000..820ff935
--- /dev/null
+++ b/contrib/alertmanager-armhf/0.15.0/README.md
@@ -0,0 +1,13 @@
+# Alertmanager for ARMHF
+
+## Building:
+
+```bash
+make ci-armhf-build
+```
+
+## Pushing:
+
+```bash
+make ci-armhf-push
+```