diff --git a/ecs/Dockerfile b/ecs/Dockerfile
index 9fa31d3..c321a8c 100644
--- a/ecs/Dockerfile
+++ b/ecs/Dockerfile
@@ -24,10 +24,10 @@ RUN mkdir runtime \
  && echo 'beam_lib:strip_files(filelib:wildcard("lib/*/ebin/*beam")), init:stop().' | erts*/bin/erl -boot start_clean >/dev/null \
  && mv erts*/bin/* bin \
  && rm -rf releases erts* bin/*src bin/dialyzer bin/typer \
- && rm bin/ejabberd bin/ejabberd.bat bin/ejabberd_loader.sh
+ && rm bin/ejabberd bin/ejabberd.bat
 
 # Runtime container
-FROM alpine:3.8
+FROM alpine:edge
 ARG VERSION
 ENV TERM=xterm \
     LC_ALL=C.UTF-8 \
@@ -71,7 +71,7 @@ RUN chmod 755 bin/ejabberdctl bin/ejabberdapi bin/erl
 COPY --chown=ejabberd:ejabberd conf conf/
 ADD --chown=ejabberd:ejabberd https://download.process-one.net/cacert.pem conf/cacert.pem
 
-# Set up runtime environment
+# Setup runtime environment
 USER ejabberd
 VOLUME ["$HOME/database","$HOME/conf","$HOME/logs"]
 EXPOSE 5222 5269 5280 5443
diff --git a/ecs/build.sh b/ecs/build.sh
index adb0d30..5f4f548 100755
--- a/ecs/build.sh
+++ b/ecs/build.sh
@@ -4,4 +4,4 @@ current=$(date +%y.%m)
 version=${1:-$current}
 
 docker build --build-arg VERSION=$version -t ejabberd/ecs:$version .
-docker tag ejabberd/ecs:$version ejabberd/ecs:latest
+[ "$version" = "latest" ] || docker tag ejabberd/ecs:$version ejabberd/ecs:latest
diff --git a/mix/Dockerfile b/mix/Dockerfile
index 7410a56..1ae6f8e 100644
--- a/mix/Dockerfile
+++ b/mix/Dockerfile
@@ -1,11 +1,11 @@
-FROM alpine:3.8
+FROM alpine:edge
 LABEL maintainer="ProcessOne <contact@process-one.net>" \
       product="Ejabberd mix development environment"
 
 # Install required dependencies
 RUN apk upgrade --update musl \
  && apk add build-base git zlib-dev openssl-dev yaml-dev expat-dev sqlite-dev \
-            gd-dev jpeg-dev libpng-dev libwebp-dev autoconf automake \
+            gd-dev jpeg-dev libpng-dev libwebp-dev autoconf automake bash \
             elixir erlang-crypto erlang-eunit erlang-mnesia erlang-erts erlang-hipe \
             erlang-tools erlang-os-mon erlang-syntax-tools erlang-parsetools \
             erlang-runtime-tools erlang-reltool file curl \