diff --git a/contrib/alertmanager-arm64/v0.15.0/Dockerfile b/contrib/alertmanager-arm64/v0.15.0/Dockerfile
new file mode 100644
index 00000000..843ce2f1
--- /dev/null
+++ b/contrib/alertmanager-arm64/v0.15.0/Dockerfile
@@ -0,0 +1,17 @@
+FROM alpine:3.7
+WORKDIR /root
+RUN apk add --update libarchive-tools
+ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-arm64.tar.gz /root/
+RUN bsdtar -xvf *.tar.gz -C ./ --strip-components=1
+RUN mkdir /etc/alertmanager
+
+RUN cp alertmanager               /bin/alertmanager
+RUN cp alertmanager.yml           /etc/alertmanager/alertmanager.yml
+
+EXPOSE     9093
+VOLUME     [ "/alertmanager" ]
+WORKDIR    /alertmanager
+
+ENTRYPOINT [ "/bin/alertmanager" ]
+CMD        [ "--config.file=/etc/alertmanager/alertmanager.yml", \
+             "--storage.path=/alertmanager" ]
diff --git a/contrib/alertmanager-arm64/v0.15.0/Makefile b/contrib/alertmanager-arm64/v0.15.0/Makefile
new file mode 100644
index 00000000..c06100b8
--- /dev/null
+++ b/contrib/alertmanager-arm64/v0.15.0/Makefile
@@ -0,0 +1,3 @@
+build:
+	docker build -t alexellis2/alertmanager:v0.15.0-arm64 .
+
diff --git a/contrib/alertmanager-armhf/0.15.0-rc.0/README.md b/contrib/alertmanager-arm64/v0.15.0/README.md
similarity index 100%
rename from contrib/alertmanager-armhf/0.15.0-rc.0/README.md
rename to contrib/alertmanager-arm64/v0.15.0/README.md
diff --git a/contrib/alertmanager-armhf/0.15.0-rc.0/Dockerfile b/contrib/alertmanager-armhf/0.15.0/Dockerfile
similarity index 59%
rename from contrib/alertmanager-armhf/0.15.0-rc.0/Dockerfile
rename to contrib/alertmanager-armhf/0.15.0/Dockerfile
index d9174010..d5631eb6 100644
--- a/contrib/alertmanager-armhf/0.15.0-rc.0/Dockerfile
+++ b/contrib/alertmanager-armhf/0.15.0/Dockerfile
@@ -1,16 +1,17 @@
-FROM alpine:3.6
+FROM alpine:3.7
 WORKDIR /root
 RUN apk add --update libarchive-tools
-ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0-rc.0/alertmanager-0.15.0-rc.0.linux-armv7.tar.gz /root/
+ADD https://github.com/prometheus/alertmanager/releases/download/v0.15.0/alertmanager-0.15.0.linux-armv7.tar.gz /root/
 RUN bsdtar -xvf *.tar.gz -C ./ --strip-components=1
 RUN mkdir /etc/alertmanager
 
 RUN cp alertmanager               /bin/alertmanager
-RUN cp simple.yml    /etc/alertmanager/config.yml
+RUN cp alertmanager.yml /etc/alertmanager/alertmanager.yml
 
 EXPOSE     9093
 VOLUME     [ "/alertmanager" ]
 WORKDIR    /alertmanager
+
 ENTRYPOINT [ "/bin/alertmanager" ]
-CMD        [ "-config.file=/etc/alertmanager/config.yml", \
-             "-storage.path=/alertmanager" ]
\ No newline at end of file
+CMD        [ "--config.file=/etc/alertmanager/alertmanager.yml", \
+             "--storage.path=/alertmanager" ]
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..4fa2f044
--- /dev/null
+++ b/contrib/alertmanager-armhf/0.15.0/README.md
@@ -0,0 +1,5 @@
+Building:
+
+```
+docker build -t functions/alertmanager:0.15.0-rc.0-armhf .
+```
diff --git a/contrib/prometheus-arm64/1.5.2/Dockerfile b/contrib/prometheus-arm64/1.5.2/Dockerfile
deleted file mode 100644
index 7c41b763..00000000
--- a/contrib/prometheus-arm64/1.5.2/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM alpine:3.6
-
-workdir /root
-RUN apk add --update libarchive-tools
-
-ADD https://github.com/prometheus/prometheus/releases/download/v1.5.2/prometheus-1.5.2.linux-arm64.tar.gz /root/
-RUN bsdtar -xvf prometheus-*.tar.gz -C ./ --strip-components=1
-
-RUN mkdir -p /usr/share/prometheus
-RUN mkdir -p /etc/prometheus
-
-RUN cp prometheus                             /bin/prometheus
-RUN cp promtool                               /bin/promtool
-RUN cp prometheus.yml  /etc/prometheus/prometheus.yml
-RUN cp -r console_libraries/                     /usr/share/prometheus/console_libraries/
-RUN cp -r consoles/                              /usr/share/prometheus/consoles/
-
-#RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/
-
-EXPOSE     9090
-VOLUME     [ "/prometheus" ]
-WORKDIR    /prometheus
-ENTRYPOINT [ "/bin/prometheus" ]
-CMD        [ "-config.file=/etc/prometheus/prometheus.yml", \
-             "-storage.local.path=/prometheus", \
-             "-web.console.libraries=/usr/share/prometheus/console_libraries", \
-             "-web.console.templates=/usr/share/prometheus/consoles" ]
-
diff --git a/contrib/prometheus-arm64/2.1/Dockerfile b/contrib/prometheus-arm64/2.1/Dockerfile
deleted file mode 100644
index 744ed236..00000000
--- a/contrib/prometheus-arm64/2.1/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM alpine:3.6
-WORKDIR /root/
-
-RUN apk add --update libarchive-tools curl \
-    && curl -sLf https://github.com/prometheus/prometheus/releases/download/v2.1.0/prometheus-2.1.0.linux-armv7.tar.gz > prometheus.tar.gz \
-    && bsdtar -xvf prometheus.tar.gz -C ./ --strip-components=1 \
-    && apk del libarchive-tools curl \
-    && mkdir /etc/prometheus \
-    && mkdir -p /usr/share/prometheus \
-    && cp prometheus                             /bin/prometheus \
-    && cp promtool                               /bin/promtool \
-    && cp prometheus.yml  				/etc/prometheus/ \
-    && cp -r console_libraries                     /usr/share/prometheus/ \
-    && cp -r consoles                              /usr/share/prometheus/ \
-    && rm -rf /root/*
-
-RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/
-RUN mkdir -p /prometheus && \
-    chown -R nobody:nogroup /etc/prometheus /prometheus
-
-USER       nobody
-EXPOSE     9090
-VOLUME     [ "/prometheus" ]
-WORKDIR    /prometheus
-ENTRYPOINT [ "/bin/prometheus" ]
-CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \
-             "--storage.tsdb.path=/prometheus", \
-             "--web.console.libraries=/usr/share/prometheus/console_libraries", \
-             "--web.console.templates=/usr/share/prometheus/consoles" ]
-
-
diff --git a/contrib/prometheus-arm64/2.2/Makefile b/contrib/prometheus-arm64/2.2/Makefile
deleted file mode 100644
index e00cd50b..00000000
--- a/contrib/prometheus-arm64/2.2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-build:
-	docker build -t alexellis2/prometheus:2.2.0-arm64 .
-
diff --git a/contrib/prometheus-arm64/2.2/Dockerfile b/contrib/prometheus-arm64/2.3/Dockerfile
similarity index 95%
rename from contrib/prometheus-arm64/2.2/Dockerfile
rename to contrib/prometheus-arm64/2.3/Dockerfile
index ad570fc2..9eee0221 100644
--- a/contrib/prometheus-arm64/2.2/Dockerfile
+++ b/contrib/prometheus-arm64/2.3/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 WORKDIR /root/
 
 RUN apk add --update libarchive-tools curl \
-    && curl -sLf https://github.com/prometheus/prometheus/releases/download/v2.2.0/prometheus-2.2.0.linux-armv7.tar.gz > prometheus.tar.gz \
+    && curl -sLf https://github.com/prometheus/prometheus/releases/download/v2.3.1/prometheus-2.3.1.linux-arm64.tar.gz > prometheus.tar.gz \
     && bsdtar -xvf prometheus.tar.gz -C ./ --strip-components=1 \
     && apk del libarchive-tools curl \
     && mkdir /etc/prometheus \
@@ -22,6 +22,7 @@ USER       nobody
 EXPOSE     9090
 VOLUME     [ "/prometheus" ]
 WORKDIR    /prometheus
+
 ENTRYPOINT [ "/bin/prometheus" ]
 CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \
              "--storage.tsdb.path=/prometheus", \
diff --git a/contrib/prometheus-arm64/2.3/Makefile b/contrib/prometheus-arm64/2.3/Makefile
new file mode 100644
index 00000000..6bd27a1e
--- /dev/null
+++ b/contrib/prometheus-arm64/2.3/Makefile
@@ -0,0 +1,3 @@
+build:
+	docker build -t alexellis2/prometheus:2.3.1-arm64 .
+