diff --git a/docker-compose.yml b/docker-compose.yml
index 76cf776..ff9517c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3'
 services:
     # Frontend
     web:
-        image: jitsi/web:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
             - '${HTTPS_PORT}:443'
@@ -140,8 +140,8 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
             - '5347'
@@ -225,8 +225,8 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
         environment:
@@ -275,8 +275,8 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
             - '127.0.0.1:${JVB_COLIBRI_PORT:-8080}:8080'
diff --git a/env.example b/env.example
index 66948ea..4595f10 100644
--- a/env.example
+++ b/env.example
@@ -177,9 +177,6 @@ ETHERPAD_SKIN_VARIANTS="super-light-toolbar super-light-editor light-background
 # Wether to use starttls, implies LDAPv3 and requires ldap:// instead of ldaps://
 # LDAP_START_TLS=1
 
-# Container restart policy
-RESTART_POLICY=unless-stopped
-
 
 #
 # Security
@@ -206,3 +203,12 @@ JIBRI_RECORDER_PASSWORD=
 # XMPP password for Jibri client connections
 JIBRI_XMPP_PASSWORD=
 
+#
+# Docker Compose options
+#
+
+# Container restart policy
+#RESTART_POLICY=unless-stopped
+
+# Jitsi image version (useful for local development)
+#JITSI_IMAGE_VERSION=latest
diff --git a/etherpad.yml b/etherpad.yml
index bab9378..d5e3483 100644
--- a/etherpad.yml
+++ b/etherpad.yml
@@ -4,7 +4,7 @@ services:
     # Etherpad: real-time collaborative document editing
     etherpad:
         image: etherpad/etherpad:1.8.6
-        restart: ${RESTART_POLICY}
+        restart: ${RESTART_POLICY:-unless-stopped}
         environment:
             - TITLE=${ETHERPAD_TITLE}
             - DEFAULT_PAD_TEXT=${ETHERPAD_DEFAULT_PAD_TEXT}
diff --git a/jibri.yml b/jibri.yml
index c6807ac..e417979 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,8 +2,8 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
             - /dev/shm:/dev/shm
diff --git a/jigasi.yml b/jigasi.yml
index ac434a0..3ca4c84 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,8 +3,8 @@ version: '3'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:unstable
-        restart: ${RESTART_POLICY}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
         volumes: