diff --git a/defaults/main.yml b/defaults/main.yml
index 4de444f95e1d387365f182a45d60ed258e0d6a73..1ade84841917879c801b4de84520580d7bf044d1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 # From https://hub.docker.com/r/alerta/alerta-web
-alerta_version_api: 8.5.0
+alerta_version_api: 8.7.0
 
 # From https://github.com/alerta/alerta-webui
-alerta_version_web_ui: 8.5.0
+alerta_version_web_ui: 8.7.0
diff --git a/templates/api/Dockerfile b/templates/api/Dockerfile
index 3b7bf50cc0040a0318c60e953620c9fe7eac96ce..1178cbeb55243c69d2286d79bfbfe0663c7ec7dd 100644
--- a/templates/api/Dockerfile
+++ b/templates/api/Dockerfile
@@ -6,8 +6,8 @@ RUN /venv/bin/pip install python-gitlab && \
     cd /tmp/plugins && \
     /venv/bin/python3 setup_alerta_gitlab.py install && \
     /venv/bin/python3 setup_alerta_elastalert.py install && \
-    cp alerta_gitlab.py /venv/lib/python3.7/site-packages/ && \
-    cp alerta_elastalert.py /venv/lib/python3.7/site-packages/ && \
+    cp alerta_gitlab.py /venv/lib/python3.8/site-packages/ && \
+    cp alerta_elastalert.py /venv/lib/python3.8/site-packages/ && \
     echo "Done"
 
 USER 1001
diff --git a/templates/webui/Dockerfile b/templates/webui/Dockerfile
index 0628729c60986e34fddded6254074ea7dc743948..42cc4acf4c2ece3b4f38ac1a3f543a1aafea665e 100644
--- a/templates/webui/Dockerfile
+++ b/templates/webui/Dockerfile
@@ -1,5 +1,5 @@
 # build stage
-FROM node:13-alpine as build-stage
+FROM node:14-alpine as build-stage
 
 RUN apk add --no-cache git
 WORKDIR /app