diff --git a/.env b/.env
index 47d92f25..cfdb6840 100644
--- a/.env
+++ b/.env
@@ -25,6 +25,9 @@ HOSTNAME=mail.freeposte.io
 # Postmaster local part (will append the main mail domain)
 POSTMASTER=admin
 
+# Choose which webmail to run if any (values: roundcube, none)
+WEBMAIL=none
+
 # Networks granted relay permissions, make sure that you include your Docker
 # internal network (default to 172.17.0.0/16)
 RELAYNETS=172.16.0.0/12
diff --git a/docker-compose.yml b/docker-compose.yml
index c47b9511..12871c20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -84,8 +84,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
 
   webmail:
-    # build: roundcube
-    image: freeposte/roundcube
+    # build: "$WEBMAIL"
+    image: "freeposte/$WEBMAIL"
     restart: always
     env_file: .env
     volumes:
diff --git a/none/Dockerfile b/none/Dockerfile
new file mode 100644
index 00000000..979699df
--- /dev/null
+++ b/none/Dockerfile
@@ -0,0 +1,5 @@
+# This is an idle image to dynamically replace any component if disabled.
+
+FROM alpine
+
+CMD sleep 1000000d