diff --git a/.env b/.env
index 91e697f..65df34f 100644
--- a/.env
+++ b/.env
@@ -1,11 +1,12 @@
 # Replace 172.17.0.1 with your Docker Host IP for development!
 # It should be the docker0 inet address.
 PUBLIC_PWA_GATEWAY_URI=http://172.17.0.1:12000
 PUBLIC_KEYCLOAK_URI=http://172.17.0.1:9080
 KEYCLOAK_AUTH_REALM=wikitolearn-local
 KEYCLOAK_FRONTEND_CLIENT_ID=frontend
 PWA_GATEWAY_URI=http://172.17.0.1:12000
 KEYCLOAK_URI=http://172.17.0.1:9080
 PWA_BUILD_LANGUAGE=en
 DOCKER_REGISTRY=
+DOCKER_IMAGE_FRONTEND_TAG=latest
 SERVICE_PORT=13000
diff --git a/docker-compose.yml b/docker-compose.yml
index c65ab64..e9f581a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,24 @@
 version: "3.4"
 services:
   frontend:
     build:
       context: ./
       args:
         SERVICE_PORT: ${SERVICE_PORT}
         BUILD_LANGUAGE: ${PWA_BUILD_LANGUAGE}
-    image: "${DOCKER_REGISTRY}wikitolearn/frontend-${PWA_BUILD_LANGUAGE}"
+    image: "${DOCKER_REGISTRY}wikitolearn/frontend-${PWA_BUILD_LANGUAGE}:${DOCKER_IMAGE_FRONTEND_TAG}"
+    deploy:
+      mode: global
+      update_config:
+        parallelism: 1
+        delay: 120s
+        order: start-first
     environment:
       PUBLIC_PWA_GATEWAY_URI: ${PUBLIC_PWA_GATEWAY_URI}
       PUBLIC_KEYCLOAK_URI: ${PUBLIC_KEYCLOAK_URI}
       KEYCLOAK_AUTH_REALM: ${KEYCLOAK_AUTH_REALM}
       KEYCLOAK_FRONTEND_CLIENT_ID: ${KEYCLOAK_FRONTEND_CLIENT_ID}
       PWA_GATEWAY_URI: ${PWA_GATEWAY_URI}
       KEYCLOAK_URI: ${KEYCLOAK_URI}
     ports:
       - "${SERVICE_PORT}:${SERVICE_PORT}"