diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
--- a/pillar/paas/docker.sls
+++ b/pillar/paas/docker.sls
@@ -32,7 +32,7 @@
     - nasqueron/mysql
     # Infrastructure and development services
     - nasqueron/aphlict
-    - nasqueron/etherpad
+    - nasqueron/etherpad:production
     - nasqueron/phabricator
     # Continuous deployment jobs
     - jenkinsci/jenkins
diff --git a/roles/paas-docker/containers/etherpad.sls b/roles/paas-docker/containers/etherpad.sls
--- a/roles/paas-docker/containers/etherpad.sls
+++ b/roles/paas-docker/containers/etherpad.sls
@@ -38,7 +38,7 @@
   docker_container.running:
     - detach: True
     - interactive: True
-    - image: nasqueron/etherpad
+    - image: nasqueron/etherpad:production
     - links: {{ container['mysql_link'] }}:mysql
     - binds: /srv/{{ instance }}/var:/opt/etherpad-lite/var
     - ports: