diff --git a/docker-compose.yml b/docker-compose.yml
index 9023036cf..6fb927285 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,11 +46,11 @@ services:
       - cache
     env_file: services.env
   cache:
-    image: redis:alpine
+    image: redis:latest
 
   # SHARED
   message-bus:
-    image: redis:alpine
+    image: redis:latest
 
   # UPLINK
   haproxy:
diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
index 99657bdc7..eeb2854df 100644
--- a/haproxy/Dockerfile
+++ b/haproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:2.0.8-alpine
+FROM haproxy
 COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
 COPY src/prod-haproxy.cfg /usr/local/etc/haproxy/prod-haproxy.cfg
 CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/prod-haproxy.cfg"]
diff --git a/haproxy/Dockerfile.dev b/haproxy/Dockerfile.dev
index 73d2638e0..4f60b1762 100644
--- a/haproxy/Dockerfile.dev
+++ b/haproxy/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM haproxy:2.0.8-alpine
+FROM haproxy
 COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
 COPY src/dev-haproxy.cfg /usr/local/etc/haproxy/dev-haproxy.cfg
 CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/dev-haproxy.cfg"]