diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index fe7fbff935..959da01e7c 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -6,27 +6,32 @@ labels: bug
 assignees: ""
 ---
 
-**Describe the bug**
+## Describe the bug
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## To Reproduce
+
 Steps to reproduce the behavior:
 
 1. I installed Airy using '...'
 2. When I ran command / did this in the UI
 3. See error
 
-**Expected behavior**
+## Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+## Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
+## Environment
 
 - OS: [e.g. iOS]
-- Browser [e.g. Chrome, Safari]
-- Version [e.g. 22]
+- Browser: [e.g. Chrome, Safari]
+- Version: [e.g. 22]
+
+## Additional context
 
-**Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
index 7340299129..bb3769891f 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -6,14 +6,18 @@ labels: feature, needs discussion
 assignees: ""
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe.
+
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
+
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
+
 Add any other context or screenshots about the feature request here.
diff --git a/VERSION b/VERSION
index 48f7a71df4..ae6dd4e203 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.28.1
+0.29.0
diff --git a/WORKSPACE b/WORKSPACE
index 472f42dcad..e0b5612d34 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -9,9 +9,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 # Airy Bazel tools
 git_repository(
     name = "com_github_airyhq_bazel_tools",
-    commit = "2b34bc2b2c6fed64e4bb223d4624e06eda390e4d",
+    commit = "583a2e52c6941945ab5934585d5df8fff61b112f",
     remote = "https://github.com/airyhq/bazel-tools.git",
-    shallow_since = "1625065439 +0200",
+    shallow_since = "1629796332 +0200",
 )
 
 load("@com_github_airyhq_bazel_tools//:repositories.bzl", "airy_bazel_tools_dependencies", "airy_jvm_deps")
diff --git a/backend/api/admin/BUILD b/backend/api/admin/BUILD
index a51240b54f..0ff228bab7 100644
--- a/backend/api/admin/BUILD
+++ b/backend/api/admin/BUILD
@@ -11,6 +11,7 @@ app_deps = [
     "//backend:webhook",
     "//backend/model/metadata",
     "//backend/model/template",
+    "//backend/model/event",
     "//lib/java/uuid",
     "//lib/java/spring/auth:spring-auth",
     "//lib/java/spring/web:spring-web",
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/Stores.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/Stores.java
index 0f712873ce..91512a614c 100644
--- a/backend/api/admin/src/main/java/co/airy/core/api/admin/Stores.java
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/Stores.java
@@ -47,13 +47,9 @@ public class Stores implements HealthIndicator, ApplicationListener<ApplicationS
 
     private final String connectedChannelsStore = "connected-channels-store";
     private final String tagsStore = "tags-store";
-    private final String webhooksStore = "webhook-store";
+    private final String webhooksStore = "webhooks-store";
     private final String templatesStore = "templates-store";
 
-    // Using a UUID as the default key for the webhook will make it easier
-    // to add multiple webhooks if that ever becomes a requirement
-    private final String allWebhooksKey = "339ab777-92aa-43a5-b452-82e73c50fc59";
-
     private final String applicationCommunicationChannels = new ApplicationCommunicationChannels().name();
     private final String applicationCommunicationWebhooks = new ApplicationCommunicationWebhooks().name();
     private final String applicationCommunicationTags = new ApplicationCommunicationTags().name();
@@ -79,9 +75,7 @@ public void onApplicationEvent(ApplicationStartedEvent event) {
                 .filter((k, v) -> v.getConnectionState().equals(ChannelConnectionState.CONNECTED))
                 .leftJoin(metadataTable, ChannelContainer::new, Materialized.as(connectedChannelsStore));
 
-        builder.<String, Webhook>stream(applicationCommunicationWebhooks)
-                .groupBy((webhookId, webhook) -> allWebhooksKey)
-                .reduce((oldValue, newValue) -> newValue, Materialized.as(webhooksStore));
+        builder.<String, Webhook>table(applicationCommunicationWebhooks, Materialized.as(webhooksStore));
 
         builder.<String, Tag>table(applicationCommunicationTags, Materialized.as(tagsStore));
 
@@ -99,8 +93,7 @@ public ReadOnlyKeyValueStore<String, Tag> getTagsStore() {
     }
 
     public void storeWebhook(Webhook webhook) throws ExecutionException, InterruptedException {
-        webhook.setId(allWebhooksKey);
-        producer.send(new ProducerRecord<>(applicationCommunicationWebhooks, allWebhooksKey, webhook)).get();
+        producer.send(new ProducerRecord<>(applicationCommunicationWebhooks, webhook.getId(), webhook)).get();
     }
 
     public void storeChannelContainer(ChannelContainer container) throws ExecutionException, InterruptedException {
@@ -172,9 +165,16 @@ public List<Template> getTemplates() {
         return templates;
     }
 
-    public Webhook getWebhook() {
+    public Webhook getWebhook(String webhookId) {
         final ReadOnlyKeyValueStore<String, Webhook> webhookStore = getWebhookStore();
-        return webhookStore.get(allWebhooksKey);
+        return webhookStore.get(webhookId);
+    }
+
+    public List<Webhook> getWebhooks() {
+        final KeyValueIterator<String, Webhook> iterator = getWebhookStore().all();
+        List<Webhook> webhooks = new ArrayList<>();
+        iterator.forEachRemaining(kv -> webhooks.add(kv.value));
+        return webhooks;
     }
 
     @Override
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java
index 089acde0a8..30a42f8a08 100644
--- a/backend/api/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/WebhooksController.java
@@ -2,11 +2,16 @@
 
 import co.airy.avro.communication.Status;
 import co.airy.avro.communication.Webhook;
-import co.airy.core.api.admin.payload.GetWebhookResponse;
-import co.airy.core.api.admin.payload.WebhookSubscriptionPayload;
+import co.airy.core.api.admin.payload.WebhookListResponsePayload;
+import co.airy.core.api.admin.payload.WebhookResponsePayload;
+import co.airy.core.api.admin.payload.WebhookInfoRequestPayload;
+import co.airy.core.api.admin.payload.WebhookSubscribePayload;
+import co.airy.core.api.admin.payload.WebhookUnsubscribePayload;
 import co.airy.core.api.config.ServiceDiscovery;
 import co.airy.core.api.config.dto.ComponentInfo;
+import co.airy.model.event.payload.EventType;
 import co.airy.spring.web.payload.RequestErrorResponsePayload;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +19,12 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
 @RestController
 public class WebhooksController {
@@ -28,7 +37,7 @@ public WebhooksController(Stores stores, ServiceDiscovery serviceDiscovery) {
     }
 
     @PostMapping("/webhooks.subscribe")
-    public ResponseEntity<?> subscribe(@RequestBody @Valid WebhookSubscriptionPayload payload) {
+    public ResponseEntity<?> subscribe(@RequestBody @Valid WebhookSubscribePayload payload) {
         final ComponentInfo component = serviceDiscovery.getComponent("integration-webhook");
         if (component == null || !component.isEnabled()) {
             return ResponseEntity.status(HttpStatus.CONFLICT)
@@ -39,11 +48,16 @@ public ResponseEntity<?> subscribe(@RequestBody @Valid WebhookSubscriptionPayloa
                     .body(new RequestErrorResponsePayload("The webhook component is enabled, but not healthy. Check the Kubernetes cluster state."));
         }
 
+        final UUID id = Optional.ofNullable(payload.getId()).orElse(UUID.randomUUID());
+
         final Webhook webhook = Webhook.newBuilder()
-                .setId(UUID.randomUUID().toString())
-                .setEndpoint(payload.getUrl())
+                .setId(id.toString())
+                .setEvents(payload.getEvents().stream().map(EventType::getEventType).collect(Collectors.toList()))
+                .setEndpoint(payload.getUrl().toString())
                 .setStatus(Status.Subscribed)
                 .setHeaders(payload.getHeaders())
+                .setSignKey(payload.getSignatureKey())
+                .setSubscribedAt(Instant.now().toEpochMilli())
                 .build();
 
         try {
@@ -56,11 +70,13 @@ public ResponseEntity<?> subscribe(@RequestBody @Valid WebhookSubscriptionPayloa
     }
 
     @PostMapping("/webhooks.unsubscribe")
-    public ResponseEntity<?> unsubscribe() {
-        Webhook webhook = stores.getWebhook();
-
+    public ResponseEntity<?> unsubscribe(@RequestBody @Valid WebhookUnsubscribePayload payload) {
+        Webhook webhook = stores.getWebhook(payload.getId().toString());
         if (webhook == null) {
-            return ResponseEntity.ok().build();
+            return ResponseEntity.notFound().build();
+        }
+        if (webhook.getStatus().equals(Status.Unsubscribed)) {
+            return ResponseEntity.status(HttpStatus.OK).body(fromWebhook(webhook));
         }
 
         webhook.setStatus(Status.Unsubscribed);
@@ -75,9 +91,8 @@ public ResponseEntity<?> unsubscribe() {
     }
 
     @PostMapping("/webhooks.info")
-    public ResponseEntity<GetWebhookResponse> webhookInfo() {
-        final Webhook webhook = stores.getWebhook();
-
+    public ResponseEntity<WebhookResponsePayload> webhookInfo(@RequestBody @Valid WebhookInfoRequestPayload payload) {
+        final Webhook webhook = stores.getWebhook(payload.getId().toString());
         if (webhook == null) {
             return ResponseEntity.notFound().build();
         }
@@ -85,8 +100,16 @@ public ResponseEntity<GetWebhookResponse> webhookInfo() {
         return ResponseEntity.status(HttpStatus.OK).body(fromWebhook(webhook));
     }
 
-    private GetWebhookResponse fromWebhook(Webhook webhook) {
-        return GetWebhookResponse.builder()
+    @PostMapping("/webhooks.list")
+    public ResponseEntity<WebhookListResponsePayload> webhookList() {
+        final List<WebhookResponsePayload> webhooks = stores.getWebhooks().stream().map(this::fromWebhook).collect(Collectors.toList());
+        return ResponseEntity.status(HttpStatus.OK).body(new WebhookListResponsePayload(webhooks));
+    }
+
+    private WebhookResponsePayload fromWebhook(Webhook webhook) {
+        return WebhookResponsePayload.builder()
+                .id(webhook.getId())
+                .events(webhook.getEvents())
                 .headers(webhook.getHeaders())
                 .status(webhook.getStatus().toString())
                 .url(webhook.getEndpoint())
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java
new file mode 100644
index 0000000000..04bf897fbb
--- /dev/null
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookInfoRequestPayload.java
@@ -0,0 +1,16 @@
+package co.airy.core.api.admin.payload;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WebhookInfoRequestPayload {
+    @NotNull
+    private UUID id;
+}
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java
new file mode 100644
index 0000000000..b18f6a5d94
--- /dev/null
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookListResponsePayload.java
@@ -0,0 +1,14 @@
+package co.airy.core.api.admin.payload;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebhookListResponsePayload {
+    private List<WebhookResponsePayload> data;
+}
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/GetWebhookResponse.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java
similarity index 60%
rename from backend/api/admin/src/main/java/co/airy/core/api/admin/payload/GetWebhookResponse.java
rename to backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java
index 8a5b21adb1..b193752d39 100644
--- a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/GetWebhookResponse.java
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookResponsePayload.java
@@ -3,12 +3,16 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
 @Builder
-public class GetWebhookResponse {
+public class WebhookResponsePayload {
+    private String id;
+    private String name;
     private String status;
     private String url;
     private Map<String, String> headers;
+    private List<String> events;
 }
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java
new file mode 100644
index 0000000000..4f243570d8
--- /dev/null
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscribePayload.java
@@ -0,0 +1,26 @@
+package co.airy.core.api.admin.payload;
+
+import co.airy.model.event.payload.EventType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebhookSubscribePayload {
+    private UUID id;
+    @NotNull
+    private URI url;
+    private Map<String, String> headers = new HashMap<>();
+    private List<EventType> events = new ArrayList<>();
+    private String signatureKey;
+}
diff --git a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscriptionPayload.java b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java
similarity index 69%
rename from backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscriptionPayload.java
rename to backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java
index c8266ace49..d53cb27db6 100644
--- a/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookSubscriptionPayload.java
+++ b/backend/api/admin/src/main/java/co/airy/core/api/admin/payload/WebhookUnsubscribePayload.java
@@ -7,13 +7,12 @@
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class WebhookSubscriptionPayload {
-    private Map<String, String> headers = new HashMap<>();
-
+public class WebhookUnsubscribePayload {
     @NotNull
-    private String url;
+    private UUID id;
 }
diff --git a/backend/api/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java b/backend/api/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java
index 6af4efa887..450abc920b 100644
--- a/backend/api/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java
+++ b/backend/api/admin/src/test/java/co/airy/core/api/admin/WebhooksControllerTest.java
@@ -1,5 +1,7 @@
 package co.airy.core.api.admin;
 
+import co.airy.avro.communication.Status;
+import co.airy.avro.communication.Webhook;
 import co.airy.core.api.config.ServiceDiscovery;
 import co.airy.core.api.config.dto.ComponentInfo;
 import co.airy.core.api.config.dto.ServiceInfo;
@@ -10,8 +12,10 @@
 import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.event.payload.EventType;
 import co.airy.spring.core.AirySpringBootApplication;
 import co.airy.spring.test.WebTestHelper;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -29,10 +33,16 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import java.time.Instant;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import static co.airy.test.Timing.retryOnException;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -89,21 +99,26 @@ void beforeEach() throws Exception {
 
     @Test
     public void canManageWebhook() throws Exception {
-        webTestHelper.post("/webhooks.info", "{}").andExpect(status().isNotFound());
+        final String webhookId = UUID.randomUUID().toString();
+        final String infoPayload = String.format("{\"id\":\"%s\"}", webhookId);
+        webTestHelper.post("/webhooks.info", infoPayload).andExpect(status().isNotFound());
 
         final String url = "http://example.org/webhook";
         final String xAuthHeader = "auth token";
+        final EventType subscribeEvent = EventType.MESSAGE_CREATED;
 
-        final String payload = "{\"url\":\"" + url + "\",\"headers\":{\"X-Auth\":\"" + xAuthHeader + "\"}}";
+        final String subscribePayload = String.format("{\"id\":\"%s\",\"url\":\"%s\",\"headers\":{\"X-Auth\":\"%s\"},\"events\":[\"%s\"]}",
+                webhookId, url, xAuthHeader, subscribeEvent.getEventType());
 
         when(serviceDiscovery.getComponent(Mockito.anyString())).thenCallRealMethod();
+
         // One service of the component is failing
         doReturn(Map.of(
                 "webhook-consumer", new ServiceInfo(true, false, "integration-webhook"),
                 "webhook-publisher", new ServiceInfo(true, true, "integration-webhook")
         )).when(serviceDiscovery).getServices();
 
-        webTestHelper.post("/webhooks.subscribe", payload)
+        webTestHelper.post("/webhooks.subscribe", subscribePayload)
                 .andExpect(status().isConflict());
 
         // Component is healthy
@@ -112,22 +127,52 @@ public void canManageWebhook() throws Exception {
                 "webhook-publisher", new ServiceInfo(true, true, "integration-webhook")
         )).when(serviceDiscovery).getServices();
 
-        webTestHelper.post("/webhooks.subscribe", payload)
+        webTestHelper.post("/webhooks.subscribe", subscribePayload)
                 .andExpect(status().isOk())
+                .andExpect(jsonPath("$.id", equalTo(webhookId)))
                 .andExpect(jsonPath("$.url", equalTo(url)))
                 .andExpect(jsonPath("$.headers['X-Auth']", equalTo(xAuthHeader)));
 
-        retryOnException(() -> webTestHelper.post("/webhooks.info", "{}")
+        retryOnException(() -> webTestHelper.post("/webhooks.info", infoPayload)
                         .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.id", equalTo(webhookId)))
                         .andExpect(jsonPath("$.url", equalTo(url)))
                         .andExpect(jsonPath("$.headers['X-Auth']", equalTo(xAuthHeader))),
                 "Webhook was not stored"
         );
 
-        webTestHelper.post("/webhooks.unsubscribe", payload)
+        webTestHelper.post("/webhooks.unsubscribe", infoPayload)
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.url", equalTo(url)))
                 .andExpect(jsonPath("$.headers['X-Auth']", equalTo(xAuthHeader)));
     }
 
+    @Test
+    public void canListWebhooks() throws Exception {
+        kafkaTestHelper.produceRecords(List.of(
+                new ProducerRecord<>(applicationCommunicationWebhooks.name(), UUID.randomUUID().toString(),
+                        Webhook.newBuilder()
+                                .setEndpoint("http://endpoint.com/webhook")
+                                .setId(UUID.randomUUID().toString())
+                                .setStatus(Status.Subscribed)
+                                .setSubscribedAt(Instant.now().toEpochMilli())
+                                .build()
+                ),
+                new ProducerRecord<>(applicationCommunicationWebhooks.name(), UUID.randomUUID().toString(),
+                        Webhook.newBuilder()
+                                .setEndpoint("http://endpoint.com/webhook-2")
+                                .setId(UUID.randomUUID().toString())
+                                .setStatus(Status.Subscribed)
+                                .setSubscribedAt(Instant.now().toEpochMilli())
+                                .build()
+                )
+        ));
+
+        retryOnException(() -> webTestHelper.post("/webhooks.list")
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$.data", hasSize(greaterThanOrEqualTo(2)))),
+                "list did not return all results"
+        );
+    }
+
 }
diff --git a/backend/api/communication/BUILD b/backend/api/communication/BUILD
index 01921c2026..bc8dfc20e7 100644
--- a/backend/api/communication/BUILD
+++ b/backend/api/communication/BUILD
@@ -11,6 +11,7 @@ app_deps = [
     "//backend/model/message",
     "//backend/model/channel",
     "//backend/model/metadata",
+    "//backend/model/conversation",
     "//backend:read-receipt",
     "//lib/java/date",
     "//lib/java/pagination",
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java
index a30d69efeb..9f19d97eec 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/ConversationsController.java
@@ -2,7 +2,7 @@
 
 import co.airy.avro.communication.Metadata;
 import co.airy.avro.communication.ReadReceipt;
-import co.airy.core.api.communication.dto.Conversation;
+import co.airy.model.conversation.Conversation;
 import co.airy.core.api.communication.dto.LuceneQueryResult;
 import co.airy.core.api.communication.lucene.AiryAnalyzer;
 import co.airy.core.api.communication.lucene.ExtendedQueryParser;
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java
index 104cc43a2b..a1bc536c55 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/SendMessageController.java
@@ -4,7 +4,7 @@
 import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
-import co.airy.core.api.communication.dto.Conversation;
+import co.airy.model.conversation.Conversation;
 import co.airy.core.api.communication.payload.SendMessageRequestPayload;
 import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
 import co.airy.model.message.dto.MessageContainer;
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/Stores.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/Stores.java
index bca31e91c0..c5f999db25 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/Stores.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/Stores.java
@@ -4,7 +4,7 @@
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Metadata;
 import co.airy.avro.communication.ReadReceipt;
-import co.airy.core.api.communication.dto.Conversation;
+import co.airy.model.conversation.Conversation;
 import co.airy.core.api.communication.dto.CountAction;
 import co.airy.core.api.communication.dto.Messages;
 import co.airy.core.api.communication.dto.UnreadCountState;
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java
index 3edf21c752..20870685d8 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/ConversationIndex.java
@@ -1,5 +1,6 @@
 package co.airy.core.api.communication.dto;
 
+import co.airy.model.conversation.Conversation;
 import co.airy.model.metadata.dto.MetadataNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java
index fdab18889b..3de0c490f5 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/lucene/IndexingProcessor.java
@@ -1,6 +1,6 @@
 package co.airy.core.api.communication.lucene;
 
-import co.airy.core.api.communication.dto.Conversation;
+import co.airy.model.conversation.Conversation;
 import co.airy.core.api.communication.dto.ConversationIndex;
 import org.apache.kafka.streams.processor.Processor;
 import org.apache.kafka.streams.processor.ProcessorContext;
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java b/backend/api/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java
index b7a7e60248..c091be2fe8 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java
+++ b/backend/api/communication/src/main/java/co/airy/core/api/communication/payload/ConversationResponsePayload.java
@@ -1,18 +1,15 @@
 package co.airy.core.api.communication.payload;
 
-import co.airy.core.api.communication.dto.Conversation;
+import co.airy.model.conversation.Conversation;
 import co.airy.model.channel.ChannelPayload;
 import co.airy.model.message.dto.MessageResponsePayload;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import static co.airy.date.format.DateFormat.isoFromMillis;
-import static co.airy.model.metadata.MetadataKeys.ConversationKeys;
 import static co.airy.model.metadata.MetadataObjectMapper.getMetadataPayload;
 
 @Data
@@ -32,25 +29,9 @@ public static ConversationResponsePayload fromConversation(Conversation conversa
         return ConversationResponsePayload.builder()
                 .channel(ChannelPayload.fromChannelContainer(conversation.getChannelContainer()))
                 .id(conversation.getId())
-                .metadata(defaultMetadata(metadata, conversation))
+                .metadata(conversation.defaultMetadata(metadata))
                 .createdAt(isoFromMillis(conversation.getCreatedAt()))
                 .lastMessage(MessageResponsePayload.fromMessageContainer(conversation.getLastMessageContainer()))
                 .build();
     }
-
-    private static JsonNode defaultMetadata(JsonNode metadata, Conversation conversation) {
-        JsonNode contactNode = metadata.get(ConversationKeys.CONTACT) == null ?
-                JsonNodeFactory.instance.objectNode() : metadata.get("contact");
-        if (contactNode.get(ConversationKeys.Contact.DISPLAY_NAME) == null) {
-            ((ObjectNode) contactNode).put("display_name", conversation.getDisplayNameOrDefault());
-            ((ObjectNode) metadata).set("contact", contactNode);
-        }
-
-        final JsonNode unreadCount = metadata.get(ConversationKeys.UNREAD_COUNT);
-        if (unreadCount == null) {
-            ((ObjectNode) metadata).put(ConversationKeys.UNREAD_COUNT, 0);
-        }
-
-        return metadata;
-    }
 }
diff --git a/backend/api/websocket/src/main/java/co/airy/core/api/websocket/WebSocketController.java b/backend/api/websocket/src/main/java/co/airy/core/api/websocket/WebSocketController.java
index 8207c41eef..8fb434b6e8 100644
--- a/backend/api/websocket/src/main/java/co/airy/core/api/websocket/WebSocketController.java
+++ b/backend/api/websocket/src/main/java/co/airy/core/api/websocket/WebSocketController.java
@@ -4,9 +4,9 @@
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Tag;
 import co.airy.model.channel.ChannelPayload;
-import co.airy.model.event.payload.ChannelEvent;
-import co.airy.model.event.payload.MessageEvent;
-import co.airy.model.event.payload.MetadataEvent;
+import co.airy.model.event.payload.ChannelUpdated;
+import co.airy.model.event.payload.MessageCreated;
+import co.airy.model.event.payload.MetadataUpdated;
 import co.airy.model.event.payload.TagEvent;
 import co.airy.model.metadata.dto.MetadataMap;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -24,12 +24,12 @@ public class WebSocketController {
 
     public void onMessage(Message message) {
         if (message != null) {
-            messagingTemplate.convertAndSend(QUEUE_EVENTS, MessageEvent.fromMessage(message));
+            messagingTemplate.convertAndSend(QUEUE_EVENTS, MessageCreated.fromMessage(message));
         }
     }
 
     public void onChannel(Channel channel) {
-        messagingTemplate.convertAndSend(QUEUE_EVENTS, ChannelEvent.builder()
+        messagingTemplate.convertAndSend(QUEUE_EVENTS, ChannelUpdated.builder()
                 .payload(ChannelPayload.fromChannel(channel))
                 .build()
         );
@@ -40,7 +40,7 @@ public void onMetadata(MetadataMap metadataMap) {
             return;
         }
 
-        messagingTemplate.convertAndSend(QUEUE_EVENTS, MetadataEvent.fromMetadataMap(metadataMap));
+        messagingTemplate.convertAndSend(QUEUE_EVENTS, MetadataUpdated.fromMetadataMap(metadataMap));
     }
 
     public void onTag(Tag tag) {
diff --git a/backend/api/websocket/src/test/java/co/airy/core/api/websocket/WebSocketControllerTest.java b/backend/api/websocket/src/test/java/co/airy/core/api/websocket/WebSocketControllerTest.java
index 213acc37b1..e8402e582a 100644
--- a/backend/api/websocket/src/test/java/co/airy/core/api/websocket/WebSocketControllerTest.java
+++ b/backend/api/websocket/src/test/java/co/airy/core/api/websocket/WebSocketControllerTest.java
@@ -13,9 +13,9 @@
 import co.airy.kafka.schema.application.ApplicationCommunicationTags;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
-import co.airy.model.event.payload.ChannelEvent;
-import co.airy.model.event.payload.MessageEvent;
-import co.airy.model.event.payload.MetadataEvent;
+import co.airy.model.event.payload.ChannelUpdated;
+import co.airy.model.event.payload.MessageCreated;
+import co.airy.model.event.payload.MetadataUpdated;
 import co.airy.model.event.payload.TagEvent;
 import co.airy.spring.core.AirySpringBootApplication;
 import co.airy.spring.test.WebTestHelper;
@@ -99,7 +99,7 @@ void beforeEach() throws Exception {
 
     @Test
     void canSendMessageEvents() throws Exception {
-        final CompletableFuture<MessageEvent> future = subscribe(port, MessageEvent.class, QUEUE_EVENTS);
+        final CompletableFuture<MessageCreated> future = subscribe(port, MessageCreated.class, QUEUE_EVENTS);
         final Message message = Message.newBuilder()
                 .setId("messageId")
                 .setSource("facebook")
@@ -115,7 +115,7 @@ void canSendMessageEvents() throws Exception {
 
         kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationMessages.name(), message.getId(), message));
 
-        MessageEvent recMessage = future.get(30, TimeUnit.SECONDS);
+        MessageCreated recMessage = future.get(30, TimeUnit.SECONDS);
         assertNotNull(recMessage);
         assertThat(recMessage.getPayload().getChannelId(), equalTo(message.getChannelId()));
         assertThat(recMessage.getPayload().getMessage().getId(), equalTo(message.getId()));
@@ -125,7 +125,7 @@ void canSendMessageEvents() throws Exception {
 
     @Test
     void canSendChannelEvents() throws Exception {
-        final CompletableFuture<ChannelEvent> future = subscribe(port, ChannelEvent.class, QUEUE_EVENTS);
+        final CompletableFuture<ChannelUpdated> future = subscribe(port, ChannelUpdated.class, QUEUE_EVENTS);
 
         final Channel channel = Channel.newBuilder()
                 .setId(UUID.randomUUID().toString())
@@ -136,14 +136,14 @@ void canSendChannelEvents() throws Exception {
 
         kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationChannels.name(), channel.getId(), channel));
 
-        ChannelEvent recChannel = future.get(30, TimeUnit.SECONDS);
+        ChannelUpdated recChannel = future.get(30, TimeUnit.SECONDS);
         assertNotNull(recChannel);
         assertThat(recChannel.getPayload().getId(), equalTo(channel.getId()));
     }
 
     @Test
     void canSendMetadataEvents() throws Exception {
-        final CompletableFuture<MetadataEvent> future = subscribe(port, MetadataEvent.class, QUEUE_EVENTS);
+        final CompletableFuture<MetadataUpdated> future = subscribe(port, MetadataUpdated.class, QUEUE_EVENTS);
 
         final Metadata metadata = Metadata.newBuilder()
                 .setKey("contact.displayName")
@@ -154,7 +154,7 @@ void canSendMetadataEvents() throws Exception {
 
         kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationMetadata.name(), "metadataId", metadata));
 
-        MetadataEvent recMetadata = future.get(30, TimeUnit.SECONDS);
+        MetadataUpdated recMetadata = future.get(30, TimeUnit.SECONDS);
         assertNotNull(recMetadata);
         assertThat(recMetadata.getPayload().getSubject(), equalTo("conversation"));
         assertThat(recMetadata.getPayload().getIdentifier(), equalTo("123"));
diff --git a/backend/avro/webhook.avsc b/backend/avro/webhook.avsc
index 3399f44ce5..9947320ac0 100644
--- a/backend/avro/webhook.avsc
+++ b/backend/avro/webhook.avsc
@@ -7,6 +7,22 @@
       "name": "id",
       "type": "string"
     },
+    {
+      "name": "events",
+      "type": {
+        "type": "array",
+        "items": "string"
+      },
+      "default": []
+    },
+    {
+      "name": "signKey",
+      "type": [
+        "null",
+        "string"
+      ],
+      "default": null
+    },
     {
       "name": "endpoint",
       "type": "string"
@@ -22,6 +38,21 @@
       ],
       "default": null
     },
-    {"name": "status", "type": {"name": "Status", "type": "enum", "symbols": ["Subscribed", "Unsubscribed"]}}
+    {
+      "name": "status",
+      "type": {
+        "name": "Status",
+        "type": "enum",
+        "symbols": [
+          "Subscribed",
+          "Unsubscribed"
+        ]
+      }
+    },
+    {
+      "name": "subscribedAt",
+      "type": "long",
+      "logicalType": "timestamp-millis"
+    }
   ]
 }
diff --git a/backend/model/conversation/BUILD b/backend/model/conversation/BUILD
new file mode 100644
index 0000000000..bb83d9ed04
--- /dev/null
+++ b/backend/model/conversation/BUILD
@@ -0,0 +1,19 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("//tools/build:java_library.bzl", "custom_java_library")
+
+custom_java_library(
+    name = "conversation",
+    srcs = glob(["src/main/java/co/airy/model/conversation/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//:jackson",
+        "//:lombok",
+        "//backend/model/channel",
+        "//backend/model/message",
+        "//backend/model/metadata",
+        "//lib/java/date",
+        "//lib/java/text",
+    ],
+)
+
+check_pkg(name = "buildifier")
diff --git a/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/Conversation.java b/backend/model/conversation/src/main/java/co/airy/model/conversation/Conversation.java
similarity index 62%
rename from backend/api/communication/src/main/java/co/airy/core/api/communication/dto/Conversation.java
rename to backend/model/conversation/src/main/java/co/airy/model/conversation/Conversation.java
index b533059129..6de9e4f225 100644
--- a/backend/api/communication/src/main/java/co/airy/core/api/communication/dto/Conversation.java
+++ b/backend/model/conversation/src/main/java/co/airy/model/conversation/Conversation.java
@@ -1,4 +1,4 @@
-package co.airy.core.api.communication.dto;
+package co.airy.model.conversation;
 
 import co.airy.avro.communication.Channel;
 import co.airy.model.channel.dto.ChannelContainer;
@@ -6,6 +6,9 @@
 import co.airy.model.metadata.MetadataKeys;
 import co.airy.model.metadata.dto.MetadataMap;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,7 +19,7 @@
 import java.util.Optional;
 
 import static java.util.stream.Collectors.toList;
-import static org.springframework.util.StringUtils.capitalize;
+import static co.airy.text.format.TextFormat.capitalize;
 
 @Data
 @Builder(toBuilder = true)
@@ -36,6 +39,11 @@ public Channel getChannel() {
         return Optional.ofNullable(channelContainer).map(ChannelContainer::getChannel).orElse(null);
     }
 
+    @JsonIgnore
+    public Long getUpdatedAt() {
+        return Math.max(getLastMessageContainer().getUpdatedAt(), metadataMap.getUpdatedAt());
+    }
+
     public Integer getUnreadMessageCount() {
         return metadataMap.getMetadataNumericValue(MetadataKeys.ConversationKeys.UNREAD_COUNT, 0);
     }
@@ -46,7 +54,7 @@ public String getDisplayNameOrDefault() {
 
         // Default to a display name that looks like: "Facebook 4ecb3"
         if (displayName == null) {
-            return String.format("%s %s", prettifySource(channelContainer.getChannel().getSource()), getId().substring(31));
+            return String.format("%s %s", prettifySource(getLastMessageContainer().getMessage().getSource()), getId().substring(31));
         }
 
         return displayName;
@@ -82,4 +90,23 @@ public String getId() {
     public String getChannelId() {
         return this.lastMessageContainer.getMessage().getChannelId();
     }
+
+    // Use data from this conversation to create its metadata with defaults
+    // I.e. add a "Chatplugin 435de1" display name if there is none
+    // We introduced this for better ease of use with frontend client
+    public JsonNode defaultMetadata(JsonNode metadata) {
+        JsonNode contactNode = metadata.get(MetadataKeys.ConversationKeys.CONTACT) == null ?
+                JsonNodeFactory.instance.objectNode() : metadata.get("contact");
+        if (contactNode.get(MetadataKeys.ConversationKeys.Contact.DISPLAY_NAME) == null) {
+            ((ObjectNode) contactNode).put("display_name", getDisplayNameOrDefault());
+            ((ObjectNode) metadata).set("contact", contactNode);
+        }
+
+        final JsonNode unreadCount = metadata.get(MetadataKeys.ConversationKeys.UNREAD_COUNT);
+        if (unreadCount == null) {
+            ((ObjectNode) metadata).put(MetadataKeys.ConversationKeys.UNREAD_COUNT, 0);
+        }
+
+        return metadata;
+    }
 }
diff --git a/backend/model/conversation/src/main/java/co/airy/model/conversation/ConversationPayload.java b/backend/model/conversation/src/main/java/co/airy/model/conversation/ConversationPayload.java
new file mode 100644
index 0000000000..f3b0e0e9bb
--- /dev/null
+++ b/backend/model/conversation/src/main/java/co/airy/model/conversation/ConversationPayload.java
@@ -0,0 +1,47 @@
+package co.airy.model.conversation;
+
+import co.airy.model.channel.ChannelPayload;
+import co.airy.model.message.dto.MessageResponsePayload;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import static co.airy.date.format.DateFormat.isoFromMillis;
+import static co.airy.model.metadata.MetadataObjectMapper.getMetadataPayload;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ConversationPayload {
+    private String id;
+    private String createdAt;
+    private JsonNode metadata;
+    private MessageResponsePayload lastMessage;
+
+    // Populate the channel if it's available and only channel id if not
+    private ChannelPayload channel;
+    private String channelId;
+
+    public static ConversationPayload fromConversation(Conversation conversation) {
+        JsonNode metadata = getMetadataPayload(conversation.getMetadataMap());
+
+        final ConversationPayloadBuilder builder = ConversationPayload.builder()
+                .id(conversation.getId())
+                .metadata(conversation.defaultMetadata(metadata))
+                .createdAt(isoFromMillis(conversation.getCreatedAt()))
+                .lastMessage(MessageResponsePayload.fromMessageContainer(conversation.getLastMessageContainer()));
+
+        if (conversation.getChannel() != null) {
+            builder.channel(ChannelPayload.fromChannelContainer(conversation.getChannelContainer()));
+        } else {
+            builder.channelId(conversation.getChannelId());
+        }
+
+        return builder.build();
+    }
+}
diff --git a/backend/model/event/BUILD b/backend/model/event/BUILD
index 5158888b6b..d36c0492b4 100644
--- a/backend/model/event/BUILD
+++ b/backend/model/event/BUILD
@@ -9,6 +9,7 @@ custom_java_library(
         "//:jackson",
         "//:lombok",
         "//backend/model/channel",
+        "//backend/model/conversation",
         "//backend/model/message",
         "//backend/model/metadata",
         "//backend/model/tag",
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelEvent.java b/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelEvent.java
deleted file mode 100644
index bd9db13522..0000000000
--- a/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelEvent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package co.airy.model.event.payload;
-
-import co.airy.avro.communication.Channel;
-import co.airy.model.channel.ChannelPayload;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class ChannelEvent extends Event implements Serializable {
-    private ChannelPayload payload;
-
-    public static ChannelEvent fromChannel(Channel channel) {
-        return builder().payload(ChannelPayload.fromChannel(channel)).build();
-    }
-}
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelUpdated.java b/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelUpdated.java
new file mode 100644
index 0000000000..dbb398fc60
--- /dev/null
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/ChannelUpdated.java
@@ -0,0 +1,32 @@
+package co.airy.model.event.payload;
+
+import co.airy.avro.communication.Channel;
+import co.airy.model.channel.ChannelPayload;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.Instant;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ChannelUpdated extends Event implements Serializable {
+    private ChannelPayload payload;
+    private Long timestamp;
+
+    public static ChannelUpdated fromChannel(Channel channel) {
+        return builder().timestamp(Instant.now().toEpochMilli()) // TODO record channel update date
+                .payload(ChannelPayload.fromChannel(channel)).build();
+    }
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.CHANNEL_UPDATED;
+    }
+}
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/ConversationUpdated.java b/backend/model/event/src/main/java/co/airy/model/event/payload/ConversationUpdated.java
new file mode 100644
index 0000000000..a1d80e304d
--- /dev/null
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/ConversationUpdated.java
@@ -0,0 +1,35 @@
+package co.airy.model.event.payload;
+
+import co.airy.model.conversation.Conversation;
+import co.airy.model.conversation.ConversationPayload;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ConversationUpdated extends Event implements Serializable {
+    private ConversationPayload payload;
+    private Long timestamp;
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.CONVERSATION_UPDATED;
+    }
+
+    public static ConversationUpdated fromConversation(Conversation conversation) {
+        return ConversationUpdated.builder()
+                .timestamp(conversation.getUpdatedAt())
+                .payload(ConversationPayload.fromConversation(conversation))
+                .build();
+    }
+}
+
+
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/Event.java b/backend/model/event/src/main/java/co/airy/model/event/payload/Event.java
index f374ee61bd..5e98c9b568 100644
--- a/backend/model/event/src/main/java/co/airy/model/event/payload/Event.java
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/Event.java
@@ -1,14 +1,28 @@
 package co.airy.model.event.payload;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", include = JsonTypeInfo.As.EXISTING_PROPERTY)
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = MessageEvent.class, name = "message"),
-        @JsonSubTypes.Type(value = MetadataEvent.class, name = "metadata"),
-        @JsonSubTypes.Type(value = ChannelEvent.class, name = "channel"),
-        @JsonSubTypes.Type(value = TagEvent.class, name = "tag")
+        @JsonSubTypes.Type(value = MessageCreated.class, name = "message.created"),
+        @JsonSubTypes.Type(value = MessageUpdated.class, name = "message.updated"),
+        @JsonSubTypes.Type(value = ConversationUpdated.class, name = "conversation.updated"),
+        @JsonSubTypes.Type(value = MetadataUpdated.class, name = "metadata.updated"),
+        @JsonSubTypes.Type(value = ChannelUpdated.class, name = "channel.updated"),
+        @JsonSubTypes.Type(value = TagEvent.class, name = "tag.updated")
 })
 public abstract class Event {
+    @JsonIgnore
+    public abstract EventType getTypeId();
+
+    @JsonProperty
+    public String getType() {
+        return getTypeId().getEventType();
+    }
+
+    @JsonProperty
+    public abstract Long getTimestamp();
 }
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/EventType.java b/backend/model/event/src/main/java/co/airy/model/event/payload/EventType.java
new file mode 100644
index 0000000000..9143eea812
--- /dev/null
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/EventType.java
@@ -0,0 +1,31 @@
+package co.airy.model.event.payload;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum EventType {
+    // See https://airy.co/docs/core/api/webhook#events
+    MESSAGE_CREATED("message.created"),
+    MESSAGE_UPDATED("message.updated"),
+    CONVERSATION_UPDATED("conversation.updated"),
+    CHANNEL_UPDATED("channel.updated"),
+    TAG_UPDATED("tag.updated"),
+    METADATA_ITEM("metadata.item"),
+    METADATA_UPDATED("metadata.updated");
+
+    private final String eventType;
+
+    EventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    @JsonValue
+    public String getEventType() {
+        return eventType;
+    }
+
+    @JsonCreator
+    public static EventType forValue(String value) {
+        return EventType.valueOf(value.toUpperCase().replace(".", "_"));
+    }
+}
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/MessageEvent.java b/backend/model/event/src/main/java/co/airy/model/event/payload/MessageCreated.java
similarity index 67%
rename from backend/model/event/src/main/java/co/airy/model/event/payload/MessageEvent.java
rename to backend/model/event/src/main/java/co/airy/model/event/payload/MessageCreated.java
index 79e2b376af..34c275844d 100644
--- a/backend/model/event/src/main/java/co/airy/model/event/payload/MessageEvent.java
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/MessageCreated.java
@@ -15,23 +15,30 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class MessageEvent extends Event implements Serializable {
-    private MessageEventPayload payload;
+public class MessageCreated extends Event implements Serializable {
+    private Payload payload;
+    private Long timestamp;
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.MESSAGE_CREATED;
+    }
 
     @Data
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class MessageEventPayload {
+    public static class Payload {
         private String conversationId;
         private String channelId;
         private MessageResponsePayload message;
     }
 
-    public static MessageEvent fromMessage(Message message) {
-        return MessageEvent.builder()
+    public static MessageCreated fromMessage(Message message) {
+        return MessageCreated.builder()
+                .timestamp(message.getSentAt())
                 .payload(
-                        MessageEventPayload.builder()
+                        Payload.builder()
                                 .channelId(message.getChannelId())
                                 .conversationId(message.getConversationId())
                                 .message(MessageResponsePayload.fromMessage(message))
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/MessageUpdated.java b/backend/model/event/src/main/java/co/airy/model/event/payload/MessageUpdated.java
new file mode 100644
index 0000000000..5a90e0018b
--- /dev/null
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/MessageUpdated.java
@@ -0,0 +1,52 @@
+package co.airy.model.event.payload;
+
+import co.airy.avro.communication.Message;
+import co.airy.model.message.dto.MessageContainer;
+import co.airy.model.message.dto.MessageResponsePayload;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class MessageUpdated extends Event implements Serializable {
+    private Payload payload;
+    private Long timestamp;
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.MESSAGE_UPDATED;
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Payload {
+        private String conversationId;
+        private String channelId;
+        private MessageResponsePayload message;
+    }
+
+    public static MessageUpdated fromMessageContainer(MessageContainer container) {
+        return MessageUpdated.builder()
+                .timestamp(container.getUpdatedAt())
+                .payload(
+                        Payload.builder()
+                                .channelId(container.getMessage().getChannelId())
+                                .conversationId(container.getMessage().getConversationId())
+                                .message(MessageResponsePayload.fromMessageContainer(container))
+                                .build()
+                )
+                .build();
+    }
+}
+
+
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/MetadataEvent.java b/backend/model/event/src/main/java/co/airy/model/event/payload/MetadataUpdated.java
similarity index 76%
rename from backend/model/event/src/main/java/co/airy/model/event/payload/MetadataEvent.java
rename to backend/model/event/src/main/java/co/airy/model/event/payload/MetadataUpdated.java
index ea73bbe743..7b81857c06 100644
--- a/backend/model/event/src/main/java/co/airy/model/event/payload/MetadataEvent.java
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/MetadataUpdated.java
@@ -20,8 +20,14 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class MetadataEvent extends Event implements Serializable {
+public class MetadataUpdated extends Event implements Serializable {
     private MetadataEventPayload payload;
+    private Long timestamp;
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.METADATA_UPDATED;
+    }
 
     @Data
     @Builder
@@ -33,15 +39,16 @@ public static class MetadataEventPayload {
         private JsonNode metadata;
     }
 
-    public static MetadataEvent fromMetadataMap(MetadataMap metadataMap) {
+    public static MetadataUpdated fromMetadataMap(MetadataMap metadataMap) {
         final Metadata someMetadata = metadataMap.values().iterator().next();
         final Subject subject = getSubject(someMetadata);
-        return new MetadataEvent(
+        return new MetadataUpdated(
                 MetadataEventPayload.builder()
                         .subject(subject.getNamespace())
                         .identifier(subject.getIdentifier())
                         .metadata(getMetadataPayload(metadataMap))
-                        .build()
+                        .build(),
+                metadataMap.getUpdatedAt()
         );
     }
 }
diff --git a/backend/model/event/src/main/java/co/airy/model/event/payload/TagEvent.java b/backend/model/event/src/main/java/co/airy/model/event/payload/TagEvent.java
index d0624611e8..296947706b 100644
--- a/backend/model/event/src/main/java/co/airy/model/event/payload/TagEvent.java
+++ b/backend/model/event/src/main/java/co/airy/model/event/payload/TagEvent.java
@@ -9,6 +9,7 @@
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.Instant;
 
 @Data
 @Builder
@@ -17,8 +18,16 @@
 @EqualsAndHashCode(callSuper = false)
 public class TagEvent extends Event implements Serializable {
     private TagPayload payload;
+    private Long timestamp;
 
     public static TagEvent fromTag(Tag tag) {
-        return builder().payload(TagPayload.fromTag(tag)).build();
+        return builder()
+                .timestamp(Instant.now().toEpochMilli()) // TODO record channel update date
+                .payload(TagPayload.fromTag(tag)).build();
+    }
+
+    @Override
+    public EventType getTypeId() {
+        return EventType.TAG_UPDATED;
     }
 }
diff --git a/backend/model/message/src/main/java/co/airy/model/message/dto/MessageContainer.java b/backend/model/message/src/main/java/co/airy/model/message/dto/MessageContainer.java
index 4387eb7884..e0b7c167fc 100644
--- a/backend/model/message/src/main/java/co/airy/model/message/dto/MessageContainer.java
+++ b/backend/model/message/src/main/java/co/airy/model/message/dto/MessageContainer.java
@@ -8,6 +8,7 @@
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Optional;
 
 @Data
 @Builder
@@ -17,4 +18,9 @@ public class MessageContainer implements Serializable {
     private Message message;
     @Builder.Default
     private MetadataMap metadataMap = new MetadataMap();
+
+    public long getUpdatedAt() {
+        return Math.max(Optional.ofNullable(message.getUpdatedAt()).orElse(message.getSentAt()),
+                Optional.ofNullable(metadataMap).map(MetadataMap::getUpdatedAt).orElse(0L));
+    }
 }
diff --git a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
index 4c44f2009c..b23b64ebd3 100644
--- a/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
+++ b/backend/model/metadata/src/main/java/co/airy/model/metadata/MetadataKeys.java
@@ -15,6 +15,9 @@ public static class ConversationKeys {
         public static class Contact {
             public static final String DISPLAY_NAME = "contact.display_name";
             public static final String AVATAR_URL = "contact.avatar_url";
+            public static final String LANGUAGE = "contact.lang";
+            public static final String COUNTRY = "contact.country";
+
             public static final String FETCH_STATE = "contact.fetch_state";
         }
 
@@ -47,7 +50,11 @@ public static class ChannelKeys {
 
     public static class MessageKeys {
         public static final String SUGGESTIONS = "suggestions";
-        public static final String SOURCE_ID = "source_id";
+
+        public static class Source {
+            public static final String ID = "source.id";
+            public static final String DELIVERY_STATE = "source.delivery_state";
+        }
     }
 }
 
diff --git a/backend/model/metadata/src/main/java/co/airy/model/metadata/dto/MetadataMap.java b/backend/model/metadata/src/main/java/co/airy/model/metadata/dto/MetadataMap.java
index 4df38e910b..d6a2d9f98d 100644
--- a/backend/model/metadata/src/main/java/co/airy/model/metadata/dto/MetadataMap.java
+++ b/backend/model/metadata/src/main/java/co/airy/model/metadata/dto/MetadataMap.java
@@ -2,26 +2,46 @@
 
 import co.airy.avro.communication.Metadata;
 import co.airy.log.AiryLoggerFactory;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.slf4j.Logger;
 
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Optional;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class MetadataMap extends HashMap<String, Metadata> implements Serializable {
+    private Long updatedAt;
     private static final Logger log = AiryLoggerFactory.getLogger(MetadataMap.class);
 
     // Convenience methods for aggregating on Metadata in Kafka Streams
     public static MetadataMap adder(String key, Metadata metadata, MetadataMap aggregate) {
         aggregate.put(metadata.getKey(), metadata);
+        aggregate.setUpdatedAt(metadata.getTimestamp());
         return aggregate;
     }
 
     public static MetadataMap subtractor(String key, Metadata metadata, MetadataMap aggregate) {
         aggregate.remove(metadata.getKey());
+        aggregate.setUpdatedAt(Instant.now().toEpochMilli());
         return aggregate;
     }
 
+    public long getUpdatedAt() {
+        return Optional.ofNullable(updatedAt)
+                // Backwards compatible for maps that have not recorded this value yet
+                .orElseGet(() -> values()
+                        .stream()
+                        .map(Metadata::getTimestamp)
+                        .max(Comparator.naturalOrder()).orElse(0L));
+    }
+
     public Integer getMetadataNumericValue(String key, Integer parseExceptionDefault) {
         final String value = getMetadataValue(key);
         if (value == null) {
diff --git a/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Connector.java b/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Connector.java
index 4519270e04..40ccbd3fc4 100644
--- a/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Connector.java
+++ b/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Connector.java
@@ -64,7 +64,7 @@ public List<KeyValue<String, SpecificRecordBase>> sendMessage(SendMessageRequest
             final SendMessagePayload fbSendMessagePayload = mapper.fromSendMessageRequest(sendMessageRequest);
 
             final SendMessageResponse response = api.sendMessage(pageToken, fbSendMessagePayload);
-            final Metadata metadata = newMessageMetadata(message.getId(), MetadataKeys.MessageKeys.SOURCE_ID, response.getMessageId());
+            final Metadata metadata = newMessageMetadata(message.getId(), MetadataKeys.MessageKeys.Source.ID, response.getMessageId());
             updateDeliveryState(message, DeliveryState.DELIVERED);
 
             return List.of(KeyValue.pair(message.getId(), message), KeyValue.pair(getId(metadata).toString(), metadata));
diff --git a/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Stores.java b/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Stores.java
index 88bb636032..7dbec011ed 100644
--- a/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Stores.java
+++ b/backend/sources/facebook/connector/src/main/java/co/airy/core/sources/facebook/Stores.java
@@ -109,7 +109,7 @@ public void onApplicationEvent(ApplicationStartedEvent applicationStartedEvent)
                         .build());
 
         // Send outbound messages
-        messageStream.filter((messageId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
+        messageStream.filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
                 .join(contextTable, (message, conversation) -> new SendMessageRequest(conversation, message))
                 .flatMap((conversationId, sendMessageRequest) -> connector.sendMessage(sendMessageRequest))
                 .to((recordId, record, context) -> {
diff --git a/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/EventsRouter.java b/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/EventsRouter.java
index 2648830b45..79561a5850 100644
--- a/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/EventsRouter.java
+++ b/backend/sources/facebook/events-router/src/main/java/co/airy/core/sources/facebook/EventsRouter.java
@@ -65,7 +65,7 @@ public void startStream() {
 
         // Facebook to Airy message id lookup table
         builder.<String, Metadata>table(new ApplicationCommunicationMetadata().name())
-                .filter((metadataId, metadata) -> metadata.getKey().equals(MetadataKeys.MessageKeys.SOURCE_ID))
+                .filter((metadataId, metadata) -> metadata.getKey().equals(MetadataKeys.MessageKeys.Source.DELIVERY_STATE))
                 .groupBy((metadataId, metadata) -> KeyValue.pair(metadata.getValue(), metadata))
                 .reduce((oldValue, newValue) -> newValue, (oldValue, reduceValue) -> reduceValue, Materialized.as(metadataStore));
 
diff --git a/backend/sources/google/connector/src/main/java/co/airy/core/sources/google/Stores.java b/backend/sources/google/connector/src/main/java/co/airy/core/sources/google/Stores.java
index b2a59d45d4..0054ee1b51 100644
--- a/backend/sources/google/connector/src/main/java/co/airy/core/sources/google/Stores.java
+++ b/backend/sources/google/connector/src/main/java/co/airy/core/sources/google/Stores.java
@@ -68,7 +68,7 @@ public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
                             return requestBuilder.build();
                         });
 
-        messageStream.filter((messageId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
+        messageStream.filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
                 .join(contextTable, (message, sendMessageRequest) -> sendMessageRequest.toBuilder().message(message).build())
                 .map((conversationId, sendMessageRequest) -> {
                     final Message message = connector.sendMessage(sendMessageRequest);
diff --git a/backend/sources/twilio/connector/src/main/java/co/airy/core/sources/twilio/Stores.java b/backend/sources/twilio/connector/src/main/java/co/airy/core/sources/twilio/Stores.java
index 6b009ab60d..39222b8219 100644
--- a/backend/sources/twilio/connector/src/main/java/co/airy/core/sources/twilio/Stores.java
+++ b/backend/sources/twilio/connector/src/main/java/co/airy/core/sources/twilio/Stores.java
@@ -83,7 +83,7 @@ public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
                 .join(channelsTable, SendMessageRequest::getChannelId,
                         (aggregate, channel) -> aggregate.toBuilder().channel(channel).build());
 
-        messageStream.filter((messageId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
+        messageStream.filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
                 .join(contextTable, (message, sendMessageRequest) -> sendMessageRequest.toBuilder().message(message).build())
                 .map((conversationId, sendMessageRequest) -> {
                     final Message message = connector.sendMessage(sendMessageRequest);
diff --git a/backend/sources/viber/connector/BUILD b/backend/sources/viber/connector/BUILD
new file mode 100644
index 0000000000..d6ce4635a5
--- /dev/null
+++ b/backend/sources/viber/connector/BUILD
@@ -0,0 +1,61 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("//tools/build:springboot.bzl", "springboot")
+load("//tools/build:junit5.bzl", "junit5")
+load("//tools/build:java_library.bzl", "custom_java_library")
+load("//tools/build:container_release.bzl", "container_release")
+
+app_deps = [
+    "//backend:base_app",
+    "//:springboot_actuator",
+    "//backend/model/channel",
+    "//backend/model/message",
+    "//backend/model/metadata",
+    "//lib/java/log",
+    "//lib/java/uuid",
+    "//lib/java/spring/kafka/core:spring-kafka-core",
+    "//lib/java/spring/kafka/streams:spring-kafka-streams",
+    "//lib/java/kafka/schema:source-viber-events",
+    "//lib/java/spring/web:spring-web",
+    "//lib/java/spring/auth:spring-auth",
+    "@maven//:com_viber_viber_bot",
+]
+
+springboot(
+    name = "connector",
+    srcs = glob(["src/main/java/**/*.java"]),
+    main_class = "co.airy.spring.core.AirySpringBootApplication",
+    deps = app_deps,
+)
+
+custom_java_library(
+    name = "test-lib",
+    srcs = glob(["src/test/java/co/airy/core/sources/viber/lib/*.java"]),
+    deps = [
+        ":app",
+        "//backend:base_test",
+    ] + app_deps,
+)
+
+[
+    junit5(
+        size = "medium",
+        file = file,
+        resources = glob(["src/test/resources/**/*"]),
+        deps = [
+            ":app",
+            ":test-lib",
+            "//backend:base_test",
+            "@maven//:javax_xml_bind_jaxb_api",
+            "//lib/java/kafka/test:kafka-test",
+            "//lib/java/spring/test:spring-test",
+        ] + app_deps,
+    )
+    for file in glob(["src/test/java/**/*Test.java"])
+]
+
+container_release(
+    registry = "ghcr.io/airyhq/sources",
+    repository = "viber-connector",
+)
+
+check_pkg(name = "buildifier")
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/ChannelsController.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/ChannelsController.java
new file mode 100644
index 0000000000..7140718450
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/ChannelsController.java
@@ -0,0 +1,138 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.ChannelConnectionState;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.core.sources.viber.services.Api;
+import co.airy.log.AiryLoggerFactory;
+import co.airy.model.channel.dto.ChannelContainer;
+import co.airy.model.metadata.MetadataKeys;
+import co.airy.model.metadata.dto.MetadataMap;
+import co.airy.spring.web.payload.RequestErrorResponsePayload;
+import co.airy.uuid.UUIDv5;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static co.airy.model.channel.ChannelPayload.fromChannelContainer;
+import static co.airy.model.metadata.MetadataRepository.newChannelMetadata;
+
+@RestController
+public class ChannelsController {
+    private static final Logger log = AiryLoggerFactory.getLogger(ChannelsController.class);
+    private final Stores stores;
+    private final URL webhookUrl;
+    private final Api api;
+    private final AccountInfo accountInfo;
+
+    public ChannelsController(Stores stores, @Value("${host}") String webhookUrl, @Value("${ngrok:#{null}}") String ngrok, Api api, AccountInfo accountInfo) {
+        this.stores = stores;
+        this.api = api;
+        this.accountInfo = accountInfo;
+
+        String configHost = Optional.ofNullable(ngrok).orElse(webhookUrl);
+        try {
+            this.webhookUrl = new URL(configHost + "/viber");
+        } catch (MalformedURLException e) {
+            log.error("Host from config was not a valid url {}", configHost, e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    @PostMapping("/channels.viber.connect")
+    ResponseEntity<?> connect(@RequestBody(required = false) @Valid ConnectChannelRequestPayload payload) {
+        final String channelId = UUIDv5.fromName(accountInfo.getId()).toString();
+        payload = payload != null ? payload : new ConnectChannelRequestPayload();
+
+        try {
+            api.setWebhook(webhookUrl.toString());
+
+            List<Metadata> metadataList = new ArrayList<>();
+            metadataList.add(newChannelMetadata(channelId, MetadataKeys.ChannelKeys.NAME,
+                    Optional.ofNullable(payload.getName()).orElse(accountInfo.getName())));
+            String avatarUrl = Optional.ofNullable(payload.getImageUrl()).orElse(accountInfo.getIcon());
+            if (avatarUrl != null) {
+                metadataList.add(newChannelMetadata(channelId, MetadataKeys.ChannelKeys.IMAGE_URL, avatarUrl));
+            }
+
+            final ChannelContainer container = ChannelContainer.builder()
+                    .channel(
+                            Channel.newBuilder()
+                                    .setId(channelId)
+                                    .setConnectionState(ChannelConnectionState.CONNECTED)
+                                    .setSource("viber")
+                                    .setSourceChannelId(accountInfo.getId())
+                                    .build()
+                    )
+                    .metadataMap(MetadataMap.from(metadataList)).build();
+
+            stores.storeChannelContainer(container);
+            return ResponseEntity.ok(fromChannelContainer(container));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(new RequestErrorResponsePayload("Failed to connect the viber webhook. Error: " + e));
+        }
+    }
+
+    @PostMapping("/channels.viber.disconnect")
+    ResponseEntity<?> disconnect(@RequestBody @Valid DisconnectChannelRequestPayload requestPayload) {
+        final String channelId = requestPayload.getChannelId().toString();
+        final Channel channel = stores.getChannelsStore().get(channelId);
+
+        if (channel == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        if (channel.getConnectionState().equals(ChannelConnectionState.DISCONNECTED)) {
+            return ResponseEntity.noContent().build();
+        }
+
+        channel.setConnectionState(ChannelConnectionState.DISCONNECTED);
+        channel.setToken(null);
+
+        try {
+            api.removeWebhook();
+            stores.storeChannel(channel);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(new RequestErrorResponsePayload("Failed to connect the viber webhook. Error: " + e));
+        }
+
+        return ResponseEntity.noContent().build();
+    }
+}
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+class ConnectChannelRequestPayload {
+    @NotNull
+    private String name;
+    private String imageUrl;
+}
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+class DisconnectChannelRequestPayload {
+    @NotNull
+    private UUID channelId;
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Connector.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Connector.java
new file mode 100644
index 0000000000..1cef6b59b6
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Connector.java
@@ -0,0 +1,78 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.viber.dto.SendMessageRequest;
+import co.airy.core.sources.viber.dto.SendMessageResponse;
+import co.airy.core.sources.viber.services.Api;
+import co.airy.log.AiryLoggerFactory;
+import co.airy.model.metadata.MetadataKeys;
+import co.airy.spring.auth.IgnoreAuthPattern;
+import co.airy.spring.web.filters.RequestLoggingIgnorePatterns;
+import com.viber.bot.api.ViberBot;
+import org.apache.avro.specific.SpecificRecordBase;
+import org.apache.kafka.streams.KeyValue;
+import org.slf4j.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+import static co.airy.model.message.MessageRepository.updateDeliveryState;
+import static co.airy.model.metadata.MetadataRepository.getId;
+import static co.airy.model.metadata.MetadataRepository.newMessageMetadata;
+
+@Component
+public class Connector {
+    private static final Logger log = AiryLoggerFactory.getLogger(Connector.class);
+
+    private final long messageStaleAfterSec = 300L; // 5 minutes
+    private final ViberBot viberBot;
+    private final Api api;
+
+    public Connector(ViberBot viberBot, Api api) {
+        this.viberBot = viberBot;
+        this.api = api;
+    }
+
+    public List<KeyValue<String, SpecificRecordBase>> sendMessage(SendMessageRequest sendMessageRequest) {
+        final Message message = sendMessageRequest.getMessage();
+        final String to = sendMessageRequest.getSourceConversationId();
+
+        if (isMessageStale(message)) {
+            updateDeliveryState(message, DeliveryState.FAILED);
+            return List.of(KeyValue.pair(message.getId(), message));
+        }
+
+        try {
+            final SendMessageResponse response = api.sendMessage(to, viberBot.getBotProfile(), message.getContent());
+
+            final Metadata metadata = newMessageMetadata(message.getId(), MetadataKeys.MessageKeys.Source.ID, response.getMessageToken().toString());
+            updateDeliveryState(message, DeliveryState.DELIVERED);
+
+            return List.of(KeyValue.pair(message.getId(), message), KeyValue.pair(getId(metadata).toString(), metadata));
+        } catch (Exception e) {
+            log.error(String.format("Failed to send a message to viber \n SendMessageRequest: %s", sendMessageRequest), e);
+        }
+
+        updateDeliveryState(message, DeliveryState.FAILED);
+        return List.of(KeyValue.pair(message.getId(), message));
+    }
+
+    private boolean isMessageStale(Message message) {
+        return ChronoUnit.SECONDS.between(Instant.ofEpochMilli(message.getSentAt()), Instant.now()) > messageStaleAfterSec;
+    }
+
+    @Bean
+    public IgnoreAuthPattern ignoreAuthPattern() {
+        return new IgnoreAuthPattern("/viber");
+    }
+
+    @Bean
+    public RequestLoggingIgnorePatterns requestLoggingIgnorePatterns() {
+        return new RequestLoggingIgnorePatterns(List.of("/viber"));
+    }
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/EventsRouter.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/EventsRouter.java
new file mode 100644
index 0000000000..9207d7e762
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/EventsRouter.java
@@ -0,0 +1,119 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.model.metadata.MetadataKeys;
+import co.airy.uuid.UUIDv5;
+import com.viber.bot.Request;
+import com.viber.bot.event.incoming.IncomingConversationStartedEvent;
+import com.viber.bot.event.incoming.IncomingDeliveredEvent;
+import com.viber.bot.event.incoming.IncomingMessageEvent;
+import com.viber.bot.event.incoming.IncomingSeenEvent;
+import com.viber.bot.profile.UserProfile;
+import org.apache.avro.specific.SpecificRecord;
+import org.apache.kafka.streams.KeyValue;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static co.airy.model.metadata.MetadataRepository.getId;
+import static co.airy.model.metadata.MetadataRepository.newConversationMetadata;
+import static co.airy.model.metadata.MetadataRepository.newMessageMetadata;
+
+@Component
+public class EventsRouter {
+
+    public List<KeyValue<String, SpecificRecord>> onEvent(String key, String payload) {
+        final Request request = Request.fromJsonString(payload);
+        final String channelId = UUIDv5.fromName(key).toString();
+
+        switch (request.getEvent().getEvent()) {
+            case CONVERSATION_STARTED: {
+                final IncomingConversationStartedEvent event = (IncomingConversationStartedEvent) request.getEvent();
+                final String senderId = event.getUser().getId();
+                final String conversationId = UUIDv5.fromNamespaceAndName(channelId, senderId).toString();
+                final String messageId = getMessageId(event.getToken());
+
+                return new ArrayList<>() {
+                    {
+                        add(KeyValue.pair(messageId, Message.newBuilder()
+                                .setChannelId(channelId)
+                                .setContent(payload)
+                                .setConversationId(conversationId)
+                                .setDeliveryState(DeliveryState.DELIVERED)
+                                .setHeaders(Map.of())
+                                .setId(messageId)
+                                .setIsFromContact(true)
+                                .setSenderId(senderId)
+                                .setSentAt(event.getTimestamp())
+                                .setSource("viber").build()));
+                        addAll(getMetadata(conversationId, event.getUser()));
+                    }
+                };
+            }
+
+            case MESSAGE_RECEIVED: {
+                final IncomingMessageEvent event = (IncomingMessageEvent) request.getEvent();
+                final String senderId = event.getSender().getId();
+                final String conversationId = UUIDv5.fromNamespaceAndName(channelId, senderId).toString();
+                final String messageId = getMessageId(event.getToken());
+
+                return new ArrayList<>() {
+                    {
+                        add(KeyValue.pair(messageId, Message.newBuilder()
+                                .setChannelId(channelId)
+                                .setContent(payload)
+                                .setConversationId(conversationId)
+                                .setDeliveryState(DeliveryState.DELIVERED)
+                                .setHeaders(Map.of())
+                                .setId(messageId)
+                                .setIsFromContact(true)
+                                .setSenderId(senderId)
+                                .setSentAt(event.getTimestamp())
+                                .setSource("viber").build()));
+                        addAll(getMetadata(conversationId, event.getSender()));
+                    }
+                };
+            }
+
+            case MESSAGE_DELIVERED: {
+                final IncomingDeliveredEvent event = (IncomingDeliveredEvent) request.getEvent();
+                final String messageId = getMessageId(event.getToken());
+                final Metadata metadata = newMessageMetadata(messageId, MetadataKeys.MessageKeys.Source.DELIVERY_STATE, "delivered");
+                return List.of(KeyValue.pair(getId(metadata).toString(), metadata));
+            }
+
+            case MESSAGE_SEEN: {
+                final IncomingSeenEvent event = (IncomingSeenEvent) request.getEvent();
+                final String messageId = getMessageId(event.getToken());
+                final Metadata metadata = newMessageMetadata(messageId, MetadataKeys.MessageKeys.Source.DELIVERY_STATE, "seen");
+                return List.of(KeyValue.pair(getId(metadata).toString(), metadata));
+            }
+
+            default: return List.of();
+        }
+    }
+
+    private String getMessageId(Long messageToken) {
+        return UUIDv5.fromNamespaceAndName("viber", messageToken.toString()).toString();
+    }
+
+    private List<KeyValue<String, SpecificRecord>> getMetadata(String conversationId, UserProfile userProfile) {
+        final ArrayList<KeyValue<String, SpecificRecord>> result = new ArrayList<>();
+
+        if (userProfile.getName() != null) {
+            final Metadata name = newConversationMetadata(conversationId, MetadataKeys.ConversationKeys.Contact.DISPLAY_NAME, userProfile.getName());
+            result.add(KeyValue.pair(getId(name).toString(), name));
+        }
+
+        if (userProfile.getAvatar() != null) {
+            final Metadata avatar = newConversationMetadata(conversationId, MetadataKeys.ConversationKeys.Contact.AVATAR_URL, userProfile.getAvatar());
+            result.add(KeyValue.pair(getId(avatar).toString(), avatar));
+        }
+
+        return result;
+    }
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Stores.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Stores.java
new file mode 100644
index 0000000000..aefd8a373a
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/Stores.java
@@ -0,0 +1,148 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.viber.dto.SendMessageRequest;
+import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.schema.source.SourceViberEvents;
+import co.airy.kafka.streams.KafkaStreamsWrapper;
+import co.airy.model.channel.dto.ChannelContainer;
+import org.apache.avro.specific.SpecificRecordBase;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.StreamsBuilder;
+import org.apache.kafka.streams.kstream.KStream;
+import org.apache.kafka.streams.kstream.KTable;
+import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutionException;
+
+import static co.airy.model.metadata.MetadataRepository.getId;
+
+@Component
+public class Stores implements ApplicationListener<ApplicationReadyEvent>, DisposableBean, HealthIndicator {
+
+    private static final String applicationCommunicationChannels = new ApplicationCommunicationChannels().name();
+    private static final String applicationCommunicationMessages = new ApplicationCommunicationMessages().name();
+    private static final String applicationCommunicationMetadata = new ApplicationCommunicationMetadata().name();
+    private static final String appId = "sources.viber.ConnectorStores";
+    private final String channelsStore = "channels-store";
+
+    private final KafkaStreamsWrapper streams;
+    private final KafkaProducer<String, SpecificRecordBase> producer;
+    private final Connector connector;
+    private final EventsRouter eventsRouter;
+
+    Stores(KafkaStreamsWrapper streams, Connector connector, KafkaProducer<String, SpecificRecordBase> producer, EventsRouter eventsRouter) {
+        this.streams = streams;
+        this.connector = connector;
+        this.producer = producer;
+        this.eventsRouter = eventsRouter;
+    }
+
+    @Override
+    public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
+        final StreamsBuilder builder = new StreamsBuilder();
+
+        // Channels table
+        builder.<String, Channel>table(applicationCommunicationChannels)
+                .filter((sourceChannelId, channel) -> channel.getSource().startsWith("viber"), Materialized.as(channelsStore));
+
+        final KStream<String, Message> messageStream = builder.<String, Message>stream(new ApplicationCommunicationMessages().name())
+                .filter((messageId, message) -> message != null && message.getSource().startsWith("viber"))
+                .selectKey((messageId, message) -> message.getConversationId());
+
+        final KTable<String, SendMessageRequest> contextTable = messageStream
+                .groupByKey()
+                .aggregate(SendMessageRequest::new,
+                        (conversationId, message, aggregate) -> {
+                            SendMessageRequest.SendMessageRequestBuilder sendMessageRequestBuilder = aggregate.toBuilder();
+                            if (message.getIsFromContact()) {
+                                sendMessageRequestBuilder.sourceConversationId(message.getSenderId());
+                            }
+
+                            sendMessageRequestBuilder.channelId(message.getChannelId());
+
+                            return sendMessageRequestBuilder.build();
+                        });
+
+        messageStream.filter((conversationId, message) -> DeliveryState.PENDING.equals(message.getDeliveryState()))
+                .join(contextTable, (message, sendMessageRequest) -> sendMessageRequest.toBuilder().message(message).build())
+                .flatMap((conversationId, sendMessageRequest) -> connector.sendMessage(sendMessageRequest))
+                .to((recordId, record, context) -> {
+                    if (record instanceof Metadata) {
+                        return applicationCommunicationMetadata;
+                    }
+                    if (record instanceof Message) {
+                        return applicationCommunicationMessages;
+                    }
+
+                    throw new IllegalStateException("Unknown type for record " + record);
+                });
+
+
+        builder.<String, String>stream(new SourceViberEvents().name())
+                .flatMap(eventsRouter::onEvent)
+                .to((recordId, record, context) -> {
+                    if (record instanceof Metadata) {
+                        return applicationCommunicationMetadata;
+                    }
+                    if (record instanceof Message) {
+                        return applicationCommunicationMessages;
+                    }
+
+                    throw new IllegalStateException("Unknown type for record " + record);
+                });
+
+
+        streams.start(builder.build(), appId);
+    }
+
+    public ReadOnlyKeyValueStore<String, Channel> getChannelsStore() {
+        return streams.acquireLocalStore(channelsStore);
+    }
+
+    public void storeChannelContainer(ChannelContainer container) throws ExecutionException, InterruptedException {
+        final Channel channel = container.getChannel();
+        storeChannel(channel);
+
+        for (Metadata metadata : container.getMetadataMap().values()) {
+            producer.send(new ProducerRecord<>(applicationCommunicationMetadata, getId(metadata).toString(), metadata)).get();
+        }
+    }
+
+    public void storeChannel(Channel channel) throws ExecutionException, InterruptedException {
+        producer.send(new ProducerRecord<>(applicationCommunicationChannels, channel.getId(), channel)).get();
+    }
+
+    @Override
+    public void destroy() {
+        if (streams != null) {
+            streams.close();
+        }
+    }
+
+    @Override
+    public Health health() {
+        getChannelsStore();
+
+        return Health.up().build();
+    }
+
+    // visible for testing
+    KafkaStreams.State getStreamState() {
+        return streams.state();
+    }
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/WebhookController.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/WebhookController.java
new file mode 100644
index 0000000000..8b06297f60
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/WebhookController.java
@@ -0,0 +1,82 @@
+package co.airy.core.sources.viber;
+
+import co.airy.core.sources.viber.config.Account.WelcomeMessage;
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.kafka.schema.source.SourceViberEvents;
+import com.viber.bot.Request;
+import com.viber.bot.ViberSignatureValidator;
+import com.viber.bot.event.Event;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Duration;
+import java.util.Optional;
+import java.util.Properties;
+
+@RestController
+public class WebhookController implements DisposableBean {
+    private final String sourceViberEvents = new SourceViberEvents().name();
+    private final ViberSignatureValidator signatureValidator;
+    private final AccountInfo accountInfo;
+    private final Optional<WelcomeMessage> welcomeMessage;
+
+    private final Producer<String, String> producer;
+
+    public WebhookController(@Value("${kafka.brokers}") String brokers, ViberSignatureValidator signatureValidator, AccountInfo accountInfo, Optional<WelcomeMessage> welcomeMessage) {
+        this.signatureValidator = signatureValidator;
+        this.accountInfo = accountInfo;
+        this.welcomeMessage = welcomeMessage;
+
+        final Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers);
+        props.put(ProducerConfig.RETRIES_CONFIG, String.valueOf(Integer.MAX_VALUE));
+        props.put(ProducerConfig.ACKS_CONFIG, "1");
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+        producer = new KafkaProducer<>(props);
+    }
+
+
+    @PostMapping(value = "/viber", produces = "application/json")
+    public ResponseEntity<?> accept(@RequestBody String json,
+                                       @RequestHeader("X-Viber-Content-Signature") String serverSideSignature) {
+        if (!signatureValidator.isSignatureValid(serverSideSignature, json)) {
+            return new ResponseEntity<>(HttpStatus.FORBIDDEN);
+        }
+
+        final Request request = Request.fromJsonString(json);
+
+        try {
+            ProducerRecord<String, String> record = new ProducerRecord<>(sourceViberEvents, accountInfo.getId(), json);
+            producer.send(record).get();
+        } catch (Exception e) {
+            return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE);
+        }
+
+        if (request.getEvent().getEvent().equals(Event.CONVERSATION_STARTED)) {
+            return welcomeMessage.map(ResponseEntity::ok).orElse(new ResponseEntity<>(HttpStatus.OK));
+        }
+
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @Override
+    public void destroy() {
+        if (producer != null) {
+            producer.close(Duration.ofSeconds(10));
+        }
+    }
+
+}
+
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/config/Account.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/config/Account.java
new file mode 100644
index 0000000000..9f2484761e
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/config/Account.java
@@ -0,0 +1,81 @@
+package co.airy.core.sources.viber.config;
+
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.log.AiryLoggerFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.viber.bot.ViberSignatureValidator;
+import com.viber.bot.api.ViberBot;
+import com.viber.bot.message.Message;
+import com.viber.bot.profile.BotProfile;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+@Configuration
+public class Account {
+    private final Logger log = AiryLoggerFactory.getLogger(Account.class);
+
+    @Value("${authToken}")
+    private String authToken;
+
+    @Value("${welcomeMessage:#{null}}")
+    private String welcomeMessage;
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Bean
+    WelcomeMessage welcomeMessage(AccountInfo accountInfo) {
+        return Optional.ofNullable(welcomeMessage)
+                .map((messageString) -> {
+                    try {
+                        return objectMapper.readValue(messageString, Message.class);
+                    } catch (JsonProcessingException e) {
+                        log.error("The specified viber.welcomeMessage is not a valid viber message json. Valid message types: https://developers.viber.com/docs/api/rest-bot-api/#message-types");
+                        throw new RuntimeException(e);
+                    }
+                })
+                .map((viberMessage) -> {
+                    final WelcomeMessage result = new WelcomeMessage();
+                    final Map<String, Object> senderMap = new HashMap<>() {{
+                        put("name", accountInfo.getName());
+                        if (accountInfo.getIcon() != null) {
+                            put("avatar", accountInfo.getIcon());
+                        }
+                    }};
+                    result.put("sender", senderMap);
+                    result.putAll(viberMessage.getMapRepresentation());
+                    return result;
+                }).orElse(null);
+    }
+
+    @Bean
+    ViberBot viberBot(AccountInfo accountInfo) {
+        return new ViberBot(new BotProfile(accountInfo.getName(), accountInfo.getIcon()), authToken);
+    }
+
+    @Bean
+    ViberSignatureValidator signatureValidator() {
+        return new ViberSignatureValidator(authToken);
+    }
+
+    public static class WelcomeMessage extends HashMap<String, Object> {
+    }
+
+    @Bean
+    @Qualifier("viberObjectMapper")
+    public ObjectMapper viberObjectMapper() {
+        return new ObjectMapper()
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .configure(DeserializationFeature.FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY, false)
+                .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+    }
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/AccountInfo.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/AccountInfo.java
new file mode 100644
index 0000000000..9be19bf1e8
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/AccountInfo.java
@@ -0,0 +1,19 @@
+package co.airy.core.sources.viber.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class AccountInfo {
+    @NonNull
+    private String id;
+    @NonNull
+    private String name;
+    private String icon;
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageRequest.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageRequest.java
new file mode 100644
index 0000000000..29ea19f18a
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageRequest.java
@@ -0,0 +1,19 @@
+package co.airy.core.sources.viber.dto;
+
+import co.airy.avro.communication.Message;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendMessageRequest implements Serializable {
+    private String sourceConversationId;
+    private String channelId;
+    private Message message;
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageResponse.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageResponse.java
new file mode 100644
index 0000000000..afabe65d8d
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/dto/SendMessageResponse.java
@@ -0,0 +1,14 @@
+package co.airy.core.sources.viber.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendMessageResponse {
+    private Integer status;
+    private String statusMessage;
+    private Long messageToken;
+}
diff --git a/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/services/Api.java b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/services/Api.java
new file mode 100644
index 0000000000..a0436b645e
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/java/co/airy/core/sources/viber/services/Api.java
@@ -0,0 +1,84 @@
+package co.airy.core.sources.viber.services;
+
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.core.sources.viber.dto.SendMessageResponse;
+import co.airy.log.AiryLoggerFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.viber.bot.profile.BotProfile;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class Api {
+    private final Logger log = AiryLoggerFactory.getLogger(Api.class);
+    private static final String API_URL = "https://chatapi.viber.com/pa";
+
+    private final RestTemplate restTemplate = new RestTemplate();
+    private final ObjectMapper objectMapper;
+    private final HttpHeaders authHeaders;
+
+    public Api(@Value("${authToken}") String authToken, @Qualifier("viberObjectMapper") ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+        authHeaders = new HttpHeaders();
+        authHeaders.set("X-Viber-Auth-Token", authToken);
+    }
+
+    @Bean
+    AccountInfo accountInfo() {
+        try {
+            final String apiResponse = getApiResponse("/get_account_info", null);
+            return objectMapper.readValue(apiResponse, AccountInfo.class);
+        } catch (Exception e) {
+            log.error("Could not fetch required account info using get_account_info and the provided viber.auth-token");
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String getApiResponse(String path, @Nullable String postData) {
+        final HttpEntity<String> request = new HttpEntity<>(postData, authHeaders);
+        return restTemplate.postForObject(String.format("%s%s", API_URL, path), request, String.class);
+    }
+
+    public SendMessageResponse sendMessage(String receiver, BotProfile sender, String content) throws JsonProcessingException {
+        final ObjectNode payload = (ObjectNode) objectMapper.readTree(content);
+
+        final ObjectNode senderPayload = JsonNodeFactory.instance.objectNode();
+        senderPayload.put("name", sender.getName());
+        if (sender.getAvatar() != null) {
+            senderPayload.put("avatar", sender.getAvatar());
+        }
+
+        payload.set("sender", senderPayload);
+        payload.put("receiver", receiver);
+
+        final String response = getApiResponse("/send_message", payload.toString());
+        return objectMapper.readValue(response, SendMessageResponse.class);
+    }
+
+    public void setWebhook(String webhookUrl) throws Exception {
+        Map<String, Object> request = new HashMap<>() {{
+            put("url", webhookUrl);
+            put("send_name", true);
+            put("send_photo", true);
+        }};
+
+        getApiResponse("/set_webhook", objectMapper.writeValueAsString(request));
+    }
+
+    public void removeWebhook() throws Exception {
+        getApiResponse("/set_webhook", objectMapper.writeValueAsString(Map.of("url", "")));
+    }
+}
diff --git a/backend/sources/viber/connector/src/main/resources/application.properties b/backend/sources/viber/connector/src/main/resources/application.properties
new file mode 100644
index 0000000000..3c1d68e8b2
--- /dev/null
+++ b/backend/sources/viber/connector/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+kafka.brokers=${KAFKA_BROKERS}
+kafka.schema-registry-url=${KAFKA_SCHEMA_REGISTRY_URL}
+kafka.commit-interval-ms=${KAFKA_COMMIT_INTERVAL_MS}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/ChannelsTest.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/ChannelsTest.java
new file mode 100644
index 0000000000..808d764ef5
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/ChannelsTest.java
@@ -0,0 +1,121 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.ChannelConnectionState;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.core.sources.viber.lib.MockAccountInfo;
+import co.airy.core.sources.viber.lib.Topics;
+import co.airy.core.sources.viber.services.Api;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.metadata.MetadataKeys;
+import co.airy.spring.core.AirySpringBootApplication;
+import co.airy.spring.test.WebTestHelper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.doNothing;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Import(MockAccountInfo.class)
+@SpringBootTest(classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+class ChannelsTest {
+
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper kafkaTestHelper;
+
+    @MockBean
+    private Api api;
+
+    @Autowired
+    private AccountInfo accountInfo;
+
+    @Autowired
+    @InjectMocks
+    private Connector worker;
+
+    @Autowired
+    private WebTestHelper webTestHelper;
+
+    @Autowired
+    private Stores stores;
+
+    @Value("${ngrok}")
+    private String ngrokHost;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
+
+        kafkaTestHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        kafkaTestHelper.afterAll();
+    }
+
+    @BeforeEach
+    void beforeEach() throws InterruptedException {
+        MockitoAnnotations.openMocks(this);
+        webTestHelper.waitUntilHealthy();
+    }
+
+    @Test
+    void canConnectChannels() throws Exception {
+        ArgumentCaptor<String> webhookCaptor = ArgumentCaptor.forClass(String.class);
+        doNothing().when(api).setWebhook(webhookCaptor.capture());
+        doNothing().when(api).removeWebhook();
+        Thread.sleep(5000);
+        final String content = webTestHelper.post("/channels.viber.connect")
+                .andExpect(status().isOk()).andReturn().getResponse().getContentAsString();
+        final JsonNode jsonNode = new ObjectMapper().readTree(content);
+
+        final String expectedWebhook = ngrokHost + "/viber";
+        assertEquals(expectedWebhook, webhookCaptor.getValue());
+
+        List<Channel> channels = kafkaTestHelper.consumeValues(1, Topics.applicationCommunicationChannels.name());
+        final Channel channel = channels.get(0);
+
+        assertThat(accountInfo.getId(), equalTo(channel.getSourceChannelId()));
+        assertThat(ChannelConnectionState.CONNECTED, equalTo(channel.getConnectionState()));
+
+        final List<Metadata> metadataList = kafkaTestHelper.consumeValues(1, Topics.applicationCommunicationMetadata.name());
+        final Metadata metadata = metadataList.get(0);
+        assertThat(MetadataKeys.ChannelKeys.NAME, equalTo(metadata.getKey()));
+        assertThat(accountInfo.getName(), equalTo(metadata.getValue()));
+
+        webTestHelper.post("/channels.viber.disconnect", "{\"channel_id\":\"" + jsonNode.get("id").textValue() + "\"}")
+                .andExpect(status().isNoContent());
+
+        channels = kafkaTestHelper.consumeValues(1, Topics.applicationCommunicationChannels.name());
+        assertThat(ChannelConnectionState.DISCONNECTED, equalTo(channels.get(0).getConnectionState()));
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/EventsRouterTest.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/EventsRouterTest.java
new file mode 100644
index 0000000000..07ac8fa3b4
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/EventsRouterTest.java
@@ -0,0 +1,103 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.core.sources.viber.lib.MockAccountInfo;
+import co.airy.core.sources.viber.lib.Topics;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.metadata.MetadataRepository;
+import co.airy.spring.core.AirySpringBootApplication;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.util.StreamUtils;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static co.airy.model.metadata.MetadataRepository.getSubject;
+import static co.airy.model.metadata.MetadataRepository.isMessageMetadata;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+@Import(MockAccountInfo.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+class EventsRouterTest {
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper testHelper;
+
+    @Autowired
+    private AccountInfo accountInfo;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        testHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
+        testHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        testHelper.afterAll();
+    }
+
+    @Test
+    void routesEvents() throws Exception {
+        final String conversationStarted = StreamUtils.copyToString(getClass().getClassLoader().getResourceAsStream("events/conversation_started.json"), StandardCharsets.UTF_8);
+        final String received = StreamUtils.copyToString(getClass().getClassLoader().getResourceAsStream("events/message_received.json"), StandardCharsets.UTF_8);
+        final String delivered = StreamUtils.copyToString(getClass().getClassLoader().getResourceAsStream("events/message_delivered.json"), StandardCharsets.UTF_8);
+        final String seen = StreamUtils.copyToString(getClass().getClassLoader().getResourceAsStream("events/message_seen.json"), StandardCharsets.UTF_8);
+
+        testHelper.produceRecords(List.of(
+                new ProducerRecord<>(Topics.sourceViberEvents.name(), UUID.randomUUID().toString(), conversationStarted),
+                new ProducerRecord<>(Topics.sourceViberEvents.name(), UUID.randomUUID().toString(), received),
+                new ProducerRecord<>(Topics.sourceViberEvents.name(), UUID.randomUUID().toString(), delivered),
+                new ProducerRecord<>(Topics.sourceViberEvents.name(), UUID.randomUUID().toString(), seen)
+        ));
+
+        final List<Message> messages = testHelper.consumeValues(2, Topics.applicationCommunicationMessages.name());
+        assertThat(messages, hasSize(2));
+
+        assertThat(messages.stream()
+                .filter((message) -> message.getContent().contains("conversation_started")).count(), equalTo(1L));
+
+        final Message userMessage = messages.stream()
+                .filter((message) -> message.getContent().contains("I am a user message"))
+                .findAny().get();
+
+        assertThat(userMessage.getSenderId(), equalTo("01234567890A="));
+
+        final String messageId = userMessage.getId();
+
+        final List<Metadata> metadataList = testHelper.consumeValues(6, Topics.applicationCommunicationMetadata.name());
+        assertThat(metadataList, hasSize(6));
+
+        // 4 contact metadata created
+        assertThat(metadataList.stream()
+                .filter(MetadataRepository::isConversationMetadata).count(), equalTo(4L));
+
+        // All message metadata points to the same message based on the message token
+        final List<Metadata> messageMetadata = metadataList.stream().filter((metadata) ->
+                isMessageMetadata(metadata) && getSubject(metadata).getIdentifier().equals(messageId))
+                .collect(Collectors.toList());
+
+        assertThat(messageMetadata, hasSize(2));
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/SendMessageTest.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/SendMessageTest.java
new file mode 100644
index 0000000000..7ac5359cba
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/SendMessageTest.java
@@ -0,0 +1,114 @@
+package co.airy.core.sources.viber;
+
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.core.sources.viber.dto.SendMessageResponse;
+import co.airy.core.sources.viber.lib.MockAccountInfo;
+import co.airy.core.sources.viber.lib.Topics;
+import co.airy.core.sources.viber.services.Api;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.spring.core.AirySpringBootApplication;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static co.airy.test.Timing.retryOnException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+@Import(MockAccountInfo.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+class SendMessageTest {
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper testHelper;
+
+    @MockBean
+    private Api api;
+
+    @Autowired
+    @InjectMocks
+    private Connector connector;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        testHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
+        testHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        testHelper.afterAll();
+    }
+
+    @Test
+    void sendsMessage() throws Exception {
+        final String conversationId = "conversationId";
+        final String messageId = "message-id";
+        final Long messageToken = 123L;
+        final String sourceConversationId = "9MVsH/2gRPr6pP72Eb6aXw==";
+        final String content = "{\"type\":\"text\",\"text\":\"Hello\"}";
+
+        ArgumentCaptor<String> receiverCaptor = ArgumentCaptor.forClass(String.class);
+        when(api.sendMessage(receiverCaptor.capture(), Mockito.any(), eq(content)))
+                .thenReturn(new SendMessageResponse(0, "ok", messageToken));
+
+        testHelper.produceRecords(List.of(
+                new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), "other-message-id",
+                        Message.newBuilder()
+                                .setId("other-message-id")
+                                .setSource("viber")
+                                .setSentAt(Instant.now().toEpochMilli())
+                                .setSenderId(sourceConversationId)
+                                .setDeliveryState(DeliveryState.DELIVERED)
+                                .setConversationId(conversationId)
+                                .setChannelId("channelId")
+                                .setContent("{\"text\":\"Hello world\"}")
+                                .setIsFromContact(true)
+                                .build())
+        ));
+
+        TimeUnit.SECONDS.sleep(5);
+
+        testHelper.produceRecord(new ProducerRecord<>(Topics.applicationCommunicationMessages.name(), messageId,
+                Message.newBuilder()
+                        .setId(messageId)
+                        .setSentAt(Instant.now().toEpochMilli())
+                        .setSenderId("user-id")
+                        .setDeliveryState(DeliveryState.PENDING)
+                        .setConversationId(conversationId)
+                        .setChannelId("channelId")
+                        .setSource("viber")
+                        .setContent(content)
+                        .setIsFromContact(false)
+                        .build())
+        );
+
+        retryOnException(() -> {
+            assertThat(receiverCaptor.getValue(), equalTo(sourceConversationId));
+        }, "Viber API was not called");
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/WebhookControllerTest.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/WebhookControllerTest.java
new file mode 100644
index 0000000000..ce4dbc2fd7
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/WebhookControllerTest.java
@@ -0,0 +1,108 @@
+package co.airy.core.sources.viber;
+
+import co.airy.core.sources.viber.dto.AccountInfo;
+import co.airy.core.sources.viber.lib.MockAccountInfo;
+import co.airy.core.sources.viber.lib.Topics;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.spring.core.AirySpringBootApplication;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.core.Is.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Import(MockAccountInfo.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@AutoConfigureMockMvc
+@ExtendWith(SpringExtension.class)
+class WebhookControllerTest {
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper testHelper;
+
+    @Autowired
+    private MockMvc mvc;
+
+    @Autowired
+    private AccountInfo accountInfo;
+
+    @Value("${authToken}")
+    private String authToken;
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        testHelper = new KafkaTestHelper(sharedKafkaTestResource, Topics.getTopics());
+        testHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        testHelper.afterAll();
+    }
+
+    @Test
+    void failsForUnauthenticated() throws Exception {
+        final String validationSignature = getValidationSignature("invalid key", "DROP TABLE");
+
+        mvc.perform(post("/viber")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+                .header("X-Viber-Content-Signature", validationSignature)
+                .content("DROP TABLE")
+        ).andExpect(status().isForbidden());
+    }
+
+    @Test
+    void repliesWithGreeting() throws Exception {
+        final String conversationStarted = "{\"event\":\"conversation_started\",\"timestamp\":1457764197627,\"message_token\":4912661846655238145,\"type\":\"open\",\"context\":\"context information\",\"user\":{\"id\":\"01234567890A=\",\"name\":\"John McClane\",\"avatar\":\"http://avatar.example.com\",\"country\":\"UK\",\"language\":\"en\",\"api_version\":1},\"subscribed\":false}";
+        final String validationSignature = getValidationSignature(authToken, conversationStarted);
+
+        mvc.perform(post("/viber")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(conversationStarted)
+                .header("X-Viber-Content-Signature", validationSignature)
+        )
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.text", is("Welcome message text")));
+
+        List<String> records = testHelper.consumeValues(1, Topics.sourceViberEvents.name());
+        assertThat(records, hasSize(1));
+    }
+
+    private String getValidationSignature(String authToken, String content) {
+        try {
+            Mac mac = Mac.getInstance("HmacSHA256");
+            SecretKeySpec secretKeySpec = new SecretKeySpec(authToken.getBytes(), "HmacSHA256");
+            mac.init(secretKeySpec);
+            byte[] hmac = mac.doFinal(content.getBytes());
+            StringBuilder builder = new StringBuilder();
+            for (byte b : hmac) {
+                builder.append(String.format("%02X", b).toLowerCase());
+            }
+            return builder.toString();
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to calculate hmac-sha256", e);
+        }
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/MockAccountInfo.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/MockAccountInfo.java
new file mode 100644
index 0000000000..003d166046
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/MockAccountInfo.java
@@ -0,0 +1,15 @@
+package co.airy.core.sources.viber.lib;
+
+import co.airy.core.sources.viber.dto.AccountInfo;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+@TestConfiguration
+public class MockAccountInfo {
+    @Bean
+    @Primary
+    public AccountInfo mockAccountInfo() {
+        return new AccountInfo("Viber bot", "viber account id", null);
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/Topics.java b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/Topics.java
new file mode 100644
index 0000000000..ec2473eabf
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/java/co/airy/core/sources/viber/lib/Topics.java
@@ -0,0 +1,18 @@
+package co.airy.core.sources.viber.lib;
+
+import co.airy.kafka.schema.Topic;
+import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.schema.source.SourceViberEvents;
+
+public class Topics {
+    public static final ApplicationCommunicationMessages applicationCommunicationMessages = new ApplicationCommunicationMessages();
+    public static final ApplicationCommunicationChannels applicationCommunicationChannels = new ApplicationCommunicationChannels();
+    public static final ApplicationCommunicationMetadata applicationCommunicationMetadata = new ApplicationCommunicationMetadata();
+    public static final SourceViberEvents sourceViberEvents = new SourceViberEvents();
+
+    public static Topic[] getTopics() {
+        return new Topic[]{applicationCommunicationMessages, applicationCommunicationChannels, applicationCommunicationMetadata, sourceViberEvents};
+    }
+}
diff --git a/backend/sources/viber/connector/src/test/resources/events/conversation_started.json b/backend/sources/viber/connector/src/test/resources/events/conversation_started.json
new file mode 100644
index 0000000000..ba14f0f99f
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/resources/events/conversation_started.json
@@ -0,0 +1,16 @@
+{
+  "event":"conversation_started",
+  "timestamp":1457764197627,
+  "message_token":12345,
+  "type":"open",
+  "context":"context information",
+  "user":{
+    "id":"01234567890A=",
+    "name":"John McClane",
+    "avatar":"http://avatar.example.com",
+    "country":"UK",
+    "language":"en",
+    "api_version":1
+  },
+  "subscribed":false
+}
diff --git a/backend/sources/viber/connector/src/test/resources/events/message_delivered.json b/backend/sources/viber/connector/src/test/resources/events/message_delivered.json
new file mode 100644
index 0000000000..1adc47a589
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/resources/events/message_delivered.json
@@ -0,0 +1,6 @@
+{
+  "event":"delivered",
+  "timestamp":1457764197627,
+  "message_token":4912661846655238145,
+  "user_id":"01234567890A="
+}
diff --git a/backend/sources/viber/connector/src/test/resources/events/message_received.json b/backend/sources/viber/connector/src/test/resources/events/message_received.json
new file mode 100644
index 0000000000..2e350f815f
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/resources/events/message_received.json
@@ -0,0 +1,23 @@
+{
+  "event":"message",
+  "timestamp":1457764197627,
+  "message_token":4912661846655238145,
+  "sender":{
+    "id":"01234567890A=",
+    "name":"John McClane",
+    "avatar":"http://avatar.example.com",
+    "country":"UK",
+    "language":"en",
+    "api_version":1
+  },
+  "message":{
+    "type":"text",
+    "text":"I am a user message",
+    "media":"http://example.com",
+    "location":{
+      "lat":50.76891,
+      "lon":6.11499
+    },
+    "tracking_data":"tracking data"
+  }
+}
diff --git a/backend/sources/viber/connector/src/test/resources/events/message_seen.json b/backend/sources/viber/connector/src/test/resources/events/message_seen.json
new file mode 100644
index 0000000000..a464a906ea
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/resources/events/message_seen.json
@@ -0,0 +1,6 @@
+{
+  "event":"seen",
+  "timestamp":1457764197627,
+  "message_token":4912661846655238145,
+  "user_id":"01234567890A="
+}
diff --git a/backend/sources/viber/connector/src/test/resources/test.properties b/backend/sources/viber/connector/src/test/resources/test.properties
new file mode 100644
index 0000000000..a32f4bd309
--- /dev/null
+++ b/backend/sources/viber/connector/src/test/resources/test.properties
@@ -0,0 +1,9 @@
+kafka.cleanup=true
+kafka.commit-interval-ms=100
+
+authToken=no
+welcomeMessage={\"type\":\"text\",\"text\":\"Welcome message text\"}
+
+ngrok=http://ngrok_host.com
+host=http://instance_host.com
+
diff --git a/backend/webhook/consumer/BUILD b/backend/webhook/consumer/BUILD
index dc7ef58c4a..2c3328754f 100644
--- a/backend/webhook/consumer/BUILD
+++ b/backend/webhook/consumer/BUILD
@@ -1,32 +1,47 @@
-# gazelle:prefix consumer
-
 load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@io_bazel_rules_docker//go:image.bzl", "go_image")
+load("//tools/build:springboot.bzl", "springboot")
+load("//tools/build:junit5.bzl", "junit5")
 load("//tools/build:container_release.bzl", "container_release")
 
-go_binary(
-    name = "consumer_binary",
-    embed = [":consumer_lib"],
-    visibility = ["//visibility:public"],
-)
+app_deps = [
+    "//backend:base_app",
+    "//backend/webhook/lib",
+    "//backend/model/message",
+    "//backend/model/metadata",
+    "//backend:webhook",
+    "//lib/java/uuid",
+    "//lib/java/date",
+    "//lib/java/spring/kafka/core:spring-kafka-core",
+    "//lib/java/spring/kafka/streams:spring-kafka-streams",
+    "//lib/java/spring/web:spring-web",
+    "@maven//:com_dinstone_beanstalkc",
+    "//:springboot_actuator",
+]
 
-go_image(
-    name = "image",
-    embed = [":consumer_lib"],
+springboot(
+    name = "webhook-consumer",
+    srcs = glob(["src/main/java/**/*.java"]),
+    main_class = "co.airy.spring.core.AirySpringBootApplication",
+    deps = app_deps,
 )
 
+[
+    junit5(
+        size = "medium",
+        file = file,
+        resources = glob(["src/test/resources/**/*"]),
+        deps = [
+            ":app",
+            "//backend:base_test",
+            "//lib/java/kafka/test:kafka-test",
+        ] + app_deps,
+    )
+    for file in glob(["src/test/java/**/*Test.java"])
+]
+
 container_release(
     registry = "ghcr.io/airyhq/webhook",
     repository = "consumer",
 )
 
 check_pkg(name = "buildifier")
-
-go_library(
-    name = "consumer_lib",
-    srcs = ["main.go"],
-    importpath = "consumer",
-    visibility = ["//visibility:private"],
-    deps = ["//backend/webhook/consumer/pkg/worker"],
-)
diff --git a/backend/webhook/consumer/go.mod b/backend/webhook/consumer/go.mod
deleted file mode 100644
index 2fe45fe9ff..0000000000
--- a/backend/webhook/consumer/go.mod
+++ /dev/null
@@ -1,10 +0,0 @@
-module consumer
-
-go 1.16
-
-require (
-	github.com/Shopify/sarama v1.28.0
-	github.com/beanstalkd/go-beanstalk v0.1.0
-	github.com/jpillora/backoff v1.0.0
-	github.com/riferrei/srclient v0.2.1
-)
diff --git a/backend/webhook/consumer/go.sum b/backend/webhook/consumer/go.sum
deleted file mode 100644
index c0b5db1153..0000000000
--- a/backend/webhook/consumer/go.sum
+++ /dev/null
@@ -1,98 +0,0 @@
-github.com/Shopify/sarama v1.28.0 h1:lOi3SfE6OcFlW9Trgtked2aHNZ2BIG/d6Do+PEUAqqM=
-github.com/Shopify/sarama v1.28.0/go.mod h1:j/2xTrU39dlzBmsxF1eQ2/DdWrxyBCl6pzz7a81o/ZY=
-github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/beanstalkd/go-beanstalk v0.1.0 h1:IiNwYbAoVBDs5xEOmleGoX+DRD3Moz99EpATbl8672w=
-github.com/beanstalkd/go-beanstalk v0.1.0/go.mod h1:/G8YTyChOtpOArwLTQPY1CHB+i212+av35bkPXXj56Y=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q=
-github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
-github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
-github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
-github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8=
-github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA=
-github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
-github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg=
-github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/linkedin/goavro/v2 v2.9.7 h1:Vd++Rb/RKcmNJjM0HP/JJFMEWa21eUBVKPYlKehOGrM=
-github.com/linkedin/goavro/v2 v2.9.7/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA=
-github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A=
-github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
-github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/riferrei/srclient v0.2.1 h1:uIJhzPXW+suDsEDOZKf4oTZZXTyxtw98cFC70rFzvgU=
-github.com/riferrei/srclient v0.2.1/go.mod h1:SmCz0lrYQ1pLqXlYq0yPnRccHLGh+llDA0i6hecPeW8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/backend/webhook/consumer/main.go b/backend/webhook/consumer/main.go
deleted file mode 100644
index b0e63996e7..0000000000
--- a/backend/webhook/consumer/main.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package main
-
-import (
-	"consumer/pkg/worker"
-	"context"
-	"log"
-	"os"
-	"os/signal"
-	"strconv"
-	"sync"
-	"syscall"
-	"time"
-)
-
-func main() {
-	maxBackOffSeconds, err := strconv.Atoi(os.Getenv("MAX_BACKOFF_SECONDS"))
-	if err != nil {
-		log.Fatal("MAX_BACKOFF_SECONDS not set")
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	var wg sync.WaitGroup
-
-	webhookConfigStream := make(chan string)
-
-	kafkaConsumerConfig := worker.KafkaConsumerConfig{
-		Brokers:           os.Getenv("KAFKA_BROKERS"),
-		SchemaRegistryURL: os.Getenv("KAFKA_SCHEMA_REGISTRY_URL"),
-		Group:             "WebhookConsumer",
-		Topic:             "application.communication.webhooks",
-		Partitions:        10,
-	}
-
-	wg.Add(1)
-	go worker.StartKafkaConsumer(ctx, &wg, webhookConfigStream, kafkaConsumerConfig)
-
-	w, err := worker.Start(
-		ctx,
-		&wg,
-		webhookConfigStream,
-		os.Getenv("BEANSTALK_HOSTNAME"),
-		os.Getenv("BEANSTALK_PORT"),
-		time.Duration(maxBackOffSeconds)*time.Second,
-	)
-	if err != nil {
-		cancel()
-	}
-
-	wg.Add(1)
-	go w.StartServer(ctx, &wg)
-
-	sigterm := make(chan os.Signal, 1)
-	signal.Notify(sigterm, syscall.SIGINT, syscall.SIGTERM)
-
-	<-sigterm
-	log.Println("terminating: via signal")
-	cancel()
-	wg.Wait()
-}
diff --git a/backend/webhook/consumer/pkg/worker/BUILD b/backend/webhook/consumer/pkg/worker/BUILD
deleted file mode 100644
index aa42f1db79..0000000000
--- a/backend/webhook/consumer/pkg/worker/BUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-check_pkg(name = "buildifier")
-
-go_library(
-    name = "worker",
-    srcs = [
-        "consumer.go",
-        "server.go",
-        "worker.go",
-    ],
-    importpath = "consumer/pkg/worker",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_beanstalkd_go_beanstalk//:go-beanstalk",
-        "@com_github_jpillora_backoff//:backoff",
-        "@com_github_riferrei_srclient//:srclient",
-        "@com_github_shopify_sarama//:sarama",
-    ],
-)
diff --git a/backend/webhook/consumer/pkg/worker/consumer.go b/backend/webhook/consumer/pkg/worker/consumer.go
deleted file mode 100644
index a790e18ab7..0000000000
--- a/backend/webhook/consumer/pkg/worker/consumer.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package worker
-
-import (
-	"context"
-	"encoding/binary"
-	"fmt"
-	"log"
-	"strings"
-	"sync"
-
-	"github.com/Shopify/sarama"
-	"github.com/riferrei/srclient"
-)
-
-type Consumer struct {
-	ready                chan bool
-	webhookConfigStream  chan string
-	schemaRegistryClient *srclient.SchemaRegistryClient
-	kafkaConsumerConfig  KafkaConsumerConfig
-}
-
-type KafkaConsumerConfig struct {
-	Brokers, SchemaRegistryURL, Topic, Group string
-	Partitions                               int
-}
-
-func StartKafkaConsumer(
-	ctx context.Context,
-	wg *sync.WaitGroup,
-	webhookConfigStream chan string,
-	kafkaConsumerConfig KafkaConsumerConfig,
-) {
-	defer wg.Done()
-	config := sarama.NewConfig()
-	config.Consumer.Offsets.Initial = sarama.OffsetOldest
-
-	schemaRegistryClient := srclient.CreateSchemaRegistryClient(kafkaConsumerConfig.SchemaRegistryURL)
-
-	consumer := Consumer{
-		ready:                make(chan bool),
-		webhookConfigStream:  webhookConfigStream,
-		schemaRegistryClient: schemaRegistryClient,
-		kafkaConsumerConfig:  kafkaConsumerConfig,
-	}
-
-	client, err := sarama.NewConsumerGroup(strings.Split(kafkaConsumerConfig.Brokers, ","), kafkaConsumerConfig.Group, config)
-	if err != nil {
-		log.Panicf("Error creating consumer group client: %v", err)
-	}
-
-	go func() {
-		for {
-			if err := client.Consume(ctx, strings.Split(kafkaConsumerConfig.Topic, ","), &consumer); err != nil {
-				log.Panicf("Error from consumer: %v", err)
-			}
-			if ctx.Err() != nil {
-				return
-			}
-			consumer.ready = make(chan bool)
-		}
-	}()
-
-	<-consumer.ready
-	log.Println("Sarama consumer up and running!...")
-
-	<-ctx.Done()
-	log.Println("terminating consumer: context cancelled")
-	if err = client.Close(); err != nil {
-		log.Panicf("Error closing client: %v", err)
-	}
-}
-
-func (consumer *Consumer) Setup(session sarama.ConsumerGroupSession) error {
-	for p := 0; p < consumer.kafkaConsumerConfig.Partitions; p++ {
-		session.ResetOffset(consumer.kafkaConsumerConfig.Topic, int32(p), 0, "")
-	}
-	close(consumer.ready)
-	return nil
-}
-
-func (consumer *Consumer) Cleanup(sarama.ConsumerGroupSession) error {
-	return nil
-}
-
-func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error {
-	for config := range claim.Messages() {
-		consumer.publishWebhookConfig(config)
-		session.MarkMessage(config, "")
-	}
-	return nil
-}
-
-func (consumer *Consumer) publishWebhookConfig(config *sarama.ConsumerMessage) {
-	schemaID := binary.BigEndian.Uint32(config.Value[1:5])
-	schema, err := consumer.schemaRegistryClient.GetSchema(int(schemaID))
-	if err != nil {
-		panic(fmt.Sprintf("Error getting the schema with id '%d' %s", schemaID, err))
-	}
-	native, _, _ := schema.Codec().NativeFromBinary(config.Value[5:])
-	value, _ := schema.Codec().TextualFromNative(nil, native)
-
-	consumer.webhookConfigStream <- string(value)
-}
diff --git a/backend/webhook/consumer/pkg/worker/server.go b/backend/webhook/consumer/pkg/worker/server.go
deleted file mode 100644
index 002c106991..0000000000
--- a/backend/webhook/consumer/pkg/worker/server.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package worker
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-	"net/http"
-	"sync"
-)
-
-func (worker *Worker) StartServer(ctx context.Context, wg *sync.WaitGroup) {
-	defer wg.Done()
-	http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
-		errors, err := json.Marshal(worker.GetErrors())
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-		_, err = w.Write(errors)
-		if err != nil {
-			log.Println(err)
-		}
-	})
-
-	http.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200)
-	})
-
-	http.HandleFunc("/actuator/health", func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("{\"status\":\"UP\"}"))
-	})
-
-	go func() {
-		log.Println("serving on 8080")
-		err := http.ListenAndServe(":8080", nil)
-		if err != nil {
-			panic("ListenAndServe: " + err.Error())
-		}
-	}()
-	<-ctx.Done()
-	log.Println("terminating server: context cancelled")
-}
diff --git a/backend/webhook/consumer/pkg/worker/worker.go b/backend/webhook/consumer/pkg/worker/worker.go
deleted file mode 100644
index ecd8be1f72..0000000000
--- a/backend/webhook/consumer/pkg/worker/worker.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package worker
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"sync"
-
-	"github.com/beanstalkd/go-beanstalk"
-	"github.com/jpillora/backoff"
-
-	"bytes"
-	"fmt"
-
-	"log"
-	"net/http"
-	"time"
-)
-
-type Worker struct {
-	endpoint     string
-	customHeader map[string]string
-	beanstalk    *beanstalk.Conn
-	backoff      *backoff.Backoff
-	errors       []consumerError
-}
-type consumerError struct {
-	Err error
-	T   time.Time
-}
-
-type webhookConfig struct {
-	Id       string
-	Endpoint string
-	Headers  map[string]map[string]string
-	Status   string
-}
-
-func Start(
-	ctx context.Context,
-	wg *sync.WaitGroup,
-	webhookConfigStream chan string,
-	hostname, port string,
-	maxBackoff time.Duration,
-) (*Worker, error) {
-
-	conn, err := beanstalk.Dial("tcp", fmt.Sprintf("%s:%s", hostname, port))
-
-	if err != nil {
-		return nil, err
-	}
-
-	w := Worker{
-		endpoint:     "",
-		customHeader: make(map[string]string),
-		beanstalk:    conn,
-		backoff:      &backoff.Backoff{Max: maxBackoff},
-		errors:       make([]consumerError, 0),
-	}
-
-	wg.Add(2)
-	go w.Run(ctx, wg)
-	go w.updateWebhookConfig(ctx, wg, webhookConfigStream)
-	return &w, nil
-}
-
-func (w *Worker) Run(ctx context.Context, wg *sync.WaitGroup) {
-	defer wg.Done()
-	for {
-		select {
-		case <-ctx.Done():
-			log.Println("terminating worker: context canceled ")
-			return
-		default:
-			id, event, err := w.beanstalk.Reserve(1 * time.Minute)
-			if err != nil {
-				if !errors.Is(err, beanstalk.ErrTimeout) {
-					log.Println(err)
-				}
-				continue
-			}
-			w.processJob(ctx, id, event)
-		}
-	}
-}
-
-func (w *Worker) processJob(ctx context.Context, jobId uint64, event []byte) {
-	for {
-		select {
-		case <-ctx.Done():
-			log.Println("terminating worker: context cancelled")
-			return
-		default:
-			err := w.HandleEvent(event)
-			if err != nil {
-				w.logError(err)
-				time.Sleep(w.backoff.Duration())
-				continue
-			}
-
-			err = w.beanstalk.Delete(jobId)
-			if err != nil {
-				w.logError(err)
-			}
-			w.backoff.Reset()
-			return
-		}
-	}
-}
-
-func (w *Worker) updateWebhookConfig(ctx context.Context, wg *sync.WaitGroup, webhookConfigStream chan string) {
-	defer wg.Done()
-	log.Println("Started updateWebhookConfig routine")
-	for {
-		select {
-		case <-ctx.Done():
-			log.Println("terminating updateWebhookConfig: context cancelled")
-			return
-		case config := <-webhookConfigStream:
-			var webhookConfig = webhookConfig{}
-			if err := json.Unmarshal([]byte(config), &webhookConfig); err != nil {
-				log.Fatal(err)
-			}
-			w.endpoint = webhookConfig.Endpoint
-			w.customHeader = webhookConfig.Headers["map"]
-		}
-	}
-}
-
-func (w *Worker) HandleEvent(data []byte) error {
-	req, _ := http.NewRequest("POST", w.endpoint, bytes.NewBuffer(data))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("User-Agent", "Airy/1.0")
-
-	for k, v := range w.customHeader {
-		req.Header.Set(k, v)
-	}
-
-	client := &http.Client{
-		Timeout: 10 * time.Second,
-	}
-	endpointResp, err := client.Do(req)
-
-	if err != nil {
-		return err
-	}
-
-	if endpointResp.StatusCode > 299 {
-		return fmt.Errorf("%v returned status code %v", w.endpoint, endpointResp.StatusCode)
-	}
-
-	return nil
-}
-
-func (t *Worker) logError(err error) {
-	log.Println(err)
-	t.errors = append(t.errors, consumerError{
-		Err: err,
-		T:   time.Now(),
-	})
-}
-
-func (t *Worker) GetErrors() []consumerError {
-	return t.errors
-}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java
new file mode 100644
index 0000000000..4955507d49
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Consumer.java
@@ -0,0 +1,67 @@
+package co.airy.core.webhook.consumer;
+
+import co.airy.core.webhook.WebhookEvent;
+import co.airy.log.AiryLoggerFactory;
+import com.dinstone.beanstalkc.Job;
+import com.dinstone.beanstalkc.JobConsumer;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+@Service
+public class Consumer implements DisposableBean {
+    private static final Logger log = AiryLoggerFactory.getLogger(Consumer.class);
+
+    private final ObjectMapper objectMapper = new ObjectMapper()
+            .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
+            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+    private final JobConsumer consumer;
+    private final Sender sender;
+
+    Consumer(JobConsumer consumer, Sender sender) {
+        this.consumer = consumer;
+        this.sender = sender;
+    }
+
+    @Scheduled(fixedDelay = 50)
+    public void process() {
+        final Job job = consumer.reserveJob(10);
+        if (job == null) {
+            return;
+        }
+
+        final byte[] jobData = job.getData();
+
+        WebhookEvent event;
+        try {
+            event = objectMapper.readValue(jobData, WebhookEvent.class);
+        } catch (IOException e) {
+            log.error("Failed to deserialize event. Removing job {}. Payload {}", job.getId(), new String(jobData, StandardCharsets.UTF_8), e);
+            consumer.deleteJob(job.getId());
+            return;
+        }
+
+        try {
+            sender.sendRecord(event);
+        } catch (RestClientException e) {
+            log.error("Sending message to webhook {} failed. ", event.getWebhookId());
+            return;
+        }
+
+        consumer.deleteJob(job.getId());
+    }
+
+    @Override
+    public void destroy() {
+        consumer.close();
+    }
+}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Sender.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Sender.java
new file mode 100644
index 0000000000..3149349ae9
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Sender.java
@@ -0,0 +1,77 @@
+package co.airy.core.webhook.consumer;
+
+import co.airy.avro.communication.Webhook;
+import co.airy.core.webhook.WebhookEvent;
+import co.airy.log.AiryLoggerFactory;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.InvalidKeyException;
+
+import static co.airy.core.webhook.WebhookEvent.shouldSendFor;
+
+@Component
+public class Sender {
+    private static final Logger log = AiryLoggerFactory.getLogger(Sender.class);
+    private final RestTemplate restTemplate;
+    private final Stores stores;
+    private final ObjectMapper objectMapper;
+    private final Signature signature;
+
+    public static final String CONTENT_SIGNATURE_HEADER = "X-Airy-Content-Signature";
+
+    public Sender(RestTemplate restTemplate, Stores stores, ObjectMapper objectMapper, Signature signature) {
+        this.restTemplate = restTemplate;
+        this.stores = stores;
+        this.objectMapper = objectMapper;
+        this.signature = signature;
+    }
+
+    public void sendRecord(WebhookEvent event) {
+        final Webhook webhook = stores.getWebhook(event.getWebhookId());
+        if (!shouldSendFor(event.getPayload(), webhook)) {
+            return;
+        }
+
+        final HttpHeaders headers = getDefaultHeaders();
+        webhook.getHeaders().forEach(headers::set);
+
+        try {
+            final String content = objectMapper.writeValueAsString(event.getPayload());
+            if (webhook.getSignKey() != null) {
+                final String contentSignature = this.signature.getSignature(webhook.getSignKey(), content);
+                headers.set(CONTENT_SIGNATURE_HEADER, contentSignature);
+            }
+
+            final HttpEntity<String> entity = new HttpEntity<>(content, headers);
+            restTemplate.postForEntity(new URI(webhook.getEndpoint()), entity, String.class);
+        } catch (InvalidKeyException e) {
+            // TODO:
+            // - Unsubscribe webhook
+            // - Send error as metadata
+            // - Display error in UI
+            log.error("User provided webhook key has an invalid signature. Skipping. Webhook id: {}", webhook.getId(), e);
+        } catch (JsonProcessingException e) {
+            log.error("Failed to serialize webhook event payload. Exiting. {}", event, e);
+            throw new RuntimeException(e);
+        } catch (URISyntaxException e) {
+            log.error("Malformed webhook url. Exiting. {}", event, e);
+            e.printStackTrace();
+        }
+    }
+
+    private HttpHeaders getDefaultHeaders() {
+        final HttpHeaders headers = new HttpHeaders();
+        headers.set("User-Agent", "Airy/1.0");
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        return headers;
+    }
+}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Signature.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Signature.java
new file mode 100644
index 0000000000..1644589040
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Signature.java
@@ -0,0 +1,37 @@
+package co.airy.core.webhook.consumer;
+
+import org.springframework.stereotype.Service;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+@Service
+public class Signature {
+
+    /**
+     * Computes a signature of the content send to user webhooks so that they can verify its integrity and authenticity.
+     *
+     * @param key secret key to use for computing the hmac
+     * @param content message body
+     * @return hmac (sha256) of the content given the key in lowercase hex representation
+     * @throws InvalidKeyException Malformed user secret key
+     */
+    public String getSignature(String key, String content) throws InvalidKeyException {
+        Mac mac;
+        try {
+            mac = Mac.getInstance("HmacSHA256");
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+        SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "HmacSHA256");
+        mac.init(secretKeySpec);
+        byte[] hmac = mac.doFinal(content.getBytes());
+        StringBuilder builder = new StringBuilder();
+        for (byte b : hmac) {
+            builder.append(String.format("%02X", b).toLowerCase());
+        }
+        return builder.toString();
+    }
+}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Stores.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Stores.java
new file mode 100644
index 0000000000..209986168e
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/Stores.java
@@ -0,0 +1,56 @@
+package co.airy.core.webhook.consumer;
+
+import co.airy.avro.communication.Webhook;
+import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
+import co.airy.kafka.streams.KafkaStreamsWrapper;
+import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.StreamsBuilder;
+import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Stores implements ApplicationListener<ApplicationStartedEvent>, DisposableBean {
+    private static final String appId = "webhook.Consumer";
+    private final String webhooksStore = "webhooks-store";
+    private final KafkaStreamsWrapper streams;
+
+    public Stores(KafkaStreamsWrapper streams) {
+        this.streams = streams;
+    }
+
+    private void startStream() {
+        final StreamsBuilder builder = new StreamsBuilder();
+        builder.<String, Webhook>table(new ApplicationCommunicationWebhooks().name(), Materialized.as(webhooksStore));
+        streams.start(builder.build(), appId);
+    }
+
+    private ReadOnlyKeyValueStore<String, Webhook> getWebhookStore() {
+        return streams.acquireLocalStore(webhooksStore);
+    }
+
+    public Webhook getWebhook(String id) {
+        final ReadOnlyKeyValueStore<String, Webhook> store = getWebhookStore();
+        return store.get(id);
+    }
+
+    @Override
+    public void destroy() {
+        if (streams != null) {
+            streams.close();
+        }
+    }
+
+    @Override
+    public void onApplicationEvent(ApplicationStartedEvent event) {
+        startStream();
+    }
+
+    // visible for testing
+    KafkaStreams.State getStreamState() {
+        return streams.state();
+    }
+}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/BeanstalkConsumerConfig.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/BeanstalkConsumerConfig.java
new file mode 100644
index 0000000000..e94add5a2e
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/BeanstalkConsumerConfig.java
@@ -0,0 +1,22 @@
+package co.airy.core.webhook.consumer.config;
+
+import com.dinstone.beanstalkc.BeanstalkClientFactory;
+import com.dinstone.beanstalkc.JobConsumer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class BeanstalkConsumerConfig {
+
+    @Bean
+    public JobConsumer beanstalkJobConsumer(@Value("${beanstalk.hostname}") String hostName, @Value("${beanstalk.port}") int port) {
+        com.dinstone.beanstalkc.Configuration config = new com.dinstone.beanstalkc.Configuration();
+        config.setServiceHost(hostName);
+        config.setServicePort(port);
+        config.setConnectTimeout(2000);
+        config.setReadTimeout(3000);
+        BeanstalkClientFactory beanstalkClientFactory = new BeanstalkClientFactory(config);
+        return beanstalkClientFactory.createJobConsumer("default");
+    }
+}
diff --git a/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/SenderConfig.java b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/SenderConfig.java
new file mode 100644
index 0000000000..1882df01d9
--- /dev/null
+++ b/backend/webhook/consumer/src/main/java/co/airy/core/webhook/consumer/config/SenderConfig.java
@@ -0,0 +1,25 @@
+package co.airy.core.webhook.consumer.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.Duration;
+
+@Configuration
+@EnableScheduling
+public class SenderConfig {
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder,
+                                     @Value("${connectTimeoutMs}") long connectTimeout,
+                                     @Value("${readTimeoutMs}") long readTimeout) {
+        return restTemplateBuilder
+                .setConnectTimeout(Duration.ofMillis(connectTimeout))
+                .setReadTimeout(Duration.ofMillis(readTimeout))
+                .build();
+    }
+}
diff --git a/backend/webhook/consumer/src/main/resources/application.properties b/backend/webhook/consumer/src/main/resources/application.properties
new file mode 100644
index 0000000000..0a5a08e5b3
--- /dev/null
+++ b/backend/webhook/consumer/src/main/resources/application.properties
@@ -0,0 +1,11 @@
+kafka.brokers=${KAFKA_BROKERS}
+kafka.schema-registry-url=${KAFKA_SCHEMA_REGISTRY_URL}
+kafka.cleanup=${KAFKA_CLEANUP:false}
+kafka.commit-interval-ms=${KAFKA_COMMIT_INTERVAL_MS}
+
+beanstalk.hostname=${BEANSTALK_HOSTNAME}
+beanstalk.port=${BEANSTALK_PORT}
+
+# Adjust based on TTR here: backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/BeanstalkPublisher.java
+connectTimeoutMs=2000
+readTimeoutMs=8000
diff --git a/backend/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java b/backend/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java
new file mode 100644
index 0000000000..4815c9e9f4
--- /dev/null
+++ b/backend/webhook/consumer/src/test/java/co/airy/core/webhook/consumer/ConsumerTest.java
@@ -0,0 +1,154 @@
+package co.airy.core.webhook.consumer;
+
+import co.airy.avro.communication.DeliveryState;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Status;
+import co.airy.avro.communication.Webhook;
+import co.airy.core.webhook.WebhookEvent;
+import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
+import co.airy.kafka.test.KafkaTestHelper;
+import co.airy.kafka.test.junit.SharedKafkaTestResource;
+import co.airy.model.event.payload.MessageCreated;
+import co.airy.spring.core.AirySpringBootApplication;
+import com.dinstone.beanstalkc.Job;
+import com.dinstone.beanstalkc.JobConsumer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.URI;
+import java.time.Instant;
+import java.util.Map;
+import java.util.UUID;
+
+import static co.airy.core.webhook.consumer.Sender.CONTENT_SIGNATURE_HEADER;
+import static co.airy.test.Timing.retryOnException;
+import static org.apache.kafka.streams.KafkaStreams.State.RUNNING;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.client.ExpectedCount.once;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
+
+@SpringBootTest(classes = AirySpringBootApplication.class)
+@TestPropertySource(value = "classpath:test.properties")
+@ExtendWith(SpringExtension.class)
+public class ConsumerTest {
+    @RegisterExtension
+    public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
+    private static KafkaTestHelper kafkaTestHelper;
+    private static final ApplicationCommunicationWebhooks applicationCommunicationWebhooks = new ApplicationCommunicationWebhooks();
+
+    @BeforeAll
+    static void beforeAll() throws Exception {
+        kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource, applicationCommunicationWebhooks);
+        kafkaTestHelper.beforeAll();
+    }
+
+    @AfterAll
+    static void afterAll() throws Exception {
+        kafkaTestHelper.afterAll();
+    }
+
+    @Autowired
+    Stores stores;
+
+    @Autowired
+    Signature signature;
+
+    @Autowired
+    ObjectMapper objectMapper;
+
+    @Autowired
+    RestTemplate restTemplate;
+
+    @MockBean
+    private JobConsumer beanstalkConsumer;
+
+    private MockRestServiceServer mockServer;
+
+    @BeforeEach
+    void beforeEach() throws InterruptedException {
+        MockitoAnnotations.openMocks(this);
+        retryOnException(() -> assertEquals(stores.getStreamState(), RUNNING), "Failed to reach RUNNING state.");
+        mockServer = MockRestServiceServer.createServer(restTemplate);
+    }
+
+    @Test
+    void canSendOutEvents() throws Exception {
+        final String signKey = "user-defined-hmac-key";
+        final String endpoint = "http://customer-endpoint.com/webhook";
+        final Webhook webhook = Webhook.newBuilder()
+                .setEndpoint(endpoint)
+                .setHeaders(Map.of(
+                        "user-defined", "header"
+                ))
+                .setId(UUID.randomUUID().toString())
+                .setStatus(Status.Subscribed)
+                .setSignKey(signKey)
+                .setSubscribedAt(Instant.now().toEpochMilli())
+                .build();
+
+        final WebhookEvent event = getTestEvent(webhook.getId());
+        final String content = objectMapper.writeValueAsString(event.getPayload());
+
+        mockServer.expect(once(), requestTo(new URI(endpoint)))
+                .andExpect(method(HttpMethod.POST))
+                .andExpect(header("user-defined", equalTo("header")))
+                .andExpect(header(CONTENT_SIGNATURE_HEADER, equalTo(signature.getSignature(signKey, content))))
+                .andRespond(withSuccess());
+
+        kafkaTestHelper.produceRecord(new ProducerRecord<>(applicationCommunicationWebhooks.name(), webhook.getId(), webhook));
+
+        retryOnException(() -> assertThat(stores.getWebhook(webhook.getId()), is(not(nullValue()))), "Webhook store did not get ready");
+
+        final byte[] bytes = objectMapper.writeValueAsBytes(event);
+        final Job job = new Job();
+        job.setId(1);
+        job.setData(bytes);
+        when(beanstalkConsumer.reserveJob(Mockito.anyLong())).thenReturn(job);
+
+        retryOnException(() -> mockServer.verify(), "Endpoint was not called", 10_000);
+    }
+
+    private WebhookEvent getTestEvent(String webhookId) {
+        final Message message = Message.newBuilder()
+                .setId(UUID.randomUUID().toString())
+                .setChannelId(UUID.randomUUID().toString())
+                .setContent("{\"text\":\"Hello world\"}")
+                .setConversationId(UUID.randomUUID().toString())
+                .setHeaders(Map.of())
+                .setDeliveryState(DeliveryState.PENDING)
+                .setSource("source")
+                .setSenderId(UUID.randomUUID().toString())
+                .setSentAt(Instant.now().toEpochMilli())
+                .setIsFromContact(false)
+                .build();
+
+        return WebhookEvent.builder()
+                .webhookId(webhookId)
+                .payload(MessageCreated.fromMessage(message)).build();
+    }
+}
diff --git a/backend/webhook/consumer/src/test/resources/test.properties b/backend/webhook/consumer/src/test/resources/test.properties
new file mode 100644
index 0000000000..83ae0196c3
--- /dev/null
+++ b/backend/webhook/consumer/src/test/resources/test.properties
@@ -0,0 +1,4 @@
+kafka.cleanup=true
+kafka.commit-interval-ms=100
+beanstalk.hostname=no
+beanstalk.port=10
diff --git a/backend/webhook/lib/BUILD b/backend/webhook/lib/BUILD
new file mode 100644
index 0000000000..548cb4133e
--- /dev/null
+++ b/backend/webhook/lib/BUILD
@@ -0,0 +1,21 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("//tools/build:java_library.bzl", "custom_java_library")
+
+custom_java_library(
+    name = "lib",
+    srcs = glob(["src/main/java/co/airy/core/webhook/**/*.java"]),
+    visibility = ["//visibility:public"],
+    exports = [
+        "//backend/avro:webhook",
+        "//backend/model/event",
+        "//lib/java/kafka/schema:application-communication-channels",
+    ],
+    deps = [
+        "//:jackson",
+        "//:lombok",
+        "//backend/avro:webhook",
+        "//backend/model/event",
+    ],
+)
+
+check_pkg(name = "buildifier")
diff --git a/backend/webhook/lib/src/main/java/co/airy/core/webhook/WebhookEvent.java b/backend/webhook/lib/src/main/java/co/airy/core/webhook/WebhookEvent.java
new file mode 100644
index 0000000000..ea6f1c8fa6
--- /dev/null
+++ b/backend/webhook/lib/src/main/java/co/airy/core/webhook/WebhookEvent.java
@@ -0,0 +1,38 @@
+package co.airy.core.webhook;
+
+import co.airy.avro.communication.Status;
+import co.airy.avro.communication.Webhook;
+import co.airy.model.event.payload.Event;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebhookEvent {
+    private String webhookId;
+    private Event payload;
+
+    public static boolean shouldSendFor(Event payload, Webhook webhook) {
+        if (webhook == null || webhook.getStatus().equals(Status.Unsubscribed)) {
+            return false;
+        }
+        // Reject events sent before the webhook was subscribed
+        if (payload.getTimestamp() < webhook.getSubscribedAt()) {
+            return false;
+        }
+
+        final List<String> events = webhook.getEvents();
+        if (events.isEmpty()) {
+            return true;
+        }
+        final String eventType = payload.getType();
+        return events.stream()
+                .anyMatch((subscribedEvent) -> subscribedEvent.equals(eventType));
+    }
+}
diff --git a/backend/webhook/publisher/BUILD b/backend/webhook/publisher/BUILD
index 9807d61aa2..f3627a8a69 100644
--- a/backend/webhook/publisher/BUILD
+++ b/backend/webhook/publisher/BUILD
@@ -5,9 +5,11 @@ load("//tools/build:container_release.bzl", "container_release")
 
 app_deps = [
     "//backend:base_app",
-    "//backend/model/event",
+    "//backend/webhook/lib",
     "//backend/model/message",
     "//backend/model/metadata",
+    "//backend/model/channel",
+    "//backend/model/conversation",
     "//backend:webhook",
     "//lib/java/uuid",
     "//lib/java/date",
diff --git a/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/BeanstalkPublisher.java b/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/BeanstalkPublisher.java
index 33c36fe3c6..80766889ab 100644
--- a/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/BeanstalkPublisher.java
+++ b/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/BeanstalkPublisher.java
@@ -1,7 +1,7 @@
 package co.airy.core.webhook.publisher;
 
+import co.airy.core.webhook.WebhookEvent;
 import co.airy.log.AiryLoggerFactory;
-import co.airy.model.event.payload.Event;
 import com.dinstone.beanstalkc.JobProducer;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -24,12 +24,12 @@ public class BeanstalkPublisher {
         this.beanstalkdJobProducer = beanstalkdJobProducer;
     }
 
-
-    void publishMessage(Event event) {
+    void publishMessage(WebhookEvent event) {
         try {
-            beanstalkdJobProducer.putJob(1, 1, 5000, objectMapper.writeValueAsBytes(event));
+            beanstalkdJobProducer.putJob(1, 0, 15, objectMapper.writeValueAsBytes(event));
         } catch (JsonProcessingException e) {
             log.error("Failed to publish event to Beanstalkd", e);
+            throw new RuntimeException(e);
         }
     }
 }
diff --git a/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Publisher.java b/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Publisher.java
deleted file mode 100644
index 22bbac95b1..0000000000
--- a/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Publisher.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package co.airy.core.webhook.publisher;
-
-import co.airy.avro.communication.Message;
-import co.airy.avro.communication.Metadata;
-import co.airy.avro.communication.Status;
-import co.airy.avro.communication.Webhook;
-import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
-import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
-import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
-import co.airy.kafka.streams.KafkaStreamsWrapper;
-import co.airy.log.AiryLoggerFactory;
-import co.airy.model.event.payload.Event;
-import co.airy.model.event.payload.MessageEvent;
-import co.airy.model.event.payload.MetadataEvent;
-import co.airy.model.metadata.dto.MetadataMap;
-import org.apache.kafka.streams.KafkaStreams;
-import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.StreamsBuilder;
-import org.apache.kafka.streams.Topology;
-import org.apache.kafka.streams.kstream.Consumed;
-import org.apache.kafka.streams.kstream.Materialized;
-import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-import static co.airy.model.metadata.MetadataRepository.getSubject;
-
-@Component
-public class Publisher implements ApplicationListener<ApplicationStartedEvent>, DisposableBean {
-    private final Logger log = AiryLoggerFactory.getLogger(Publisher.class);
-
-    private static final String appId = "webhook.Publisher";
-    private final String webhooksStore = "webhook-store";
-    private final String allWebhooksKey = "339ab777-92aa-43a5-b452-82e73c50fc59";
-    private final KafkaStreamsWrapper streams;
-    private final BeanstalkPublisher beanstalkdPublisher;
-
-    public Publisher(KafkaStreamsWrapper streams, BeanstalkPublisher beanstalkdPublisher) {
-        this.streams = streams;
-        this.beanstalkdPublisher = beanstalkdPublisher;
-    }
-
-    private void startStream() {
-        final StreamsBuilder builder = new StreamsBuilder();
-
-        builder.<String, Webhook>stream(new ApplicationCommunicationWebhooks().name())
-                .groupBy((webhookId, webhook) -> allWebhooksKey)
-                .reduce((oldValue, newValue) -> newValue, Materialized.as(webhooksStore));
-
-        builder.<String, Message>stream(new ApplicationCommunicationMessages().name(), Consumed.with(Topology.AutoOffsetReset.LATEST))
-                .filter((messageId, message) -> message != null && message.getUpdatedAt() == null)
-                .foreach((messageId, message) -> publishRecord(message));
-
-        builder.<String, Metadata>table(new ApplicationCommunicationMetadata().name())
-                .groupBy((metadataId, metadata) -> KeyValue.pair(getSubject(metadata).getIdentifier(), metadata))
-                .aggregate(MetadataMap::new, MetadataMap::adder, MetadataMap::subtractor)
-                .toStream()
-                .peek((identifier, metadataMap) -> publishRecord(metadataMap));
-
-        streams.start(builder.build(), appId);
-    }
-
-    private void publishRecord(Serializable record) {
-        try {
-            final ReadOnlyKeyValueStore<String, Webhook> webhookStore = streams.acquireLocalStore(webhooksStore);
-            final Webhook webhook = webhookStore.get(allWebhooksKey);
-
-            if (webhook != null && webhook.getStatus().equals(Status.Subscribed)) {
-                beanstalkdPublisher.publishMessage(fromRecord(record));
-            }
-        } catch (Exception e) {
-            log.error("failed to publish record", e);
-        }
-    }
-
-    private Event fromRecord(Serializable record) throws Exception {
-        if (record instanceof Message) {
-            return MessageEvent.fromMessage((Message) record);
-        } else if (record instanceof MetadataMap) {
-            return MetadataEvent.fromMetadataMap((MetadataMap) record);
-        }
-
-        throw new Exception("unknown type for record " + record);
-    }
-
-    @Override
-    public void destroy() {
-        if (streams != null) {
-            streams.close();
-        }
-    }
-
-    @Override
-    public void onApplicationEvent(ApplicationStartedEvent event) {
-        startStream();
-    }
-
-    // visible for testing
-    KafkaStreams.State getStreamState() {
-        return streams.state();
-    }
-}
diff --git a/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java b/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java
new file mode 100644
index 0000000000..035eb4aa4f
--- /dev/null
+++ b/backend/webhook/publisher/src/main/java/co/airy/core/webhook/publisher/Stores.java
@@ -0,0 +1,166 @@
+package co.airy.core.webhook.publisher;
+
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.Message;
+import co.airy.avro.communication.Metadata;
+import co.airy.avro.communication.Webhook;
+import co.airy.core.webhook.WebhookEvent;
+import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
+import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
+import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
+import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
+import co.airy.kafka.streams.KafkaStreamsWrapper;
+import co.airy.log.AiryLoggerFactory;
+import co.airy.model.conversation.Conversation;
+import co.airy.model.event.payload.ChannelUpdated;
+import co.airy.model.event.payload.ConversationUpdated;
+import co.airy.model.event.payload.Event;
+import co.airy.model.event.payload.MessageCreated;
+import co.airy.model.event.payload.MessageUpdated;
+import co.airy.model.message.dto.MessageContainer;
+import co.airy.model.metadata.dto.MetadataMap;
+import org.apache.kafka.streams.KafkaStreams;
+import org.apache.kafka.streams.KeyValue;
+import org.apache.kafka.streams.StreamsBuilder;
+import org.apache.kafka.streams.Topology;
+import org.apache.kafka.streams.kstream.Consumed;
+import org.apache.kafka.streams.kstream.KStream;
+import org.apache.kafka.streams.kstream.KTable;
+import org.apache.kafka.streams.kstream.Materialized;
+import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Optional;
+
+import static co.airy.core.webhook.WebhookEvent.shouldSendFor;
+import static co.airy.model.message.MessageRepository.isNewMessage;
+import static co.airy.model.metadata.MetadataRepository.getSubject;
+
+@Component
+public class Stores implements ApplicationListener<ApplicationStartedEvent>, DisposableBean, HealthIndicator {
+    private static final String appId = "webhook.Publisher";
+    private final String webhooksStore = "webhooks-store";
+    private final KafkaStreamsWrapper streams;
+    private final BeanstalkPublisher beanstalkdPublisher;
+
+    public Stores(KafkaStreamsWrapper streams, BeanstalkPublisher beanstalkdPublisher) {
+        this.streams = streams;
+        this.beanstalkdPublisher = beanstalkdPublisher;
+    }
+
+    private void startStream() {
+        final StreamsBuilder builder = new StreamsBuilder();
+
+        builder.<String, Webhook>table(new ApplicationCommunicationWebhooks().name(), Materialized.as(webhooksStore));
+
+        // channel.updated
+        builder.<String, Channel>stream(new ApplicationCommunicationChannels().name())
+                .foreach((channelId, channel) -> onRecord(ChannelUpdated.fromChannel(channel)));
+
+        final KTable<String, MetadataMap> metadataTable = builder.<String, Metadata>table(new ApplicationCommunicationMetadata().name())
+                .groupBy((metadataId, metadata) -> KeyValue.pair(getSubject(metadata).getIdentifier(), metadata))
+                .aggregate(MetadataMap::new, MetadataMap::adder, MetadataMap::subtractor);
+
+        final KStream<String, Message> messageStream = builder.stream(new ApplicationCommunicationMessages().name());
+
+        // message.created
+        messageStream.filter((messageId, message) -> message != null && isNewMessage(message))
+                .foreach((messageId, message) -> onRecord(MessageCreated.fromMessage(message)));
+
+        final KTable<String, MessageContainer> messageTable = messageStream.toTable()
+                .leftJoin(metadataTable, (message, metadataMap) -> MessageContainer.builder()
+                        .message(message)
+                        .metadataMap(Optional.ofNullable(metadataMap).orElse(new MetadataMap()))
+                        .build());
+
+        // message.updated
+        messageTable.toStream()
+                .foreach((messageId, messageContainer) -> onRecord(MessageUpdated.fromMessageContainer(messageContainer)));
+
+        // conversation.updated
+        messageTable.groupBy((messageId, messageContainer) -> KeyValue.pair(messageContainer.getMessage().getConversationId(), messageContainer))
+                .aggregate(Conversation::new,
+                        (conversationId, container, aggregate) -> {
+                            if (aggregate.getLastMessageContainer() == null) {
+                                aggregate = Conversation.builder()
+                                        .lastMessageContainer(container)
+                                        .createdAt(container.getMessage().getSentAt()) // Set this only once for the sent time of the first message
+                                        .build();
+                            }
+
+                            // equals because messages can be updated
+                            if (container.getMessage().getSentAt() >= aggregate.getLastMessageContainer().getMessage().getSentAt()) {
+                                aggregate.setLastMessageContainer(container);
+                            }
+
+                            return aggregate;
+                        }, (conversationId, container, aggregate) -> {
+                            // If the deleted message was the last message we have no way of replacing it
+                            // so we have no choice but to keep it
+                            return aggregate;
+                        })
+                .leftJoin(metadataTable, (conversation, metadataMap) -> {
+                    if (metadataMap != null) {
+                        return conversation.toBuilder()
+                                .metadataMap(metadataMap)
+                                .build();
+                    }
+                    return conversation;
+                })
+                .toStream()
+                .foreach((conversationId, conversation) -> onRecord(ConversationUpdated.fromConversation(conversation)));
+
+        streams.start(builder.build(), appId);
+    }
+
+    private ReadOnlyKeyValueStore<String, Webhook> getWebhookStore() {
+        return streams.acquireLocalStore(webhooksStore);
+    }
+
+    public Collection<Webhook> getAllWebhooks() {
+        final ReadOnlyKeyValueStore<String, Webhook> store = getWebhookStore();
+
+        final ArrayList<Webhook> webhooks = new ArrayList<>();
+        store.all().forEachRemaining((it) -> webhooks.add(it.value));
+        return webhooks;
+    }
+
+    private void onRecord(Event event) {
+        for (Webhook webhook : getAllWebhooks()) {
+            if (shouldSendFor(event, webhook)) {
+                beanstalkdPublisher.publishMessage(new WebhookEvent(webhook.getId(), event));
+            }
+        }
+    }
+
+    @Override
+    public void destroy() {
+        if (streams != null) {
+            streams.close();
+        }
+    }
+
+    @Override
+    public void onApplicationEvent(ApplicationStartedEvent event) {
+        startStream();
+    }
+
+    // visible for testing
+    KafkaStreams.State getStreamState() {
+        return streams.state();
+    }
+
+    @Override
+    public Health health() {
+        getWebhookStore();
+        return Health.up().build();
+    }
+}
diff --git a/backend/webhook/publisher/src/test/java/co/airy/core/webhook/publisher/PublisherTest.java b/backend/webhook/publisher/src/test/java/co/airy/core/webhook/publisher/PublisherTest.java
index a43f77ac66..7045925408 100644
--- a/backend/webhook/publisher/src/test/java/co/airy/core/webhook/publisher/PublisherTest.java
+++ b/backend/webhook/publisher/src/test/java/co/airy/core/webhook/publisher/PublisherTest.java
@@ -1,16 +1,21 @@
 package co.airy.core.webhook.publisher;
 
+import co.airy.avro.communication.Channel;
+import co.airy.avro.communication.ChannelConnectionState;
 import co.airy.avro.communication.DeliveryState;
 import co.airy.avro.communication.Message;
 import co.airy.avro.communication.Status;
 import co.airy.avro.communication.Webhook;
+import co.airy.core.webhook.WebhookEvent;
+import co.airy.kafka.schema.application.ApplicationCommunicationChannels;
 import co.airy.kafka.schema.application.ApplicationCommunicationMessages;
 import co.airy.kafka.schema.application.ApplicationCommunicationMetadata;
 import co.airy.kafka.schema.application.ApplicationCommunicationWebhooks;
 import co.airy.kafka.test.KafkaTestHelper;
 import co.airy.kafka.test.junit.SharedKafkaTestResource;
-import co.airy.model.event.payload.Event;
+import co.airy.model.event.payload.EventType;
 import co.airy.spring.core.AirySpringBootApplication;
+import org.apache.avro.specific.SpecificRecord;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -30,12 +35,16 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static co.airy.test.Timing.retryOnException;
 import static org.apache.kafka.streams.KafkaStreams.State.RUNNING;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.doNothing;
 
 @SpringBootTest(classes = AirySpringBootApplication.class)
@@ -45,16 +54,18 @@ public class PublisherTest {
     @RegisterExtension
     public static final SharedKafkaTestResource sharedKafkaTestResource = new SharedKafkaTestResource();
     private static KafkaTestHelper kafkaTestHelper;
-    private static final ApplicationCommunicationWebhooks applicationCommunicationWebhooks = new ApplicationCommunicationWebhooks();
     private static final ApplicationCommunicationMessages applicationCommunicationMessages = new ApplicationCommunicationMessages();
+    private static final ApplicationCommunicationWebhooks applicationCommunicationWebhooks = new ApplicationCommunicationWebhooks();
     private static final ApplicationCommunicationMetadata applicationCommunicationMetadata = new ApplicationCommunicationMetadata();
+    private static final ApplicationCommunicationChannels applicationCommunicationChannels = new ApplicationCommunicationChannels();
 
     @BeforeAll
     static void beforeAll() throws Exception {
         kafkaTestHelper = new KafkaTestHelper(sharedKafkaTestResource,
-                applicationCommunicationWebhooks,
                 applicationCommunicationMetadata,
-                applicationCommunicationMessages
+                applicationCommunicationMessages,
+                applicationCommunicationWebhooks,
+                applicationCommunicationChannels
         );
 
         kafkaTestHelper.beforeAll();
@@ -65,10 +76,9 @@ static void afterAll() throws Exception {
         kafkaTestHelper.afterAll();
     }
 
-
     @Autowired
     @InjectMocks
-    Publisher publisher;
+    Stores stores;
 
     @MockBean
     private BeanstalkPublisher beanstalkPublisher;
@@ -76,34 +86,47 @@ static void afterAll() throws Exception {
     @BeforeEach
     void beforeEach() throws InterruptedException {
         MockitoAnnotations.openMocks(this);
-        retryOnException(() -> assertEquals(publisher.getStreamState(), RUNNING), "Failed to reach RUNNING state.");
+        retryOnException(() -> assertEquals(stores.getStreamState(), RUNNING), "Failed to reach RUNNING state.");
     }
 
     @Test
     void canPublishMessageToQueue() throws Exception {
-        kafkaTestHelper.produceRecord(
-                new ProducerRecord<>(applicationCommunicationWebhooks.name(), "339ab777-92aa-43a5-b452-82e73c50fc59",
-                        Webhook.newBuilder()
-                                .setEndpoint("http://somesalesforce.com/form")
-                                .setHeaders(Map.of())
-                                .setId("339ab777-92aa-43a5-b452-82e73c50fc59")
-                                .setStatus(Status.Subscribed)
-                                .build()
-                ));
-
-        TimeUnit.SECONDS.sleep(2);
-
-        ArgumentCaptor<Event> batchCaptor = ArgumentCaptor.forClass(Event.class);
+        ArgumentCaptor<WebhookEvent> batchCaptor = ArgumentCaptor.forClass(WebhookEvent.class);
         doNothing().when(beanstalkPublisher).publishMessage(batchCaptor.capture());
 
-        List<ProducerRecord<String, Message>> messages = new ArrayList<>();
-
+        final Webhook acceptAll = Webhook.newBuilder()
+                .setEndpoint("http://endpoint.com/accept")
+                .setId(UUID.randomUUID().toString())
+                .setStatus(Status.Subscribed)
+                .setSubscribedAt(Instant.now().toEpochMilli())
+                .build();
+
+        final Webhook selective = Webhook.newBuilder()
+                .setEndpoint("http://endpoint.com/selective")
+                .setEvents(List.of(
+                        EventType.MESSAGE_CREATED.getEventType(),
+                        EventType.CONVERSATION_UPDATED.getEventType()
+                ))
+                .setId(UUID.randomUUID().toString())
+                .setStatus(Status.Subscribed)
+                .setSubscribedAt(Instant.now().toEpochMilli())
+                .build();
+
+        kafkaTestHelper.produceRecords(List.of(
+                new ProducerRecord<>(applicationCommunicationWebhooks.name(), acceptAll.getId(), acceptAll),
+                new ProducerRecord<>(applicationCommunicationWebhooks.name(), selective.getId(), selective)
+        ));
+
+        List<ProducerRecord<String, SpecificRecord>> records = new ArrayList<>();
+
+        final String conversationId = UUID.randomUUID().toString();
         int count = 4;
         for (int i = 0; i < count; i++) {
             final String messageId = "message-" + i;
 
             long now = Instant.now().toEpochMilli();
-            messages.add(new ProducerRecord<>(applicationCommunicationMessages.name(), messageId,
+            // message.created
+            records.add(new ProducerRecord<>(applicationCommunicationMessages.name(), messageId,
                     Message.newBuilder()
                             .setId(messageId)
                             .setSource("facebook")
@@ -112,30 +135,50 @@ void canPublishMessageToQueue() throws Exception {
                             .setSenderId("sourceConversationId")
                             .setIsFromContact(false)
                             .setDeliveryState(DeliveryState.DELIVERED)
-                            .setConversationId("conversationId")
+                            .setConversationId(conversationId)
                             .setChannelId("channelId")
                             .setContent("{\"text\":\"hello world\"}")
                             .build()));
 
-            // Don't publish the message update
-            messages.add(new ProducerRecord<>(applicationCommunicationMessages.name(), messageId,
+            // message.updated
+            records.add(new ProducerRecord<>(applicationCommunicationMessages.name(), messageId,
                     Message.newBuilder()
                             .setId(messageId)
                             .setSource("facebook")
                             .setSentAt(now)
-                            .setUpdatedAt(now) // field presence identifies message as update
+                            .setUpdatedAt(now) // field presence identifies record as an update
                             .setSenderId("sourceConversationId")
                             .setIsFromContact(false)
                             .setDeliveryState(DeliveryState.DELIVERED)
-                            .setConversationId("conversationId")
+                            .setConversationId(conversationId)
                             .setChannelId("channelId")
                             .setContent("{\"text\":\"hello world\"}")
                             .build())
             );
         }
 
-        kafkaTestHelper.produceRecords(messages);
-
-        retryOnException(() -> assertEquals(4, batchCaptor.getAllValues().size()), "Number of delivered message is incorrect");
+        // channel.updated
+        records.add(new ProducerRecord<>(applicationCommunicationChannels.name(), UUID.randomUUID().toString(),
+                Channel.newBuilder()
+                        .setId(UUID.randomUUID().toString())
+                        .setSource("source")
+                        .setSourceChannelId("source channel id")
+                        .setConnectionState(ChannelConnectionState.CONNECTED).build()
+        ));
+
+        retryOnException(() -> assertThat(stores.getAllWebhooks(), hasSize(2)), "Webhooks store did not get ready");
+        kafkaTestHelper.produceRecords(records);
+
+        retryOnException(() -> {
+            final List<WebhookEvent> allEvents = batchCaptor.getAllValues().stream().filter((webhookEvent) -> webhookEvent.getWebhookId().equals(acceptAll.getId())).collect(Collectors.toList());
+            final List<WebhookEvent> selectiveEvents = batchCaptor.getAllValues().stream().filter((webhookEvent) -> webhookEvent.getWebhookId().equals(selective.getId())).collect(Collectors.toList());
+
+            assertThat(allEvents.stream().filter((webhookEvent) -> webhookEvent.getPayload().getTypeId().equals(EventType.CHANNEL_UPDATED)).count(), equalTo(1L));
+            assertThat(allEvents.stream().filter((webhookEvent) -> webhookEvent.getPayload().getTypeId().equals(EventType.MESSAGE_CREATED)).count(), equalTo(Long.valueOf(count)));
+
+            assertTrue(selectiveEvents.stream().allMatch((webhookEvent) -> selective.getEvents().contains(webhookEvent.getPayload().getType())));
+            assertTrue(selectiveEvents.stream().anyMatch((webhookEvent) -> webhookEvent.getPayload().getTypeId().equals(EventType.MESSAGE_CREATED)));
+            assertTrue(selectiveEvents.stream().anyMatch((webhookEvent) -> webhookEvent.getPayload().getTypeId().equals(EventType.CONVERSATION_UPDATED)));
+        }, "Number of delivered message is incorrect");
     }
 }
diff --git a/cli/go.mod b/cli/go.mod
index 079bd480b0..7e4635098d 100644
--- a/cli/go.mod
+++ b/cli/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/TwinProduction/go-color v1.0.0
+	github.com/airyhq/airy/infrastructure/lib/go/k8s/util v0.0.0-20210813123122-f26352d78a88
 	github.com/airyhq/airy/lib/go/httpclient v0.0.0
 	github.com/aws/aws-sdk-go v1.37.29
 	github.com/aws/aws-sdk-go-v2/config v1.1.1
diff --git a/cli/go.sum b/cli/go.sum
index 36789213e1..b9d07712f6 100644
--- a/cli/go.sum
+++ b/cli/go.sum
@@ -37,6 +37,9 @@ github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/TwinProduction/go-color v1.0.0 h1:8n59tqmLmt8jyRsY44RPy2ixPDDw0FcVoAhlYeyz3Jw=
 github.com/TwinProduction/go-color v1.0.0/go.mod h1:5hWpSyT+mmKPjCwPNEruBW5Dkbs/2PwOuU468ntEXNQ=
+github.com/airyhq/airy v0.0.0-20210813123122-f26352d78a88 h1:fBAxo6dTPEjubBcEkidXL22306FmpasAY+6ewNZPWdM=
+github.com/airyhq/airy/infrastructure/lib/go/k8s/util v0.0.0-20210813123122-f26352d78a88 h1:3lw6BB3Qvbjnd67rs2BZodQV1PD1FmWqvTBJR7zPTfI=
+github.com/airyhq/airy/infrastructure/lib/go/k8s/util v0.0.0-20210813123122-f26352d78a88/go.mod h1:YgaeqllGAjZ7AgtktlRrtSPsy/2rXJijMIFFuibxenk=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -523,6 +526,8 @@ k8s.io/apimachinery v0.19.0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlm
 k8s.io/client-go v0.19.0 h1:1+0E0zfWFIWeyRhQYWzimJOyAk2UT7TiARaLNwJCf7k=
 k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
+k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
diff --git a/cli/integration/golden/cli.no-args.golden b/cli/integration/golden/cli.no-args.golden
index 337993f036..098d13b68f 100644
--- a/cli/integration/golden/cli.no-args.golden
+++ b/cli/integration/golden/cli.no-args.golden
@@ -10,6 +10,7 @@ Available Commands:
   help        Help about any command
   status      Reports the status of an Airy Core instance
   ui          Opens the Airy Core UI in your local browser
+  upgrade     Upgrades an instance of Airy Core
   version     Prints version information
 
 Flags:
diff --git a/cli/pkg/cmd/BUILD b/cli/pkg/cmd/BUILD
index 191bce904d..424b39d7bc 100644
--- a/cli/pkg/cmd/BUILD
+++ b/cli/pkg/cmd/BUILD
@@ -16,6 +16,7 @@ go_library(
         "//cli/pkg/cmd/create",
         "//cli/pkg/cmd/status",
         "//cli/pkg/cmd/ui",
+        "//cli/pkg/cmd/upgrade",
         "//cli/pkg/workspace",
         "@com_github_spf13_cobra//:cobra",
         "@com_github_spf13_viper//:viper",
diff --git a/cli/pkg/cmd/create/BUILD b/cli/pkg/cmd/create/BUILD
index cb18e72ae6..83b32bd197 100644
--- a/cli/pkg/cmd/create/BUILD
+++ b/cli/pkg/cmd/create/BUILD
@@ -5,7 +5,6 @@ go_library(
     name = "create",
     srcs = [
         "create.go",
-        "helm.go",
     ],
     importpath = "cli/pkg/cmd/create",
     visibility = ["//visibility:public"],
@@ -15,6 +14,7 @@ go_library(
     deps = [
         "//cli/pkg/cmd/config",
         "//cli/pkg/console",
+        "//cli/pkg/helm",
         "//cli/pkg/kube",
         "//cli/pkg/providers",
         "//cli/pkg/workspace",
diff --git a/cli/pkg/cmd/create/create.go b/cli/pkg/cmd/create/create.go
index d8bab813d9..f364b67d9b 100644
--- a/cli/pkg/cmd/create/create.go
+++ b/cli/pkg/cmd/create/create.go
@@ -3,6 +3,7 @@ package create
 import (
 	"cli/pkg/cmd/config"
 	"cli/pkg/console"
+	"cli/pkg/helm"
 	"cli/pkg/kube"
 	"cli/pkg/providers"
 	"cli/pkg/workspace"
@@ -82,7 +83,7 @@ func create(cmd *cobra.Command, args []string) {
 		console.Exit("could not store the kube context: ", err)
 	}
 
-	helm := New(clientset, version, namespace, dir.GetAiryYaml())
+	helm := helm.New(clientset, version, namespace, dir.GetAiryYaml())
 	if err := helm.Setup(); err != nil {
 		console.Exit("setting up Helm failed with err: ", err)
 	}
diff --git a/cli/pkg/cmd/root.go b/cli/pkg/cmd/root.go
index c4271c3bb4..48ebcd08ab 100644
--- a/cli/pkg/cmd/root.go
+++ b/cli/pkg/cmd/root.go
@@ -6,6 +6,7 @@ import (
 	"cli/pkg/cmd/create"
 	"cli/pkg/cmd/status"
 	"cli/pkg/cmd/ui"
+	"cli/pkg/cmd/upgrade"
 	"cli/pkg/workspace"
 	"fmt"
 	"os"
@@ -62,4 +63,5 @@ func init() {
 	RootCmd.AddCommand(ui.UICmd)
 	RootCmd.AddCommand(versionCmd)
 	RootCmd.AddCommand(create.CreateCmd)
+	RootCmd.AddCommand(upgrade.UpgradeCmd)
 }
diff --git a/cli/pkg/cmd/upgrade/BUILD b/cli/pkg/cmd/upgrade/BUILD
new file mode 100644
index 0000000000..06b6d0432f
--- /dev/null
+++ b/cli/pkg/cmd/upgrade/BUILD
@@ -0,0 +1,32 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "upgrade",
+    srcs = ["upgrade.go"],
+    importpath = "cli/pkg/cmd/upgrade",
+    visibility = ["//visibility:public"],
+    x_defs = {
+        "Version": "{STABLE_VERSION}",
+    },
+    deps = [
+        "//cli/pkg/cmd/config",
+        "//cli/pkg/console",
+        "//cli/pkg/helm",
+        "//cli/pkg/kube",
+        "//cli/pkg/providers",
+        "//cli/pkg/workspace",
+        "//infrastructure/lib/go/k8s/util",
+        "@com_github_spf13_cobra//:cobra",
+        "@com_github_spf13_viper//:viper",
+        "@com_github_twinproduction_go_color//:go-color",
+        "@io_k8s_api//batch/v1:go_default_library",
+        "@io_k8s_api//core/v1:go_default_library",
+        "@io_k8s_api//rbac/v1:go_default_library",
+        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
+        "@io_k8s_apimachinery//pkg/watch:go_default_library",
+        "@io_k8s_client_go//kubernetes:go_default_library",
+    ],
+)
+
+check_pkg(name = "buildifier")
diff --git a/cli/pkg/cmd/upgrade/upgrade.go b/cli/pkg/cmd/upgrade/upgrade.go
new file mode 100644
index 0000000000..f97a1769b5
--- /dev/null
+++ b/cli/pkg/cmd/upgrade/upgrade.go
@@ -0,0 +1,96 @@
+package upgrade
+
+import (
+	"cli/pkg/cmd/config"
+	"cli/pkg/console"
+	"cli/pkg/helm"
+	"cli/pkg/kube"
+	"cli/pkg/workspace"
+	"fmt"
+
+	"github.com/airyhq/airy/infrastructure/lib/go/k8s/util"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var (
+	approve    bool
+	version    string
+	Version    string
+	UpgradeCmd = &cobra.Command{
+		Use:   "upgrade",
+		Short: "Upgrades an instance of Airy Core",
+		Long:  `Upgrades an existing Airy Core instance, read from a workspace directory (default .)`,
+		Args:  cobra.MaximumNArgs(1),
+		Run:   upgrade,
+	}
+)
+
+func init() {
+	UpgradeCmd.Flags().StringVar(&version, "version", "", "Specify a version to upgrade to (optional).")
+	UpgradeCmd.Flags().BoolVar(&approve, "approve", false, "Upgrade automatically without asking for an approval (optional).")
+}
+
+func upgrade(cmd *cobra.Command, args []string) {
+	autoApprove, _ := cmd.Flags().GetBool("approve")
+	workspacePath, err := cmd.Flags().GetString("workspace")
+	if err != nil {
+		console.Exit("Unable to find suitable workspace :", err)
+	}
+	dir := workspace.Init(workspacePath)
+	kubeCtx := kube.Load()
+	clientset, err := kubeCtx.GetClientSet()
+	namespace := viper.GetString("namespace")
+	if err != nil {
+		console.Exit("Could not find an installation of Airy Core. Get started here https://airy.co/docs/core/getting-started/installation/introduction")
+	}
+
+	if version == "" {
+		version = Version
+	}
+	clusterAiryConf, err := kube.GetDeployedAiryYaml(namespace, clientset)
+	if err != nil {
+		console.Exit("Unable to retrieve existing version of Airy Core: ", err.Error())
+	}
+	oldVersion := clusterAiryConf.Kubernetes.AppImageTag
+
+	fmt.Println("CLI version: ", Version)
+	fmt.Println("Current Airy Core version: ", oldVersion)
+	fmt.Println("New Airy Core version: ", version)
+	fmt.Println()
+
+	if autoApprove != true {
+		if util.ConfirmToProceed() == false {
+			console.Exit("Upgrade aborted.")
+		}
+	}
+
+	fmt.Println("Upgrading the helm charts of Airy Core...")
+	helm := helm.New(clientset, version, namespace, dir.GetAiryYaml())
+	if cmErr := helm.UpsertAiryConfigMap(); cmErr != nil {
+		console.Exit("Unable to copy config file into Airy Core :", cmErr)
+	}
+	if upgradeErr := helm.UpgradeCharts(); upgradeErr != nil {
+		console.Exit("Upgrading the Helm Charts failed with err: ", upgradeErr)
+	}
+
+	fmt.Println("Applying config from the configuration file.")
+	config.ApplyConfig(workspacePath)
+
+	fmt.Println(("Writing the new version into the configuration file."))
+	if writeVersionErr := dir.UpdateAiryYaml(func(conf workspace.AiryConf) workspace.AiryConf {
+		conf.Kubernetes.AppImageTag = version
+		return conf
+	}); writeVersionErr != nil {
+		console.Exit("Writing the version into config file failed with err: ", writeVersionErr)
+	}
+
+	fmt.Println("Copying the configuration file in the Airy Core K8s cluster.")
+	if cmErr := helm.UpsertAiryConfigMap(); cmErr != nil {
+		console.Exit("Unable to copy config file into Airy Core.")
+	}
+
+	fmt.Println("✅ Airy Core upgraded")
+	fmt.Println()
+}
diff --git a/cli/pkg/helm/BUILD b/cli/pkg/helm/BUILD
new file mode 100644
index 0000000000..9c26ea8a36
--- /dev/null
+++ b/cli/pkg/helm/BUILD
@@ -0,0 +1,17 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "helm",
+    srcs = ["helm.go"],
+    importpath = "cli/pkg/helm",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//cli/pkg/kube",
+        "@io_k8s_api//batch/v1:go_default_library",
+        "@io_k8s_api//core/v1:go_default_library",
+        "@io_k8s_api//rbac/v1:go_default_library",
+        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
+        "@io_k8s_apimachinery//pkg/watch:go_default_library",
+        "@io_k8s_client_go//kubernetes:go_default_library",
+    ],
+)
diff --git a/cli/pkg/cmd/create/helm.go b/cli/pkg/helm/helm.go
similarity index 85%
rename from cli/pkg/cmd/create/helm.go
rename to cli/pkg/helm/helm.go
index fe89ccab2d..fa19e93723 100644
--- a/cli/pkg/cmd/create/helm.go
+++ b/cli/pkg/helm/helm.go
@@ -1,4 +1,4 @@
-package create
+package helm
 
 import (
 	"bufio"
@@ -85,8 +85,28 @@ func (h *Helm) InstallCharts() error {
 		"airy", chartURL}))
 }
 
+func (h *Helm) UpgradeCharts() error {
+	chartURL := "https://airy-core-helm-charts.s3.amazonaws.com/stable/airy-" + h.version + ".tgz"
+	overrideVersion := "global.kubernetes.appImageTag=" + h.version
+	return h.runHelm(append([]string{"upgrade",
+		"--values", "/apps/config/airy-config-map.yaml",
+		"--set", overrideVersion,
+		"--timeout", "10m0s",
+		"airy", chartURL}))
+}
+
+func (h *Helm) RollBackUpgrade(version string) error {
+	chartURL := "https://airy-core-helm-charts.s3.amazonaws.com/stable/airy-" + version + ".tgz"
+	overrideVersion := "global.kubernetes.appImageTag=" + version
+	return h.runHelm(append([]string{"upgrade",
+		"--values", "/apps/config/airy-config-map.yaml",
+		"--set", overrideVersion,
+		"--timeout", "10m0s",
+		"airy", chartURL}))
+}
+
 func (h *Helm) runHelm(args []string) error {
-	if err := h.upsertAiryConfigMap(); err != nil {
+	if err := h.UpsertAiryConfigMap(); err != nil {
 		return err
 	}
 
@@ -168,7 +188,7 @@ func (h *Helm) runHelm(args []string) error {
 }
 
 // Create/update airy config map
-func (h *Helm) upsertAiryConfigMap() error {
+func (h *Helm) UpsertAiryConfigMap() error {
 	cm, _ := h.clientset.CoreV1().ConfigMaps(h.namespace).Get(context.TODO(), airyConfigMap, v1.GetOptions{})
 
 	file, err := ioutil.ReadFile(h.configPath)
diff --git a/cli/pkg/kube/BUILD b/cli/pkg/kube/BUILD
index 23685fd4a5..0d4a4bf2d6 100644
--- a/cli/pkg/kube/BUILD
+++ b/cli/pkg/kube/BUILD
@@ -10,7 +10,9 @@ go_library(
     importpath = "cli/pkg/kube",
     visibility = ["//visibility:public"],
     deps = [
+        "//cli/pkg/workspace",
         "@com_github_spf13_viper//:viper",
+        "@in_gopkg_yaml_v2//:yaml_v2",
         "@io_k8s_api//core/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
         "@io_k8s_client_go//kubernetes:go_default_library",
diff --git a/cli/pkg/kube/configmaps.go b/cli/pkg/kube/configmaps.go
index 461905e0f5..4757c554be 100644
--- a/cli/pkg/kube/configmaps.go
+++ b/cli/pkg/kube/configmaps.go
@@ -1,8 +1,12 @@
 package kube
 
 import (
+	"cli/pkg/workspace"
 	"context"
+
+	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -15,7 +19,7 @@ func ApplyConfigMap(configmapName string, namespace string, cmData map[string]st
 				ObjectMeta: v1.ObjectMeta{
 					Name:      configmapName,
 					Namespace: namespace,
-					Labels: labels,
+					Labels:    labels,
 				},
 				Data: cmData,
 			}, v1.CreateOptions{})
@@ -30,8 +34,32 @@ func ApplyConfigMap(configmapName string, namespace string, cmData map[string]st
 func DeleteConfigMap(configmapName string, namespace string, clientset *kubernetes.Clientset) error {
 	cm, _ := clientset.CoreV1().ConfigMaps(namespace).Get(context.TODO(), configmapName, v1.GetOptions{})
 	if cm.GetName() != "" {
-		err := clientset.CoreV1().ConfigMaps(namespace).Delete(context.TODO(),configmapName, v1.DeleteOptions{})
+		err := clientset.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), configmapName, v1.DeleteOptions{})
 		return err
 	}
 	return nil
 }
+
+func GetCmData(configmapName string, namespace string, clientset *kubernetes.Clientset) (map[string]string, error) {
+	configMaps := clientset.CoreV1().ConfigMaps(namespace)
+
+	configMap, err := configMaps.Get(context.TODO(), configmapName, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return configMap.Data, nil
+}
+
+func GetDeployedAiryYaml(namespace string, clientset *kubernetes.Clientset) (workspace.AiryConf, error) {
+	airyYaml, err := GetCmData("airy-config-map", namespace, clientset)
+	if err != nil {
+		return workspace.AiryConf{}, err
+	}
+	deployedAiryYaml := workspace.HelmAiryConf{}
+	err = yaml.Unmarshal([]byte(airyYaml["airy-config-map.yaml"]), &deployedAiryYaml)
+	if err != nil {
+		return workspace.AiryConf{}, err
+	}
+	return deployedAiryYaml.Global, nil
+}
diff --git a/cli/pkg/workspace/airy_yaml.go b/cli/pkg/workspace/airy_yaml.go
index 2d5aa7ebe0..8f8b93d3d3 100644
--- a/cli/pkg/workspace/airy_yaml.go
+++ b/cli/pkg/workspace/airy_yaml.go
@@ -1,22 +1,17 @@
 package workspace
 
 type KubernetesConf struct {
-	AppImageTag             string            `yaml:"appImageTag"`
-	ContainerRegistry       string            `yaml:"containerRegistry"`
-	Namespace               string            `yaml:"namespace"`
-	NgrokEnabled            string            `yaml:"ngrokEnabled"`
-	Host                    string            `yaml:"host"`
-	Https                   string            `yaml:"https,omitempty`
-	LoadbalancerAnnotations map[string]string `yaml:"loadbalancerAnnotations,omitempty"`
-	LetsencryptEmail        string            `yaml:"letsencryptEmail,omitempty`
+	AppImageTag       string `yaml:"appImageTag"`
+	ContainerRegistry string `yaml:"containerRegistry"`
+	Namespace         string `yaml:"namespace"`
+	NgrokEnabled      bool   `yaml:"ngrokEnabled"`
+	Host              string `yaml:"host"`
 }
 
-type componentsConf map[string]map[string]string
-
-type AiryConf struct {
-	Kubernetes KubernetesConf            `yaml:"kubernetes"`
-	Security   SecurityConf              `yaml:"security"`
-	Components map[string]componentsConf `yaml:"components,omitempty"`
+type IngressConf struct {
+	Https                   bool              `yaml:"https,omitempty"`
+	LetsencryptEmail        string            `yaml:"letsencryptEmail,omitempty"`
+	LoadbalancerAnnotations map[string]string `yaml:"loadbalancerAnnotations,omitempty"`
 }
 
 type SecurityConf struct {
@@ -25,3 +20,15 @@ type SecurityConf struct {
 	JwtSecret      string            `yaml:"jwtSecret"`
 	Oidc           map[string]string `yaml:"oidc,omitempty"`
 }
+type ComponentsConf map[string]map[string]string
+
+type AiryConf struct {
+	Kubernetes KubernetesConf            `yaml:"kubernetes"`
+	Ingress    IngressConf               `yaml:"ingress"`
+	Security   SecurityConf              `yaml:"security"`
+	Components map[string]ComponentsConf `yaml:"components,omitempty"`
+}
+
+type HelmAiryConf struct {
+	Global AiryConf `yaml:"global"`
+}
diff --git a/cli/pkg/workspace/template/src/airy.yaml b/cli/pkg/workspace/template/src/airy.yaml
index e164bf44b4..4e6b147217 100644
--- a/cli/pkg/workspace/template/src/airy.yaml
+++ b/cli/pkg/workspace/template/src/airy.yaml
@@ -2,12 +2,12 @@ kubernetes:
   appImageTag: {{ .Version }}
   containerRegistry: ghcr.io/airyhq
   namespace: {{ .Namespace }}
-  ngrokEnabled: {{ default "false" .NgrokEnabled }}
+  ngrokEnabled: {{ default false .NgrokEnabled }}
 {{- if .Host }}
   host: {{ default "airy.core" .Host }}
 {{- end }}
 ingress:
-  https: {{ default "false" .Https}}
+  https: {{ default false .Https}}
   letsencryptEmail: {{ .LetsencryptEmail}}
   {{- if .LoadbalancerAnnotations }}
   loadbalancerAnnotations:
@@ -16,7 +16,7 @@ ingress:
   {{- end }}
   {{- end }}
 security:
-  allowedOrigins: "*"
+  allowedOrigins: '*'
   jwtSecret: {{ randAlphaNum 128 }}
 components:
   sources:
diff --git a/docs/docs/api/endpoints/connect-viber.mdx b/docs/docs/api/endpoints/connect-viber.mdx
new file mode 100644
index 0000000000..a2279666f1
--- /dev/null
+++ b/docs/docs/api/endpoints/connect-viber.mdx
@@ -0,0 +1,26 @@
+Connects your viber account to Airy.
+
+```
+POST /channels.viber.connect
+```
+
+- `name` (optional) overwrite the Viber account name
+- `image_url` (optional) overwrite the Viber account image
+
+```json5
+{
+  "name": "My custom name for this location", // optional
+  "image_url": "https://example.com/custom-image.jpg" // optional
+}
+```
+
+**Sample response**
+
+```json5
+{
+  "id": "channel-uuid-1",
+  "metadata": {"name": "My custom name for this location", "image_url": "https://example.com/custom-image.jpg"},
+  "source": "viber",
+  "source_channel_id": "Viber account id"
+}
+```
diff --git a/docs/docs/api/endpoints/messages-send.mdx b/docs/docs/api/endpoints/messages-send.mdx
index aa4acd3ae4..3aa696ccdf 100644
--- a/docs/docs/api/endpoints/messages-send.mdx
+++ b/docs/docs/api/endpoints/messages-send.mdx
@@ -2,7 +2,7 @@
 
 Sends a message to a conversation and returns a payload. Whatever is put on the
 `message` field will be forwarded "as-is" to the source's message endpoint. Therefore,
-the payload will look differently for each source. Refer to each [source's documentation](sources/introduction)
+the payload will look differently for each source. Refer to each [source's documentation](/sources/introduction)
 to see learn how to send text, media, and many more message types.
 
 
diff --git a/docs/docs/api/webhook.md b/docs/docs/api/webhook.md
index 0b5a87d823..f0f0e45f1d 100644
--- a/docs/docs/api/webhook.md
+++ b/docs/docs/api/webhook.md
@@ -7,7 +7,7 @@ import TLDR from "@site/src/components/TLDR";
 
 <TLDR>
 
-Use Webhooks to receive events to notify you when a variety of interactions or events happen.
+Use Webhooks to get notified when events happen.
 
 </TLDR>
 
@@ -24,12 +24,11 @@ conversations by sending messages or reacting to them. Here's a common
 integration pattern:
 
 - Call the [subscribe](#subscribing) endpoint
-- Consume on your URL of choice [events](#event-payload)
-- React to those events by calling the [send
-  message](/api/endpoints/messages.md#send) endpoint
+- Consume on your URL of choice [events](#events)
+- React to those events by calling the [send message](/api/endpoints/messages.md#send) endpoint
 
 You must de-duplicate messages on arrival as the webhook _does not_ guarantee
-events uniqueness.
+events uniqueness. Your webhook also has to respond to every message with a status code of `200`.
 
 ## Subscribing
 
@@ -41,23 +40,41 @@ Subscribes the webhook for the first time or update its parameters.
 
 ```json5
 {
-  "url": "https://my-url-to-be-hit",
+  "url": "https://endpoint.com/webhook", // required
+  "id": "3e639566-29fa-450d-a59f-ae3c25d7260f",
+  "events": ["message.created", "message.updated", "conversation.updated", "channel.updated"],
   "headers": {
-    "X-Custom-Header": "custom-code-for-header"
-  }
+    "X-Custom-Header": "e.g. authentication token"
+  },
+  "signature_key": "secret-key-for-hmac-header"
 }
 ```
 
+- `url` Endpoint to be called when sending events.
+- `id` (optional) provide for updates
+- `headers` (optional) HTTP headers to set on each request (useful for authentication)
+- `signature_key` (optional) when set, the webhook will also sent a header `X-Airy-Content-Signature` that contains the SHA256 HMAC of the specified key and the content.
+- `events` (optional) List of event types to receive. [See below](#events) for a detailed list. Omit to receive all event types.
+
 **Sample response**
 
 ```json5
 {
-  "url": "https://my-url-to-be-hit",
+  "id": "3e639566-29fa-450d-a59f-ae3c25d7260f",
+  "name": "Customer relationship tool", // optional
+  "url": "https://endpoint.com/webhook",
+  "events": [
+    // optional
+    "message.created",
+    "message.updated",
+    "conversation.updated",
+    "channel.updated"
+  ],
   "headers": {
+    // optional
     "X-Custom-Header": "custom-code-for-header"
   },
-  "status": "Subscribed",
-  "api_secret": "{UUID}"
+  "status": "Subscribed"
 }
 ```
 
@@ -69,12 +86,36 @@ Subscribes the webhook for the first time or update its parameters.
 
 ```json5
 {
-  "url": "https://my-url-to-be-hit",
+  "url": "https://endpoint.com/webhook",
   "headers": {
     "X-Custom-Header": "custom-code-for-header"
   },
-  "status": "Unsubscribed",
-  "api_secret": "{UUID}"
+  "status": "Unsubscribed"
+}
+```
+
+## List
+
+`POST /webhooks.list`
+
+```json5
+{
+  "data": [
+    {
+      "status": "Subscribed",
+      "name": "Customer relationship tool",
+      "url": "https://endpoint.com/webhook",
+      "headers": {
+        "X-Custom-Header": "custom-code-for-header"
+      }
+    },
+    {
+      "status": "Subscribed",
+      "name": "Datalake connector",
+      "url": "https://other-endpoint.com/webhook",
+      "events": ["conversation.updated"]
+    }
+  ]
 }
 ```
 
@@ -82,66 +123,126 @@ Subscribes the webhook for the first time or update its parameters.
 
 `POST /webhooks.info`
 
+**Sample request**
+
+```json5
+{
+  "id": "3e639566-29fa-450d-a59f-ae3c25d7260f"
+}
+```
+
 **Sample response**
 
 ```json5
 {
   "status": "Subscribed",
-  "url": "https://my-url-to-be-hit",
+  "name": "Customer relationship tool",
+  "url": "https://endpoint.com/webhook",
   "headers": {
     "X-Custom-Header": "custom-code-for-header"
   }
 }
 ```
 
-## Event Payloads
+## Events
 
 After [subscribing](#subscribing) to an Airy webhook, you will
 start receiving events on your URL of choice. The event will _always_ be a POST
 request with one the following payloads:
 
-### Message
+### `message.created`
 
 ```json5
 {
-  "type": "message",
+  "type": "message:created",
   "payload": {
     "conversation_id": "{UUID}",
     "channel_id": "{UUID}",
     "message": {
       "id": "{UUID}",
-      "content": {"text": "Hello World"},
-      // source message payload
-      "delivery_state": "pending|failed|delivered",
-      // delivery state of message, one of pending, failed, delivered
+      "content": {"text": "Hello World"}, // source message payload
+      "delivery_state": "pending|failed|delivered", // delivery state of message, one of pending, failed, delivered
       "from_contact": true,
-      "sent_at": "{string}",
-      //'yyyy-MM-dd'T'HH:mm:ss.SSSZ' date in UTC form, to be localized by clients
-      "source": "{String}"
-      // one of the possible sources
+      "sent_at": "2020-10-25T21:24:54.560Z", // ISO 8601 date string
+      "source": "facebook" // messaging source
     }
   }
 }
 ```
 
-### Metadata
+### `message.updated`
 
-**Sample payload**
+Sent whenever a message is updated (e.g. delivery state) or its [metadata](concepts/metadata.md) changed.
 
 ```json5
 {
-  "type": "metadata",
+  "type": "message:created",
+  "payload": {
+    "conversation_id": "{UUID}",
+    "channel_id": "{UUID}",
+    "message": {
+      "id": "{UUID}",
+      "content": {"text": "Hello World"}, // source message payload
+      "delivery_state": "pending|failed|delivered", // delivery state of message, one of pending, failed, delivered
+      "from_contact": false,
+      "sent_at": "2020-10-25T21:24:54.560Z", // ISO 8601 date string
+      "source": "facebook", // messaging source
+      "metadata": {
+        "source": {
+          "id": "facebook message id",
+          "delivery_state": "seen"
+        }
+      }
+    }
+  }
+}
+```
 
+### `conversation.updated`
+
+**Sample payload**
+
+```json5
+{
+  "type": "conversation:updated",
   "payload": {
-    "subject": "conversation|channel|message",
-    "identifier": "conversation/channel/message id",
+    "id": "2e1da639-7152-4595-b43e-2117a55ac260",
+    "created_at": "2020-10-25T21:24:54.560Z", // ISO 8601 date string
+    "channel_id": "b9963564-1167-5b5f-9f61-7c1a82573320",
     "metadata": {
-      // nested metadata object. I.e. for a conversation:
       "contact": {
-        "displayName": "Grace"
+        "displayName": "Grace Hopper"
       },
       "isUserTyping": true
+    },
+    "last_message": {
+      "id": "{UUID}",
+      "content": {"text": "Hello World"}, // source message payload
+      "delivery_state": "pending|failed|delivered", // delivery state of message, one of pending, failed, delivered
+      "from_contact": true,
+      "sent_at": "2020-10-25T21:24:54.560Z", // ISO 8601 date string
+      "source": "facebook" // messaging source
     }
   }
 }
 ```
+
+### `channel.updated`
+
+Sent whenever a channel is (un-) subscribed or its metadata changes.
+
+```json5
+{
+  "type": "channel.updated",
+  "payload": {
+    "id": "771b8bb5-c611-4979-bfd9-f10bbddfcf9b",
+    "source": "facebook",
+    "source_channel_id": "fb-page-id-1",
+    "metadata": {
+      "name": "My page 1",
+      "image_url": "http://example.org/avatar.jpeg" // optional
+    },
+    "connected": true
+  }
+}
+```
diff --git a/docs/docs/api/websocket.md b/docs/docs/api/websocket.md
index ffe2080688..5c7a077ae2 100644
--- a/docs/docs/api/websocket.md
+++ b/docs/docs/api/websocket.md
@@ -22,11 +22,11 @@ All event updates are sent to the `/events` queue as JSON encoded payloads. The
 `type` field informs the client of the kind of update that is encoded in the
 payload.
 
-### Message
+### `message.updated`
 
 ```json5
 {
-  "type": "message",
+  "type": "message.updated",
   "payload": {
     "conversation_id": "{UUID}",
     "channel_id": "{UUID}",
@@ -46,13 +46,15 @@ payload.
 }
 ```
 
-### Metadata
+### `metadata.updated`
+
+Includes the full and current state of a metadata object given a namespace-identifier pair
 
 **Sample payload**
 
 ```json5
 {
-  "type": "metadata",
+  "type": "metadata.updated",
 
   "payload": {
     "subject": "conversation|channel|message",
@@ -72,7 +74,7 @@ payload.
 
 ```json5
 {
-  "type": "channel",
+  "type": "channel.updated",
 
   "payload": {
     "id": "{UUID}",
@@ -87,7 +89,7 @@ payload.
 
 ```json5
 {
-  "type": "tag",
+  "type": "tag.updated",
 
   "payload": {
     "id": "{UUID}",
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index 22cab5ea3b..2c6454f812 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -3,6 +3,59 @@ title: Changelog
 sidebar_label: 📝 Changelog
 ---
 
+## 0.29.0
+
+[[#2282](https://github.com/airyhq/airy/issues/2282)] Hotfix for webhook registration failing despite all services healthy [[#2283](https://github.com/airyhq/airy/pull/2283)]
+## 
+
+#### Changes
+
+- [[#2304](https://github.com/airyhq/airy/issues/2304)] Fixed broken link from Messages Send Section to Sources. [[#2307](https://github.com/airyhq/airy/pull/2307)]
+- [[#2308](https://github.com/airyhq/airy/issues/2308)] Chatplugin Customize Section Not Working [[#2309](https://github.com/airyhq/airy/pull/2309)]
+
+#### 🚀 Features
+
+- [[#2275](https://github.com/airyhq/airy/issues/2275)] Upgrade api-communication [[#2331](https://github.com/airyhq/airy/pull/2331)]
+- [[#2286](https://github.com/airyhq/airy/issues/2286)] Core upgrade scripts for 0.29.0 [[#2322](https://github.com/airyhq/airy/pull/2322)]
+- [[#2324](https://github.com/airyhq/airy/issues/2324)] Added more configs to the ui [[#2326](https://github.com/airyhq/airy/pull/2326)]
+- [[#2275](https://github.com/airyhq/airy/issues/2275)] Allow for multiple webhooks and event filtering [[#2286](https://github.com/airyhq/airy/pull/2286)]
+- [[#2243](https://github.com/airyhq/airy/issues/2243)] Introduce airy upgrade [[#2292](https://github.com/airyhq/airy/pull/2292)]
+- [[#2314](https://github.com/airyhq/airy/issues/2314)] fix docs + fix responsiveness of chatplugin [[#2315](https://github.com/airyhq/airy/pull/2315)]
+- [[#2279](https://github.com/airyhq/airy/issues/2279)] [[#2280](https://github.com/airyhq/airy/issues/2280)] More configs for chatplugin + docs [[#2301](https://github.com/airyhq/airy/pull/2301)]
+
+#### 🐛 Bug Fixes
+
+- [[#2282](https://github.com/airyhq/airy/issues/2282)] Hotfix for webhook registration health check [[#2284](https://github.com/airyhq/airy/pull/2284)]
+
+#### 🧰 Maintenance
+
+- Bump react-markdown from 6.0.3 to 7.0.0 [[#2317](https://github.com/airyhq/airy/pull/2317)]
+- Bump @types/react from 17.0.18 to 17.0.19 [[#2320](https://github.com/airyhq/airy/pull/2320)]
+- Bump webpack from 5.50.0 to 5.51.1 [[#2316](https://github.com/airyhq/airy/pull/2316)]
+- Bump @types/node from 16.6.1 to 16.7.1 [[#2318](https://github.com/airyhq/airy/pull/2318)]
+- Bump cypress from 8.1.0 to 8.3.0 [[#2311](https://github.com/airyhq/airy/pull/2311)]
+- Bump core-js from 3.16.1 to 3.16.2 [[#2312](https://github.com/airyhq/airy/pull/2312)]
+- Bump @types/react from 17.0.17 to 17.0.18 [[#2313](https://github.com/airyhq/airy/pull/2313)]
+- Bump react-markdown from 6.0.3 to 7.0.0 [[#2297](https://github.com/airyhq/airy/pull/2297)]
+- Bump @babel/core from 7.14.8 to 7.15.0 [[#2303](https://github.com/airyhq/airy/pull/2303)]
+- Bump sass from 1.37.5 to 1.38.0 [[#2306](https://github.com/airyhq/airy/pull/2306)]
+- Bump webpack from 5.49.0 to 5.50.0 [[#2302](https://github.com/airyhq/airy/pull/2302)]
+- Bump @typescript-eslint/parser from 4.29.1 to 4.29.2 [[#2295](https://github.com/airyhq/airy/pull/2295)]
+- Bump core-js from 3.16.0 to 3.16.1 [[#2298](https://github.com/airyhq/airy/pull/2298)]
+- Bump @types/node from 16.4.13 to 16.6.1 [[#2287](https://github.com/airyhq/airy/pull/2287)]
+- Bump @babel/preset-typescript from 7.14.5 to 7.15.0 [[#2288](https://github.com/airyhq/airy/pull/2288)]
+- Bump webpack-cli from 4.7.2 to 4.8.0 [[#2290](https://github.com/airyhq/airy/pull/2290)]
+- Bump @typescript-eslint/parser from 4.29.0 to 4.29.1 [[#2291](https://github.com/airyhq/airy/pull/2291)]
+- Bump url-parse from 1.5.1 to 1.5.3 [[#2268](https://github.com/airyhq/airy/pull/2268)]
+
+#### Airy CLI
+
+You can download the Airy CLI for your operating system from the following links:
+
+[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.28.2/darwin/amd64/airy)
+[Linux](https://airy-core-binaries.s3.amazonaws.com/0.28.2/linux/amd64/airy)
+[Windows](https://airy-core-binaries.s3.amazonaws.com/0.28.2/windows/amd64/airy.exe)
+
 ## 0.28.0
 
 #### 🚀 Features
@@ -1172,147 +1225,3 @@ You can download the Airy CLI for your operating system from the following links
 [Linux](https://airy-core-binaries.s3.amazonaws.com/0.8.0/linux/amd64/airy)
 [Windows](https://airy-core-binaries.s3.amazonaws.com/0.8.0/windows/amd64/airy.exe)
 
-## 0.7.0
-
-#### Changes
-
-- [[#685](https://github.com/airyhq/airy/issues/685)] Type errors not caught by Typescript [[#780](https://github.com/airyhq/airy/pull/780)]
-- [[#288](https://github.com/airyhq/airy/issues/288)] Upgrade to Bazel 4.0.0 [[#799](https://github.com/airyhq/airy/pull/799)]
-- [[#403](https://github.com/airyhq/airy/issues/403)] Filter for conversations [[#744](https://github.com/airyhq/airy/pull/744)]
-- [[#745](https://github.com/airyhq/airy/issues/745)] Fixing demo api host env when running… [[#746](https://github.com/airyhq/airy/pull/746)]
-
-#### 🚀 Features
-
-- [[#824](https://github.com/airyhq/airy/issues/824)] When sending a message to the Chat Plugin,… [[#825](https://github.com/airyhq/airy/pull/825)]
-- [[#642](https://github.com/airyhq/airy/issues/642)] extract message rendering to a library [[#716](https://github.com/airyhq/airy/pull/716)]
-- [[#809](https://github.com/airyhq/airy/issues/809)] Httpclientinstance does not get new auth… [[#811](https://github.com/airyhq/airy/pull/811)]
-- [[#804](https://github.com/airyhq/airy/issues/804)] Websocket crashes when new conversation is… [[#808](https://github.com/airyhq/airy/pull/808)]
-- [[#538](https://github.com/airyhq/airy/issues/538)] Wire websocket server to the redux store [[#708](https://github.com/airyhq/airy/pull/708)]
-- [[#310](https://github.com/airyhq/airy/issues/310)] autogenerated md docs for cli [[#792](https://github.com/airyhq/airy/pull/792)]
-- [[#754](https://github.com/airyhq/airy/issues/754)] Specify CPUs and memory at bootstrap [[#782](https://github.com/airyhq/airy/pull/782)]
-- [[#401](https://github.com/airyhq/airy/issues/401)] Implement input bar, write \& send message functionality [[#755](https://github.com/airyhq/airy/pull/755)]
-- [[#752](https://github.com/airyhq/airy/issues/752)] airy version command should work without loading the config [[#769](https://github.com/airyhq/airy/pull/769)]
-- [[#742](https://github.com/airyhq/airy/issues/742)] Chatplugin example page crashes when… [[#768](https://github.com/airyhq/airy/pull/768)]
-- [[#611](https://github.com/airyhq/airy/issues/611)] infinite scroll for conversations list and messages [[#720](https://github.com/airyhq/airy/pull/720)]
-- [[#723](https://github.com/airyhq/airy/issues/723)] Resolving source media without typed mapping [[#748](https://github.com/airyhq/airy/pull/748)]
-- [[#691](https://github.com/airyhq/airy/issues/691)] Support tag\_ids filter queries [[#760](https://github.com/airyhq/airy/pull/760)]
-- [[#723](https://github.com/airyhq/airy/issues/723)] Update backend message content for a transparent send message API [[#727](https://github.com/airyhq/airy/pull/727)]
-
-#### 🐛 Bug Fixes
-
-- [[#754](https://github.com/airyhq/airy/issues/754)] Fix bootstrap for empty vars [[#801](https://github.com/airyhq/airy/pull/801)]
-- [[#785](https://github.com/airyhq/airy/issues/785)] display messages from auth in chat plugin  [[#793](https://github.com/airyhq/airy/pull/793)]
-- [[#813](https://github.com/airyhq/airy/issues/813)] Prevent sending empty messages [[#816](https://github.com/airyhq/airy/pull/816)]
-- [[#802](https://github.com/airyhq/airy/issues/802)] Fix expanding message container [[#803](https://github.com/airyhq/airy/pull/803)]
-- [[#791](https://github.com/airyhq/airy/issues/791)] Message Input UI/Design Improvement [[#795](https://github.com/airyhq/airy/pull/795)]
-- [[#739](https://github.com/airyhq/airy/issues/739)] Fix Airy cli version when provisioning [[#787](https://github.com/airyhq/airy/pull/787)]
-- Keep default in sync with the rest of the system [[#786](https://github.com/airyhq/airy/pull/786)]
-- [[#788](https://github.com/airyhq/airy/issues/788)] Import StateModel instead of RootState [[#789](https://github.com/airyhq/airy/pull/789)]
-- [[#706](https://github.com/airyhq/airy/issues/706)] Make NGrok optional [[#756](https://github.com/airyhq/airy/pull/756)]
-- [[#778](https://github.com/airyhq/airy/issues/778)] Fix display of messages in Chat Plugin [[#779](https://github.com/airyhq/airy/pull/779)]
-- [[#757](https://github.com/airyhq/airy/issues/757)] fixed read conversation when it is active [[#759](https://github.com/airyhq/airy/pull/759)]
-- [[#654](https://github.com/airyhq/airy/issues/654)] Replace scss files with scss modules [[#753](https://github.com/airyhq/airy/pull/753)]
-- Upgrade viper [[#747](https://github.com/airyhq/airy/pull/747)]
-
-#### 📚 Documentation
-
-- Add more docs on the installation process [[#822](https://github.com/airyhq/airy/pull/822)]
-- [[#800](https://github.com/airyhq/airy/issues/800)] Restructure deployment documentation [[#826](https://github.com/airyhq/airy/pull/826)]
-- [[#819](https://github.com/airyhq/airy/issues/819)] Introduce sources introduction [[#823](https://github.com/airyhq/airy/pull/823)]
-- [[#810](https://github.com/airyhq/airy/issues/810)] Better troubleshooting page [[#818](https://github.com/airyhq/airy/pull/818)]
-- [[#815](https://github.com/airyhq/airy/issues/815)] Rename sources [[#817](https://github.com/airyhq/airy/pull/817)]
-- [[#310](https://github.com/airyhq/airy/issues/310)] autogenerated md docs for cli [[#792](https://github.com/airyhq/airy/pull/792)]
-- [[#765](https://github.com/airyhq/airy/issues/765)] Restructure API docs [[#781](https://github.com/airyhq/airy/pull/781)]
-- [[#775](https://github.com/airyhq/airy/issues/775)] Add ga config [[#777](https://github.com/airyhq/airy/pull/777)]
-- [[#774](https://github.com/airyhq/airy/issues/774)] Better favicon [[#776](https://github.com/airyhq/airy/pull/776)]
-- [[#491](https://github.com/airyhq/airy/issues/491)] Do not show the edit button for docs [[#771](https://github.com/airyhq/airy/pull/771)]
-- [[#731](https://github.com/airyhq/airy/issues/731)] Follow up on revamp of the structure [[#767](https://github.com/airyhq/airy/pull/767)]
-- [[#731](https://github.com/airyhq/airy/issues/731)] Doc revamp [[#758](https://github.com/airyhq/airy/pull/758)]
-
-#### 🧰 Maintenance
-
-- Untrack .ijwb since it makes importing the project more difficult [[#766](https://github.com/airyhq/airy/pull/766)]
-
-#### Airy CLI
-
-You can download the Airy CLI for your operating system from the following links:
-
-[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.7.0/darwin/amd64/airy)
-[Linux](https://airy-core-binaries.s3.amazonaws.com/0.7.0/linux/amd64/airy)
-[Windows](https://airy-core-binaries.s3.amazonaws.com/0.7.0/windows/amd64/airy.exe)
-
-## 0.6.0
-
-#### 🚀 Features
-
-- [[#623](https://github.com/airyhq/airy/issues/623)] Optional apps depend on config file [[#719](https://github.com/airyhq/airy/pull/719)]
-- [[#698](https://github.com/airyhq/airy/issues/698)] Provide endpoint configuration to the frontend [[#712](https://github.com/airyhq/airy/pull/712)]
-- [[#704](https://github.com/airyhq/airy/issues/704)] Update websocket documentation [[#705](https://github.com/airyhq/airy/pull/705)]
-- [[#620](https://github.com/airyhq/airy/issues/620)] Reload configuration based on config file [[#655](https://github.com/airyhq/airy/pull/655)]
-- [[#644](https://github.com/airyhq/airy/issues/644)] Facebook connector sends out templates [[#683](https://github.com/airyhq/airy/pull/683)]
-- [[#667](https://github.com/airyhq/airy/issues/667)] Support Google suggestion responses [[#690](https://github.com/airyhq/airy/pull/690)]
-- [[#622](https://github.com/airyhq/airy/issues/622)] Affect only deployments with a particular… [[#688](https://github.com/airyhq/airy/pull/688)]
-- Introduce status command [[#686](https://github.com/airyhq/airy/pull/686)]
-- [[#402](https://github.com/airyhq/airy/issues/402)] Tag conversations [[#682](https://github.com/airyhq/airy/pull/682)]
-- [[#640](https://github.com/airyhq/airy/issues/640)] Enrich send message API with source template messages [[#680](https://github.com/airyhq/airy/pull/680)]
-- [[#641](https://github.com/airyhq/airy/issues/641)] Add content type for source templates [[#676](https://github.com/airyhq/airy/pull/676)]
-- [[#620](https://github.com/airyhq/airy/issues/620)] Download kubeconf file [[#673](https://github.com/airyhq/airy/pull/673)]
-- [[#308](https://github.com/airyhq/airy/issues/308)] Upload cli binaries to S3 [[#669](https://github.com/airyhq/airy/pull/669)]
-- [[#621](https://github.com/airyhq/airy/issues/621)] Controller starts/stops apps based on config map changes [[#647](https://github.com/airyhq/airy/pull/647)]
-- Introduce /client.config [[#668](https://github.com/airyhq/airy/pull/668)]
-- [[#646](https://github.com/airyhq/airy/issues/646)] Configurable ingress hostnames [[#648](https://github.com/airyhq/airy/pull/648)]
-- [[#306](https://github.com/airyhq/airy/issues/306)] cli config [[#649](https://github.com/airyhq/airy/pull/649)]
-- [[#501](https://github.com/airyhq/airy/issues/501)] Resume conversation in chat plugin [[#603](https://github.com/airyhq/airy/pull/603)]
-- [[#497](https://github.com/airyhq/airy/issues/497)] Upload metadata and message source files [[#602](https://github.com/airyhq/airy/pull/602)]
-- [[#599](https://github.com/airyhq/airy/issues/599)] Display avatar + time in messages [[#625](https://github.com/airyhq/airy/pull/625)]
-- [[#614](https://github.com/airyhq/airy/issues/614)] Fix release script [[#615](https://github.com/airyhq/airy/pull/615)]
-- [[#598](https://github.com/airyhq/airy/issues/598)] Feature/598 read unread state of conversations [[#617](https://github.com/airyhq/airy/pull/617)]
-
-
-#### 🐛 Bug Fixes
-
-- [[#623](https://github.com/airyhq/airy/issues/623)] Fix Google safile sample config [[#736](https://github.com/airyhq/airy/pull/736)]
-- [[#623](https://github.com/airyhq/airy/issues/623)] Fix manifest for the chatpluign [[#732](https://github.com/airyhq/airy/pull/732)]
-- Fix numeric range queries [[#730](https://github.com/airyhq/airy/pull/730)]
-- Return messages last to first so pagination makes sense [[#728](https://github.com/airyhq/airy/pull/728)]
-- Fix infinite recursion in chatplugin nginx location capture [[#725](https://github.com/airyhq/airy/pull/725)]
-- [[#698](https://github.com/airyhq/airy/issues/698)] Use host config coming from the env [[#721](https://github.com/airyhq/airy/pull/721)]
-- Rm extra bracket [[#717](https://github.com/airyhq/airy/pull/717)]
-- Paginate messages for real :) [[#715](https://github.com/airyhq/airy/pull/715)]
-- [[#713](https://github.com/airyhq/airy/issues/713)] Fix bug on tags list [[#714](https://github.com/airyhq/airy/pull/714)]
-- [[#695](https://github.com/airyhq/airy/issues/695)] Fix yq version incompatibility [[#697](https://github.com/airyhq/airy/pull/697)]
-- [[#678](https://github.com/airyhq/airy/issues/678)] Update VERSION file after release [[#684](https://github.com/airyhq/airy/pull/684)]
-- [[#421](https://github.com/airyhq/airy/issues/421)] Consider service disabled if any exception occurs [[#674](https://github.com/airyhq/airy/pull/674)]
-- Endpoints should return {} instead of nothing [[#672](https://github.com/airyhq/airy/pull/672)]
-- refactored lib with class that can be instantiated [[#664](https://github.com/airyhq/airy/pull/664)]
-- add mappers to ts http client lib  [[#657](https://github.com/airyhq/airy/pull/657)]
-- [[#692](https://github.com/airyhq/airy/issues/692)] unread count [[#734](https://github.com/airyhq/airy/pull/734)]
-- [[#546](https://github.com/airyhq/airy/issues/546)] Fix/546 revise image tags [[#658](https://github.com/airyhq/airy/pull/658)]
-
-#### 📚 Documentation
-
-- Update README.md [[#700](https://github.com/airyhq/airy/pull/700)]
-
-#### 🧰 Maintenance
-
-- Remove suppression [[#702](https://github.com/airyhq/airy/pull/702)]
-- Improve config tests and introduce integration tests runner func [[#726](https://github.com/airyhq/airy/pull/726)]
-- [[#711](https://github.com/airyhq/airy/issues/711)] Add CI status badge [[#724](https://github.com/airyhq/airy/pull/724)]
-- Fix typo in readme [[#709](https://github.com/airyhq/airy/pull/709)]
-- Reorganize integration tests  [[#694](https://github.com/airyhq/airy/pull/694)]
-- [[#693](https://github.com/airyhq/airy/issues/693)] Simplify display name contact API response [[#696](https://github.com/airyhq/airy/pull/696)]
-- Add missing docs for authenticating with the websocket [[#689](https://github.com/airyhq/airy/pull/689)]
-- [[#403](https://github.com/airyhq/airy/issues/403)] Allow leading wildcard searches for Lucene [[#681](https://github.com/airyhq/airy/pull/681)]
-- Remove .bazelproject from vcs [[#666](https://github.com/airyhq/airy/pull/666)]
-- Disable go plugin by default since it only works for ultimate users [[#663](https://github.com/airyhq/airy/pull/663)]
-- [[#651](https://github.com/airyhq/airy/issues/651)] Use Google Cloud Storage for the bazel remote cache [[#652](https://github.com/airyhq/airy/pull/652)]
-- [[#642](https://github.com/airyhq/airy/issues/642)] Update typescript content typings [[#645](https://github.com/airyhq/airy/pull/645)]
-
-#### Airy CLI
-
-You can download the Airy CLI for your operating system from the following links:
-
-[MacOS](https://airy-core-binaries.s3.amazonaws.com/0.6.0/darwin/amd64/airy)
-[Linux](https://airy-core-binaries.s3.amazonaws.com/0.6.0/linux/amd64/airy)
-[Windows](https://airy-core-binaries.s3.amazonaws.com/0.6.0/windows/amd64/airy.exe)
-[Alpine](https://airy-core-binaries.s3.amazonaws.com/0.6.0/alpine/amd64/airy)
diff --git a/docs/docs/cli/usage.md b/docs/docs/cli/usage.md
index 280e314ecd..d182729a21 100644
--- a/docs/docs/cli/usage.md
+++ b/docs/docs/cli/usage.md
@@ -138,6 +138,36 @@ airy ui [flags]
 ```
 
 
+***
+
+## Upgrade
+
+Upgrades an instance of Airy Core
+
+#### Synopsis
+
+Upgrades an existing Airy Core instance, read from a workspace directory (default .)
+
+```
+airy upgrade [flags]
+```
+
+#### Options
+
+```
+      --approve          Upgrade automatically without asking for an approval (optional).
+  -h, --help             help for upgrade
+      --version string   Specify a version to upgrade to (optional).
+```
+
+#### Options inherited from parent commands
+
+```
+      --apihost string     Airy Core HTTP API endpoint
+      --workspace string   workspace directory of an Airy core instance (default is the cwd)
+```
+
+
 ***
 
 ## Version
diff --git a/docs/docs/getting-started/glossary.md b/docs/docs/getting-started/glossary.md
index c392a8fea5..3e552c8fd4 100644
--- a/docs/docs/getting-started/glossary.md
+++ b/docs/docs/getting-started/glossary.md
@@ -122,4 +122,4 @@ A user represents one authorized agent in Airy Core.
 
 ## Template
 
-Pre defined messages that can be enhanced with user defined data.
+Pre-defined messages that can be enhanced with user defined data.
diff --git a/docs/docs/getting-started/installation/aws.md b/docs/docs/getting-started/installation/aws.md
index c29af78ab0..86c09f786c 100644
--- a/docs/docs/getting-started/installation/aws.md
+++ b/docs/docs/getting-started/installation/aws.md
@@ -260,6 +260,16 @@ After setting these parameters, create your `Airy Core` instance with the follow
 airy create --provider aws --provider-config hostUpdate=false
 ```
 
+:::note
+In case you have created your Airy Core instance without Let's Encrypt and want to add it later, you must use the `airy upgrade` command.
+
+Even if you don't upgrade to a new version, just modify your `airy.yaml` file as explained in this section and run
+
+`airy upgrade`
+
+After the upgrade is done, continue with setting up your DNS and starting the ingress controller.
+:::
+
 #### Setup your DNS
 
 You should create a CNAME DNS record for the hostname that you set under `kubernetes.host` in the previous step to point to the hostname of the LoadBalancer, created by AWS for the ingress service:
diff --git a/docs/docs/getting-started/installation/configuration.md b/docs/docs/getting-started/installation/configuration.md
index d533781e3f..360b19be40 100644
--- a/docs/docs/getting-started/installation/configuration.md
+++ b/docs/docs/getting-started/installation/configuration.md
@@ -86,8 +86,6 @@ cluster and Redis.
 - `integration`
   - `webhook`
     - `name` set this to the name of your webhook integration
-    - `maxBackoff` set this to the maximum number of seconds the webhook should
-      wait between retries with exponential backoff
 - `media`
   - `storage`
     - `s3Key` set this to your AWS S3 access key id
@@ -129,7 +127,6 @@ components:
   integration:
     webhook:
       name: webhook
-      maxBackoff: 10
 ```
 
 ## Applying the configuration
diff --git a/docs/docs/getting-started/upgrade.md b/docs/docs/getting-started/upgrade.md
new file mode 100644
index 0000000000..93864449d5
--- /dev/null
+++ b/docs/docs/getting-started/upgrade.md
@@ -0,0 +1,92 @@
+---
+title: Upgrade your Airy Core instance
+sidebar_label: Upgrade
+---
+
+import TLDR from "@site/src/components/TLDR";
+
+<TLDR>
+
+Upgrade an existing installation of Airy Core.
+
+</TLDR>
+
+## Upgrade your CLI
+
+In order to upgrade your Airy Core instance, first you need to upgrade your Airy CLI, depending on your [installation method](/cli/introduction#step-2-install-the-airy-cli).
+
+You can check the current version of your Airy CLI with the `airy version` command:
+
+```
+airy version
+Version: 0.29.0, GitCommit: b47d7e46c884a45c4c2169f626ebd0ff9ff6ee8e
+```
+
+## Upgrade your Airy Core instance
+
+:::warning
+
+The upgrade of your Airy Core cluster will lead to downtime. Usually it takes seconds, but in case there is a migration or a reset of some of the streaming apps, this process might take longer, depending on the amount of data you have.
+
+For more information about specific upgrades, or if you have any questions, please join the [Airy Developers Community on Slack](https://airy-developers.slack.com/).
+
+:::
+
+Use the `airy upgrade` command to perform the upgrade of your Airy Core instance. Run `airy upgrade` to return information about your current Airy Core version and the latest version available. You will be prompted to proceed with the upgrade (omit this prompt by using the `--approve` flag).
+
+```sh
+$ airy upgrade
+CLI version:  0.29.0
+Current Airy Core version:  0.28.0
+New Airy Core version:  0.29.0
+
+Are you sure that you want to proceed? [Y/y]
+Y
+```
+
+:::note
+
+You need to be inside an Airy Core workspace directory to run the command.
+
+You can overwrite the path by specifying the `--workspace` flag, for example:
+
+`airy upgrade --workspace ~/.airy/production`.
+
+:::
+
+The upgrade will continue until complete. You will receive a notification to confirm that the upgrade was successful. The version will be updated inside the Kubernetes cluster and in your local `airy.yaml` file.
+
+```
+Upgrading the helm charts of Airy Core...
+Applying config from the configuration file.
+applied configuration for "security"
+Writing the new version into the configuration file.
+Copying the configuration file in the Airy Core K8s cluster.
+
+✅ Aity Core upgraded
+```
+
+## Cleanup the upgrade
+
+The upgrade will create few additional resources (Kubernetes jobs and configMaps) which are not deleted automatically, so that there is a better insight of what happened during the upgrade.
+To cleanup those resources, run:
+
+```sh
+kubectl delete configmap -l core.airy.co/upgrade="true"
+kubectl delete job -l core.airy.co/upgrade="true"
+kubectl delete job -l core.airy.co/upgrade="post-upgrade"
+```
+
+## Rollback
+
+The upgrade process will not delete any of the persistent data that is kept inside the Kafka cluster. In case the upgrade fails, you can rollback to your previous Airy Core version. Clean-up the upgrade resources as instructed in the previous section and run:
+
+```sh
+helm rollback airy
+airy config apply
+kubectl delete pod -l app=airy-controller
+```
+
+## Troubleshooting
+
+If you need further help, refer to our [Troubleshooting section](/getting-started/troubleshooting).
diff --git a/docs/docs/sources/chatplugin/customization.md b/docs/docs/sources/chatplugin/customization.md
index 980b82d21b..c7cd811b2d 100644
--- a/docs/docs/sources/chatplugin/customization.md
+++ b/docs/docs/sources/chatplugin/customization.md
@@ -34,15 +34,24 @@ Switch to the **Install & Customize** tab and start customizing your Airy Chat P
 
 If you are happy with your customization, copy it and add this code inside the tag `<head>`.
 
-| Option name                 | Option description                                                                                                                          |
-| --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
-| Header text                 | Set the header text of your Airy Chat Plugin                                                                                                |
-| Start new Conversation text | Set the Start new Conversation text button of your Airy Chat Plugin                                                                         |
-| Chat Plugin Icon            | Set your company icon which appears on the button that opens and closes the Airy Chat Plugin                                                |
-| Input Icon                  | Set your icon as `sendButton` and replace the default paperplane                                                                            |
-| Primary Color               | Set your primary color as the topbar, border of `textArea`, Start new Conversation button text and border color, or text color of `buttons` |
-| Accent Color                | Set your accent color as the `sendButton`                                                                                                   |
-| Background Color            | Set the background color of the entire Airy Chat Plugin                                                                                     |
+| Config Key               | Config Value              | Config Description                                                                                                                          |
+| ------------------------ | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| welcomeMessage           | JSON                      | Set the welcome message of your Airy Chat Plugin. It can be a text, a template, an image and more                                           |
+| headerText               | string                    | Set the header text of your Airy Chat Plugin                                                                                                |
+| headerTextColor          | string                    | Set the header text color of your Airy Chat Plugin                                                                                          |
+| subtitleText             | string                    | Set the subtitle text of your Airy Chat Plugin                                                                                              |
+| subtitleTextColor        | string                    | Set the subtitle text color of your Airy Chat Plugin                                                                                        |
+| primaryColor             | string                    | Set your primary color as the topbar, border of `textArea`, Start new Conversation button text and border color, or text color of `buttons` |
+| accentColor              | string                    | Set your accent color as the `sendButton`                                                                                                   |
+| backgroundColor          | string                    | Set the background color of the entire Airy Chat Plugin                                                                                     |
+| height                   | number                    | Set the height of the entire Airy Chat Plugin                                                                                               |
+| width                    | number                    | Set the width of the entire Airy Chat Plugin                                                                                                |
+| bubbleIcon               | URL                       | Set your company icon which appears on the button that opens and closes the Airy Chat Plugin                                                |
+| sendMessageIcon          | URL                       | Set your icon as `sendButton` and replace the default paperplane                                                                            |
+| startNewConversationText | string                    | Set the Start new Conversation text button of your Airy Chat Plugin                                                                         |
+| disableMobile            | boolean                   | Disable the entire Airy Chat Plugin for mobile devices                                                                                      |
+| bubbleState              | 'expanded', 'minimized'   | Set the behaviour of the chatplugin to be always expanded or always minimized                                                               |
+| closeMode                | 'basic', 'medium', 'full' | Choose one of the different option to close the chatplugin and start a new conversation                                                     |
 
 **Sample**
 
diff --git a/docs/docs/sources/introduction.md b/docs/docs/sources/introduction.md
index 37d4a9c909..1a9e286476 100644
--- a/docs/docs/sources/introduction.md
+++ b/docs/docs/sources/introduction.md
@@ -10,6 +10,7 @@ import AiryBubbleSVG from "@site/static/icons/airy-bubble.svg";
 import FacebookMessengerSVG from "@site/static/icons/facebook-messenger.svg";
 import GoogleSVG from "@site/static/icons/google.svg";
 import WhatsAppSVG from "@site/static/icons/whatsapp.svg";
+import ViberSVG from "@site/static/icons/viber.svg";
 import SmsSVG from "@site/static/icons/sms.svg";
 import ChannelsUI from "@site/static/icons/channelsUi-icon.svg";
 
@@ -78,6 +79,13 @@ description='Connect Text Messaging to Airy & send and receive SMS'
 link='sources/sms-twilio'
 />
 
+<ButtonBox
+icon={<ViberSVG />}
+title='Viber'
+description='Connect the messaging app Viber to Airy'
+link='sources/viber'
+/>
+
 </ButtonBoxList>
 
 ## How it works
diff --git a/docs/docs/sources/viber.md b/docs/docs/sources/viber.md
new file mode 100644
index 0000000000..08cbcd881d
--- /dev/null
+++ b/docs/docs/sources/viber.md
@@ -0,0 +1,199 @@
+---
+title: Viber
+sidebar_label: Viber
+---
+
+import useBaseUrl from '@docusaurus/useBaseUrl';
+import TLDR from "@site/src/components/TLDR";
+import ButtonBox from "@site/src/components/ButtonBox";
+import BoltSVG from "@site/static/icons/bolt.svg";
+import InboxSVG from "@site/static/icons/prototype.svg";
+import SuccessBox from "@site/src/components/SuccessBox";
+
+<TLDR>
+
+Start receiving and sending messages using **the popular messaging app, Viber**.
+
+</TLDR>
+
+Viber allows you to configure a business account that you can use to send and receive messages
+to and from users
+
+:::tip What you will learn
+
+- The required steps to configure the Viber messages source
+- How to connect your Viber account to Airy
+
+:::
+
+## Configuration
+
+To get started with Viber we will complete the following steps
+
+- [Step 1: Registration](#step-1-registration)
+- [Step 2: Editing of the yaml file in Airy Core](#step-2-updating-the-airy-config-file)
+- [Step 3: Connecting the channel](#step-2-editing-of-the-yaml-file-in-airy-core)
+- [Step 4: Send and receive a test message](#send-messages-from-googles-business-messages-source)
+
+Let's proceed step by step.
+
+### Step 1: Registration
+
+First you need a Viber bot account. You can register one by clicking on [this link](https://partners.viber.com/account/create-bot-account) and filling out the required form. At the end of the process you will be presented with your authentication token. Copy it for the next step.
+
+<img alt="Viber successful account creation" src={useBaseUrl('img/sources/viber/account-creation.jpg')} />
+
+### Step 2: Updating the Airy config file
+
+Add a section for viber in your `airy.yaml` under `components > sources`. Add your authentication token so that your file looks like so:
+
+```yaml
+components:
+  sources:
+    viber:
+      authToken: "<your viber authentication token>"
+```
+
+Now run the `airy config apply` command and viber is ready to use.
+
+### Step 3: Connecting the channel
+
+The next step is to send a request to the [Channels endpoint](/api/endpoints/channels#viber) to connect Viber to your instance.
+
+<ButtonBox
+icon={<BoltSVG />}
+title='Channels endpoint'
+description='Connect a Viber source to your Airy Core instance through the Channels endpoint'
+link='api/endpoints/channels#viber'
+/>
+
+<br />
+
+import ConnectViber from '../api/endpoints/connect-viber.mdx'
+
+<ConnectViber />
+
+## Step 4: Send and receive a test message
+
+Find your bot on Viber and send it a message. The message should show up in your Airy Inbox.
+Now the conversation is created and you are ready to reply using the ui or the [Messages endpoint](/api/endpoints/messages#send).
+
+<ButtonBox
+icon={() => <BoltSVG />}
+title="Messages endpoint"
+description="Send messages to your Airy Core instance from different sources through the Messages endpoint"
+link="api/endpoints/messages#send"
+/>
+
+<br />
+
+**Sending a text message**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#text-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "text": "Hello World",
+    "type": "text"
+  }
+}
+```
+
+**Sending a picture**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#picture-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "picture",
+    "text": "Photo description",
+    "media": "http://www.images.com/img.jpg",
+    "thumbnail": "http://www.images.com/thumb.jpg"
+  }
+}
+```
+
+**Sending a video**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#video-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "video",
+    "media": "http://www.images.com/video.mp4",
+    "thumbnail": "http://www.images.com/thumb.jpg",
+    "size": 10000,
+    "duration": 10
+  }
+}
+```
+
+**Sending a file**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#file-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "file",
+    "media": "http://www.images.com/file.doc",
+    "size": 10000,
+    "file_name": "name_of_file.doc"
+  }
+}
+```
+
+**Sharing a contact**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#contact-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "contact",
+    "contact": {
+      "name": "Itamar",
+      "phone_number": "+972511123123"
+    }
+  }
+}
+```
+
+**Sharing a location**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#location-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "location",
+    "location": {
+      "lat": "37.7898",
+      "lon": "-122.3942"
+    }
+  }
+}
+```
+
+**Sending a URL**
+
+[Learn more](https://developers.viber.com/docs/api/rest-bot-api/#url-message)
+
+```json5
+{
+  "conversation_id": "a688d36c-a85e-44af-bc02-4248c2c97622",
+  "message": {
+    "type": "url",
+    "media": "http://www.website.com/go_here"
+  }
+}
+```
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 4bff3e2ce0..7462e91a90 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -17,6 +17,7 @@ module.exports = {
           'Command Line Interface': ['cli/introduction', 'cli/usage'],
         },
         'getting-started/quickstart',
+        'getting-started/upgrade',
         'getting-started/troubleshooting',
         'getting-started/glossary',
       ],
@@ -38,6 +39,7 @@ module.exports = {
         'sources/google',
         'sources/sms-twilio',
         'sources/whatsapp-twilio',
+        'sources/viber',
         'ui/channels',
       ],
     },
diff --git a/docs/static/icons/viber.svg b/docs/static/icons/viber.svg
new file mode 100644
index 0000000000..b5655fb15a
--- /dev/null
+++ b/docs/static/icons/viber.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd">
+    <path fill="#755599" d="M12 0c-6.626 0-12 5.372-12 12 0 6.627 5.374 12 12 12 6.627 0 12-5.373 12-12 0-6.628-5.373-12-12-12zm5.42 7.058c-.367-.338-1.85-1.414-5.152-1.429 0 0-3.894-.235-5.792 1.507-1.056 1.057-1.428 2.602-1.467 4.52-.039 1.918-.09 5.51 3.373 6.485l.003.001-.002 1.486s-.021.602.375.725c.479.149.76-.309 1.218-.802.251-.27.598-.668.86-.972 2.368.198 4.19-.256 4.397-.324.478-.155 3.185-.502 3.625-4.094.454-3.704-.22-6.047-1.438-7.103zm.401 6.835c-.372 3-2.566 3.19-2.971 3.319-.172.056-1.773.454-3.785.322 0 0-1.499 1.809-1.967 2.279-.073.074-.159.104-.217.09-.08-.02-.102-.115-.101-.255l.012-2.47c-2.929-.814-2.758-3.873-2.725-5.474.033-1.601.334-2.913 1.227-3.796 1.606-1.454 4.913-1.237 4.913-1.237 2.794.013 4.132.854 4.442 1.136 1.031.882 1.556 2.993 1.172 6.086zm-5.272.181s.262.023.403-.152l.276-.347c.132-.172.454-.282.768-.107.416.235.954.604 1.322.948.203.171.25.423.112.689l-.002.006c-.142.251-.332.486-.573.706l-.005.004c-.271.226-.582.357-.915.249l-.006-.009c-.598-.169-2.032-.901-2.946-1.63-1.496-1.18-2.559-3.126-2.853-4.169l-.009-.006c-.108-.334.024-.646.249-.915l.004-.005c.219-.241.455-.431.706-.574l.005-.001c.266-.138.518-.091.69.112.226.233.65.794.947 1.322.175.314.066.635-.106.768l-.347.275c-.175.142-.152.404-.152.404s.513 1.942 2.432 2.432zm3.019-1.61c.103-.001.186-.085.186-.188-.01-1.229-.386-2.215-1.118-2.93-.731-.712-1.652-1.077-2.735-1.085h-.002c-.102 0-.186.083-.187.185 0 .103.083.188.186.188.984.007 1.817.337 2.477.98.658.642.997 1.539 1.005 2.665.001.102.084.185.187.185h.001zm-.982-.384h-.004c-.104-.002-.185-.087-.183-.191.015-.638-.168-1.155-.557-1.579-.388-.424-.92-.656-1.627-.708-.103-.007-.181-.097-.173-.199.008-.103.097-.18.2-.173.796.058 1.427.337 1.875.827.451.493.672 1.112.655 1.841-.002.102-.085.182-.186.182zm-.958-.321c-.099 0-.182-.077-.187-.177-.031-.634-.33-.944-.939-.977-.103-.006-.182-.094-.177-.197.006-.103.094-.182.197-.176.804.043 1.251.504 1.292 1.331.005.103-.074.191-.177.196h-.009z"/>
+</svg>
diff --git a/docs/static/img/sources/viber/account-creation.jpg b/docs/static/img/sources/viber/account-creation.jpg
new file mode 100644
index 0000000000..a79cdcc5eb
Binary files /dev/null and b/docs/static/img/sources/viber/account-creation.jpg differ
diff --git a/docs/yarn.lock b/docs/yarn.lock
index 938ecfdafb..2ae1eb233c 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -6929,9 +6929,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -9663,9 +9663,9 @@ url-parse-lax@^3.0.0:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3, url-parse@^1.4.7:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
diff --git a/frontend/chat-plugin/dev/development.html b/frontend/chat-plugin/dev/development.html
index ed3144e946..1723b709d8 100644
--- a/frontend/chat-plugin/dev/development.html
+++ b/frontend/chat-plugin/dev/development.html
@@ -4,29 +4,20 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <title>Airy - Chat Plugin</title>
-    <style>
-        #root {
+    <style>        
+        #root {            
             background: transparent;
-            position: fixed;
-            width: -webkit-fill-available;
-            width: -moz-available;
+            position: fixed;            
             right: 0;
             bottom: 0;
-            z-index: 9999;
-            max-height: 750px;
-            max-width: 380px;
-            height: 100vh;
+            z-index: 9999;                                    
             padding: 0;
             margin: 0;
             color: #444;
             -webkit-font-smoothing: antialiased;
             -moz-osx-font-smoothing: grayscale;
             pointer-events: none;
-        }
-
-        .customClass {
-            height: 100%;
-        }
+        }    
     </style>
 </head>
 <body>
diff --git a/frontend/chat-plugin/dev/index.tsx b/frontend/chat-plugin/dev/index.tsx
index 11bf3ac11e..4c466d076e 100644
--- a/frontend/chat-plugin/dev/index.tsx
+++ b/frontend/chat-plugin/dev/index.tsx
@@ -21,7 +21,6 @@ const renderMethod = async () => {
   const AiryChatPlugin = (await import('chat-plugin')).AiryChatPlugin;
   render(
     <AiryChatPlugin
-      className="customClass"
       config={{
         channelId,
         apiHost,
diff --git a/frontend/chat-plugin/image/index.tsx b/frontend/chat-plugin/image/index.tsx
index ddcadb0c1b..cafc89eb66 100644
--- a/frontend/chat-plugin/image/index.tsx
+++ b/frontend/chat-plugin/image/index.tsx
@@ -7,17 +7,11 @@ const body = document.getElementsByTagName('body')[0];
 const anchor = document.createElement('div');
 
 anchor.style.cssText = `
-height: 100%;
 background: transparent;
 position: fixed;
-width: -webkit-fill-available;
-width: -moz-available;
 right: 0;
 bottom: 0;
 z-index: 9999;
-max-height: 750px;
-max-width: 380px;
-height: 100vh;
 padding: 0;
 margin: 0;
 color: #444;
diff --git a/frontend/chat-plugin/lib/src/AiryChatPlugin.tsx b/frontend/chat-plugin/lib/src/AiryChatPlugin.tsx
index 27e6e828f2..824330c8c5 100644
--- a/frontend/chat-plugin/lib/src/AiryChatPlugin.tsx
+++ b/frontend/chat-plugin/lib/src/AiryChatPlugin.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {AiryChatPluginConfiguration} from './config';
 
 import Chat from './components/chat';
@@ -11,9 +11,34 @@ type AiryChatPluginProps = {
 export const AiryChatPlugin = (props: AiryChatPluginProps) => {
   const {config, className} = props;
 
+  const [windowHeight, setWindowHeight] = useState(window.innerHeight);
+  const [windowWidth, setWindowWidth] = useState(window.innerWidth);
+
+  const handleResize = () => {
+    setWindowHeight(window.innerHeight);
+    setWindowWidth(window.innerWidth);
+  };
+
+  window.addEventListener('resize', handleResize);
+
+  const widgetHeight = (): number => {
+    if (config.config?.height) {
+      return config.config.height > windowHeight ? windowHeight : config.config.height;
+    }
+    return 700 > windowHeight ? windowHeight : 700;
+  };
+
+  const widgetWidth = (): number => {
+    if (config.config?.width) {
+      return config.config.width > windowWidth ? windowWidth : config.config.width;
+    }
+    return 380 > windowWidth ? windowWidth : 380;
+  };
+
   const customStyle = {
     background: 'transparent',
-    height: '100%',
+    height: widgetHeight(),
+    width: widgetWidth(),
     ...(config.config?.primaryColor && {
       '--color-airy-blue': config.config?.primaryColor,
     }),
diff --git a/frontend/chat-plugin/lib/src/airyRenderProps/AiryHeaderBar/index.tsx b/frontend/chat-plugin/lib/src/airyRenderProps/AiryHeaderBar/index.tsx
index 1da1deaed6..8fce2198ce 100644
--- a/frontend/chat-plugin/lib/src/airyRenderProps/AiryHeaderBar/index.tsx
+++ b/frontend/chat-plugin/lib/src/airyRenderProps/AiryHeaderBar/index.tsx
@@ -33,22 +33,26 @@ const AiryHeaderBar = (props: AiryHeaderBarProps) => {
     }),
   };
 
-  return (
-    <div className={style.header}>
-      <div className={style.headerInfo}>
-        <h1 className={style.headerTitle} style={customStyle}>
-          {config.headerText || 'Customer Chat'}
-        </h1>
-        <p className={style.subtitle} style={customStyleSubtitle}>
-          {config.subtitleText || (config.showMode === true && 'Customer Subtitle')}
-        </p>
+  const ClosingOptionMedium = () => {
+    return (
+      <div className={style.buttonMenu}>
+        <button
+          className={style.closeButton}
+          onClick={props.toggleHideChat}
+          title="End chat"
+          data-cy={cyChatPluginHeaderBarCloseButton}>
+          <CloseButton />
+        </button>
       </div>
+    );
+  };
 
+  const ClosingOptionFull = () => {
+    return (
       <div className={style.buttonMenu}>
         <button className={style.minimizeButton} onClick={props.toggleHideChat} title="Minimize chat">
           <MinimizeButton />
         </button>
-
         <button
           className={style.closeButton}
           onClick={showModalOnClick}
@@ -57,6 +61,31 @@ const AiryHeaderBar = (props: AiryHeaderBarProps) => {
           <CloseButton />
         </button>
       </div>
+    );
+  };
+
+  const ClosingOption = () => {
+    if (config.closeMode) {
+      if (config.closeMode === 'basic') {
+        return <div />;
+      } else if (config.closeMode === 'medium') {
+        return <ClosingOptionMedium />;
+      }
+    }
+    return <ClosingOptionFull />;
+  };
+
+  return (
+    <div className={style.header}>
+      <div className={style.headerInfo}>
+        <h1 className={style.headerTitle} style={customStyle}>
+          {config.headerText || 'Customer Chat'}
+        </h1>
+        <p className={style.subtitle} style={customStyleSubtitle}>
+          {config.subtitleText || (config.showMode === true && 'Customer Subtitle')}
+        </p>
+      </div>
+      <ClosingOption />
     </div>
   );
 };
diff --git a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx
index a5f86dadf7..f8b20256df 100644
--- a/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx
+++ b/frontend/chat-plugin/lib/src/airyRenderProps/AiryInputBar/index.tsx
@@ -23,6 +23,7 @@ const AiryInputBar = (props: AiryInputBarProps) => {
   const textInputRef = createRef<HTMLTextAreaElement>();
   const dataCyButtonId = cyInputbarButton;
   const dataCyTextareaId = cyInputbarTextarea;
+  const isMobileDevice = window.innerHeight < 1200 || window.innerWidth < 1000;
 
   useEffect(() => {
     textInputRef.current.selectionStart = props.messageString.length;
@@ -134,7 +135,7 @@ const AiryInputBar = (props: AiryInputBarProps) => {
           ref={textInputRef}
           className={style.textArea}
           placeholder={'Start typing...'}
-          autoFocus={!config.showMode}
+          autoFocus={isMobileDevice ? false : !config.showMode}
           onChange={handleChange}
           onKeyDown={handleKeyDown}
           value={props.messageString}
diff --git a/frontend/chat-plugin/lib/src/components/chat/index.module.scss b/frontend/chat-plugin/lib/src/components/chat/index.module.scss
index c30dddae72..9d617cb796 100644
--- a/frontend/chat-plugin/lib/src/components/chat/index.module.scss
+++ b/frontend/chat-plugin/lib/src/components/chat/index.module.scss
@@ -9,6 +9,16 @@
   justify-content: flex-end;
 }
 
+.mainFlex {
+  @extend .main;
+  @media only screen and (max-device-width: 640px) {
+    display: none;
+  }
+  @media only screen and (max-device-height: 840px) {
+    display: none;
+  }
+}
+
 @keyframes chatAnimationOpen {
   0% {
     opacity: 0;
diff --git a/frontend/chat-plugin/lib/src/components/chat/index.tsx b/frontend/chat-plugin/lib/src/components/chat/index.tsx
index b6b7cf8e9f..af82391bd3 100644
--- a/frontend/chat-plugin/lib/src/components/chat/index.tsx
+++ b/frontend/chat-plugin/lib/src/components/chat/index.tsx
@@ -50,6 +50,14 @@ const Chat = ({config, ...props}: Props) => {
 
   const chatHiddenInitialState = (): boolean => {
     if (config.showMode === true) return false;
+    if (config.bubbleState) {
+      if (config.bubbleState === 'expanded') {
+        return false;
+      }
+      if (config.bubbleState === 'minimized') {
+        return true;
+      }
+    }
     if (getResumeTokenFromStorage(props.channelId)) return true;
     return false;
   };
@@ -154,6 +162,7 @@ const Chat = ({config, ...props}: Props) => {
     setNewConversation(false);
     resetStorage(props.channelId);
     closeModalOnClick();
+    ctrl.toggleHideChat();
   };
 
   const reAuthenticate = () => {
@@ -207,7 +216,7 @@ const Chat = ({config, ...props}: Props) => {
   };
 
   return (
-    <div className={style.main}>
+    <div className={`${config.disableMobile === true ? style.mainFlex : style.main}`}>
       {!isChatHidden && (
         <div
           className={`${style.wrapper} ${styleFor(animation)}`}
@@ -233,7 +242,7 @@ const Chat = ({config, ...props}: Props) => {
                                 lastInGroup={lastInGroup}>
                                 <SourceMessage
                                   contentType="message"
-                                  content={message}
+                                  message={message}
                                   source="chatplugin"
                                   invertSides={true}
                                   commandCallback={commandCallback}
diff --git a/frontend/chat-plugin/lib/src/config.ts b/frontend/chat-plugin/lib/src/config.ts
index 5f46ef89c4..bb1aac9f46 100644
--- a/frontend/chat-plugin/lib/src/config.ts
+++ b/frontend/chat-plugin/lib/src/config.ts
@@ -17,6 +17,11 @@ export type Config = {
   bubbleIcon?: string;
   sendMessageIcon?: string;
   showMode?: boolean;
+  height?: number;
+  width?: number;
+  disableMobile?: boolean;
+  bubbleState?: 'expanded' | 'minimized';
+  closeMode?: 'basic' | 'medium' | 'full';
 };
 
 export type AuthConfiguration = {
diff --git a/frontend/ui/src/components/IconChannel/index.tsx b/frontend/ui/src/components/IconChannel/index.tsx
index 3cee92e002..301946d783 100644
--- a/frontend/ui/src/components/IconChannel/index.tsx
+++ b/frontend/ui/src/components/IconChannel/index.tsx
@@ -13,6 +13,7 @@ import {ReactComponent as SmsAvatar} from 'assets/images/icons/sms_avatar.svg';
 import {ReactComponent as WhatsappAvatar} from 'assets/images/icons/whatsapp_avatar.svg';
 import {ReactComponent as AiryAvatar} from 'assets/images/icons/airy_avatar.svg';
 import {ReactComponent as AiryIcon} from 'assets/images/icons/airy-icon.svg';
+import {ReactComponent as ViberIcon} from 'assets/images/icons/viber.svg';
 
 import styles from './index.module.scss';
 
@@ -65,6 +66,11 @@ const SOURCE_INFO = {
     icon: () => <AiryIcon />,
     avatar: () => <AiryAvatar />,
   },
+  viber: {
+    text: 'Viber',
+    icon: () => <ViberIcon />,
+    avatar: () => <ViberIcon />,
+  },
 };
 
 const IconChannel: React.FC<IconChannelProps> = ({
diff --git a/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.module.scss b/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.module.scss
index a0cde4a39a..f3dc0716fb 100644
--- a/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.module.scss
+++ b/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.module.scss
@@ -2,6 +2,7 @@
 
 .customiseContainer {
   margin-top: 28px;
+  margin-right: 16px;
 }
 
 .colorPickerWrapper {
@@ -24,6 +25,10 @@
   margin-bottom: 8px;
 }
 
+.extraOptions {
+  margin: 16px 0 24px 0;
+}
+
 .codeAreaContainer {
   margin-right: 16px;
 }
@@ -56,8 +61,6 @@
 
 .pluginWrapper {
   position: relative;
-  width: 450px;
-  height: 506px;
   display: flex;
   flex-flow: column-reverse;
   background-color: var(--color-background-gray);
@@ -66,3 +69,9 @@
   padding: 0 24px 0 24px;
   margin: 32px 0 0 24px;
 }
+
+.pluginContainer {
+  bottom: 0px;
+  right: 0px;
+  position: absolute;
+}
diff --git a/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.tsx b/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.tsx
index 51b1c4bba6..5d1e4b0472 100644
--- a/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.tsx
+++ b/frontend/ui/src/pages/Channels/Providers/Airy/ChatPlugin/sections/CustomiseSection.tsx
@@ -1,10 +1,20 @@
 import React, {createRef, useState} from 'react';
-import {Button, Input, ListenOutsideClick} from 'components';
+import {Button, Dropdown, Input, ListenOutsideClick, Toggle} from 'components';
 import styles from './CustomiseSection.module.scss';
 import {SketchPicker} from 'react-color';
 import {AiryChatPlugin, AiryChatPluginConfiguration} from 'chat-plugin';
 import {env} from '../../../../../../env';
 
+enum CloseOption {
+  basic = 'basic',
+  medium = 'medium',
+  full = 'full',
+}
+
+enum BubbleState {
+  minimized = 'minimized',
+  expanded = 'expanded',
+}
 interface CustomiseSectionProps {
   channelId: string;
   host: string;
@@ -26,6 +36,11 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
   const [showAccentColorPicker, setShowAccentColorPicker] = useState(false);
   const [backgroundColor, setBackgroundColor] = useState('');
   const [showBackgroundColorPicker, setShowBackgroundColorPicker] = useState(false);
+  const [height, setHeight] = useState('700');
+  const [width, setWidth] = useState('350');
+  const [disableMobile, setDisableMobile] = useState(false);
+  const [closingOption, setClosingOption] = useState<CloseOption>(CloseOption.full);
+  const [bubbleState, setBubbleState] = useState<BubbleState>(BubbleState.expanded);
 
   const codeAreaRef = createRef<HTMLTextAreaElement>();
 
@@ -73,6 +88,7 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
       w[n].config={};
       `;
     }
+
     let config = '';
     if (headerText !== '') config += formatConfigAttributeWithConfig(`headerText: '${headerText}'`, config);
     if (subtitleText !== '') config += formatConfigAttributeWithConfig(`subtitleText: '${subtitleText}'`, config);
@@ -89,6 +105,11 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
     if (accentColor !== '') config += formatConfigAttributeWithConfig(`accentColor: '${accentColor}'`, config);
     if (backgroundColor !== '')
       config += formatConfigAttributeWithConfig(`backgroundColor: '${backgroundColor}'`, config);
+    if (height !== '') config += formatConfigAttributeWithConfig(`height: '${height}'`, config);
+    if (width !== '') config += formatConfigAttributeWithConfig(`width: '${width}'`, config);
+    config += formatConfigAttributeWithConfig(`closeMode: '${closingOption}'`, config);
+    config += formatConfigAttributeWithConfig(`bubbleState: '${bubbleState}'`, config);
+    config += formatConfigAttributeWithConfig(`disableMobile: '${disableMobile}'`, config);
 
     return `w[n].config = {${config}
         };`;
@@ -109,6 +130,11 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
       ...(backgroundColor && {backgroundColor}),
       ...(bubbleIconUrl && {bubbleIcon: bubbleIconUrl}),
       ...(sendMessageIconUrl && {sendMessageIcon: sendMessageIconUrl}),
+      ...(width && {width: parseInt(width) < 200 ? 350 : parseInt(width)}),
+      ...(height && {height: parseInt(height) < 200 ? 700 : parseInt(height)}),
+      ...(closingOption && {closeMode: closingOption}),
+      ...(bubbleState && {bubbleState: bubbleState}),
+      ...(disableMobile && {disableMobile: disableMobile}),
     },
   };
 
@@ -145,70 +171,6 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
         <Button onClick={copyToClipboard}>Copy code</Button>
       </div>
       <div className={styles.customiseContainer}>
-        <Input
-          type="text"
-          name="textHeader"
-          value={headerText}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-            setHeaderText(e.target.value);
-          }}
-          label="Header Text"
-          placeholder="(optionally) add a text"
-          height={32}
-          fontClass="font-base"
-          maxLength={30}
-        />
-        <Input
-          type="text"
-          name="subtitle"
-          value={subtitleText}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-            setSubtitleText(e.target.value);
-          }}
-          label="Subtitle Text"
-          placeholder="(optionally) add a text"
-          height={32}
-          fontClass="font-base"
-          maxLength={50}
-        />
-        <Input
-          type="text"
-          name="startNewConversationText"
-          value={startNewConversationText}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-            setStartNewConversationText(e.target.value);
-          }}
-          label="Start new Conversation Text"
-          placeholder="(optionally) add a text"
-          height={32}
-          fontClass="font-base"
-        />
-        <Input
-          type="url"
-          name="bubbleIconUrl"
-          value={bubbleIconUrl}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-            setBubbleIconUrl(e.target.value);
-          }}
-          label="Chat Plugin Icon URL"
-          placeholder="(optionally) add an image url"
-          height={32}
-          fontClass="font-base"
-          showErrors={false}
-        />
-        <Input
-          type="text"
-          name="sendMessageIconUrl"
-          value={sendMessageIconUrl}
-          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-            setSendMessageIconUrl(e.target.value);
-          }}
-          label="Input Icon URL"
-          placeholder="(optionally) add an image url"
-          height={32}
-          fontClass="font-base"
-          showErrors={false}
-        />
         <p>Header Text Color</p>
         <div className={styles.colorPicker}>
           {showHeaderTextColorPicker && (
@@ -400,9 +362,167 @@ export const CustomiseSection = ({channelId, host}: CustomiseSectionProps) => {
             fontClass="font-base"
           />
         </div>
+        <div className={styles.extraOptions}>
+          <Dropdown
+            text={`Closing Options: ${closingOption}`}
+            variant="normal"
+            options={[CloseOption.basic, CloseOption.medium, CloseOption.full]}
+            onClick={(option: CloseOption) => {
+              setClosingOption(option);
+            }}
+          />
+        </div>
+        <div className={styles.extraOptions}>
+          <Dropdown
+            text={`Bubble State Options: ${bubbleState}`}
+            variant="normal"
+            options={[BubbleState.expanded, BubbleState.minimized]}
+            onClick={(option: BubbleState) => {
+              setBubbleState(option);
+            }}
+          />
+        </div>
+        <div className={styles.extraOptions}>
+          <Toggle
+            value={disableMobile}
+            text="Disabled for Mobile"
+            updateValue={(value: boolean) => {
+              setDisableMobile(value);
+            }}
+          />
+        </div>
+      </div>
+      <div className={styles.customiseContainer}>
+        <Input
+          type="text"
+          name="textHeader"
+          value={headerText}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setHeaderText(e.target.value);
+          }}
+          label="Header Text"
+          placeholder="(optionally) add a text"
+          height={32}
+          fontClass="font-base"
+          maxLength={30}
+        />
+        <Input
+          type="text"
+          name="subtitle"
+          value={subtitleText}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setSubtitleText(e.target.value);
+          }}
+          label="Subtitle Text"
+          placeholder="(optionally) add a text"
+          height={32}
+          fontClass="font-base"
+          maxLength={50}
+        />
+        <Input
+          type="text"
+          name="startNewConversationText"
+          value={startNewConversationText}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setStartNewConversationText(e.target.value);
+          }}
+          label="Start new Conversation Text"
+          placeholder="(optionally) add a text"
+          height={32}
+          fontClass="font-base"
+        />
+        <Input
+          type="url"
+          name="bubbleIconUrl"
+          value={bubbleIconUrl}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setBubbleIconUrl(e.target.value);
+          }}
+          label="Chat Plugin Icon URL"
+          placeholder="(optionally) add an image url"
+          height={32}
+          fontClass="font-base"
+          showErrors={false}
+        />
+        <Input
+          type="text"
+          name="sendMessageIconUrl"
+          value={sendMessageIconUrl}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setSendMessageIconUrl(e.target.value);
+          }}
+          label="Input Icon URL"
+          placeholder="(optionally) add an image url"
+          height={32}
+          fontClass="font-base"
+          showErrors={false}
+        />
+        <Input
+          type="numeric"
+          name="height"
+          value={height}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            if (e.target.value === '') {
+              setHeight('0');
+            } else {
+              setHeight(e.target.value);
+            }
+          }}
+          onKeyDown={e => {
+            e.preventDefault();
+            let intHeight = parseInt(height);
+            if (e.key === 'ArrowUp') {
+              intHeight += 1;
+              setHeight(intHeight.toString());
+            } else if (e.key === 'ArrowDown') {
+              intHeight -= 1;
+              setHeight(intHeight.toString());
+            }
+          }}
+          label="Height (min 200px)"
+          placeholder="(optionally) add custom height"
+          height={32}
+          fontClass="font-base"
+          showErrors={false}
+        />
+        <Input
+          type="numeric"
+          name="width"
+          value={width}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            if (e.target.value === '') {
+              setWidth('0');
+            } else {
+              setWidth(e.target.value);
+            }
+          }}
+          onKeyDown={e => {
+            e.preventDefault();
+            let intWidth = parseInt(width);
+            if (e.key === 'ArrowUp') {
+              intWidth += 1;
+              setWidth(intWidth.toString());
+            } else if (e.key === 'ArrowDown') {
+              intWidth -= 1;
+              setWidth(intWidth.toString());
+            }
+          }}
+          label="Width (min 200px)"
+          placeholder="(optionally) add custom width"
+          height={32}
+          fontClass="font-base"
+          showErrors={false}
+        />
       </div>
-      <div className={styles.pluginWrapper}>
-        <AiryChatPlugin config={demoConfig} />
+      <div
+        className={styles.pluginWrapper}
+        style={{
+          ...(width && {width: parseInt(width) < 200 ? 350 : parseInt(width)}),
+          ...(height && {height: parseInt(height) < 200 ? 700 : parseInt(height)}),
+        }}>
+        <div className={styles.pluginContainer}>
+          <AiryChatPlugin config={demoConfig} />
+        </div>
       </div>
     </>
   );
diff --git a/frontend/ui/src/pages/Inbox/MessageInput/index.tsx b/frontend/ui/src/pages/Inbox/MessageInput/index.tsx
index 519a2976ec..b84eba67c8 100644
--- a/frontend/ui/src/pages/Inbox/MessageInput/index.tsx
+++ b/frontend/ui/src/pages/Inbox/MessageInput/index.tsx
@@ -306,7 +306,7 @@ const MessageInput = (props: Props) => {
                   />
                 </button>
                 <SourceMessage
-                  content={selectedSuggestedReply.message}
+                  message={selectedSuggestedReply.message}
                   source={source}
                   contentType="suggestedReplies"
                 />
@@ -325,7 +325,7 @@ const MessageInput = (props: Props) => {
                     />
                   </button>
                   <SourceMessage
-                    content={selectedTemplate.message}
+                    message={selectedTemplate.message}
                     source={selectedTemplate.source}
                     contentType="template"
                   />
diff --git a/frontend/ui/src/pages/Inbox/Messenger/MessageList/index.tsx b/frontend/ui/src/pages/Inbox/Messenger/MessageList/index.tsx
index c355ebbde4..69b6b8b1c4 100644
--- a/frontend/ui/src/pages/Inbox/Messenger/MessageList/index.tsx
+++ b/frontend/ui/src/pages/Inbox/Messenger/MessageList/index.tsx
@@ -153,41 +153,40 @@ const MessageList = (props: MessageListProps) => {
 
   return (
     <div className={styles.messageList} ref={messageListRef} onScroll={handleScroll} data-cy={cyMessageList}>
-      {messages &&
-        messages.map((message: Message, index: number) => {
-          const prevMessage = messages[index - 1];
-          const nextMessage = messages[index + 1];
-
-          const lastInGroup = nextMessage ? message.fromContact !== nextMessage.fromContact : true;
-
-          const sentAt = lastInGroup ? formatTime(message.sentAt) : null;
-
-          const messageDecoration = hasSuggestions(message) ? (
-            <button type="button" className={styles.suggestionWrapper} onClick={() => showSuggestions(message)}>
-              <LightBulbIcon className={styles.suggestionIcon} title="Show suggestions" />
-            </button>
-          ) : null;
-
-          return (
-            <div key={message.id} id={`message-item-${message.id}`}>
-              {hasDateChanged(prevMessage, message) && (
-                <div key={`date-${message.id}`} className={styles.dateHeader}>
-                  {formatDateOfMessage(message)}
-                </div>
-              )}
-              <MessageInfoWrapper
-                fromContact={message.fromContact}
-                contact={contact}
-                sentAt={sentAt}
-                lastInGroup={lastInGroup}
-                isChatPlugin={false}
-                decoration={messageDecoration}>
-                <SourceMessage source={source} content={message} contentType="message" />
-                <Reaction message={message} />
-              </MessageInfoWrapper>
-            </div>
-          );
-        })}
+      {messages?.map((message: Message, index: number) => {
+        const prevMessage = messages[index - 1];
+        const nextMessage = messages[index + 1];
+
+        const lastInGroup = nextMessage ? message.fromContact !== nextMessage.fromContact : true;
+
+        const sentAt = lastInGroup ? formatTime(message.sentAt) : null;
+
+        const messageDecoration = hasSuggestions(message) ? (
+          <button type="button" className={styles.suggestionWrapper} onClick={() => showSuggestions(message)}>
+            <LightBulbIcon className={styles.suggestionIcon} title="Show suggestions" />
+          </button>
+        ) : null;
+
+        return (
+          <div key={message.id} id={`message-item-${message.id}`}>
+            {hasDateChanged(prevMessage, message) && (
+              <div key={`date-${message.id}`} className={styles.dateHeader}>
+                {formatDateOfMessage(message)}
+              </div>
+            )}
+            <MessageInfoWrapper
+              fromContact={message.fromContact}
+              contact={contact}
+              sentAt={sentAt}
+              lastInGroup={lastInGroup}
+              isChatPlugin={false}
+              decoration={messageDecoration}>
+              <SourceMessage source={source} message={message} contentType="message" />
+              <Reaction message={message} />
+            </MessageInfoWrapper>
+          </div>
+        );
+      })}
     </div>
   );
 };
diff --git a/frontend/ui/src/pages/Inbox/SuggestedReplySelector/index.tsx b/frontend/ui/src/pages/Inbox/SuggestedReplySelector/index.tsx
index e84c44ebd4..abb2e92cc2 100644
--- a/frontend/ui/src/pages/Inbox/SuggestedReplySelector/index.tsx
+++ b/frontend/ui/src/pages/Inbox/SuggestedReplySelector/index.tsx
@@ -48,7 +48,7 @@ const SuggestedReplySelector = ({onClose, suggestions, selectSuggestedReply, sou
                   }}>
                   <div className={styles.fadeOutWrapper}>
                     <SourceMessage
-                      content={{id: id, content: suggestion.content}}
+                      message={{content: suggestion.content}}
                       source={source}
                       contentType="suggestedReplies"
                     />
diff --git a/frontend/ui/src/pages/Inbox/TemplateSelector/index.tsx b/frontend/ui/src/pages/Inbox/TemplateSelector/index.tsx
index 20671a5dd2..253135b734 100644
--- a/frontend/ui/src/pages/Inbox/TemplateSelector/index.tsx
+++ b/frontend/ui/src/pages/Inbox/TemplateSelector/index.tsx
@@ -121,7 +121,7 @@ const TemplateSelector = ({listTemplates, onClose, templates, selectTemplate, so
                           selectTemplate(template);
                         }}>
                         <div className={styles.templatePreviewName}>{template.name}</div>
-                        <SourceMessage content={template} source={template.source} contentType="template" />
+                        <SourceMessage message={template} source={template.source} contentType="template" />
                       </div>
                     );
                   })}
diff --git a/go.mod b/go.mod
index cbddb00a76..09b33dfb8a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,35 +8,31 @@ go 1.16
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
-	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
-	github.com/Shopify/sarama v1.28.0
+	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/TwinProduction/go-color v1.0.0
 	github.com/aws/aws-sdk-go v1.37.29
 	github.com/aws/aws-sdk-go-v2/config v1.1.1
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.1.1
 	github.com/aws/aws-sdk-go-v2/service/eks v1.1.1
 	github.com/aws/aws-sdk-go-v2/service/iam v1.1.1
-	github.com/beanstalkd/go-beanstalk v0.1.0
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
-	github.com/jpillora/backoff v1.0.0
 	github.com/kr/pretty v0.2.1
 	github.com/mitchellh/copystructure v1.1.2 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/riferrei/srclient v0.2.1
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.7.0
 	github.com/thanhpk/randstr v1.0.4
 	github.com/txn2/txeh v1.3.0
 	goji.io v2.0.2+incompatible
-	golang.org/x/mod v0.4.1
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.19.0
 	k8s.io/apimachinery v0.19.0
 	k8s.io/client-go v0.19.0
 	k8s.io/klog v1.0.0
+	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
+	github.com/stretchr/testify v1.6.1
+	golang.org/x/mod v0.4.1
 )
diff --git a/go.sum b/go.sum
index ed4874dc98..418e387d41 100644
--- a/go.sum
+++ b/go.sum
@@ -292,6 +292,7 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX
 github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -368,6 +369,7 @@ github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -509,6 +511,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -552,6 +555,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
@@ -602,6 +606,7 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -615,6 +620,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -639,6 +645,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -648,6 +655,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -682,6 +690,7 @@ golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4 h1:Toz2IK7k8rbltAXwNAxKcn9
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -731,6 +740,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -754,6 +764,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/go_repositories.bzl b/go_repositories.bzl
index 68045bf9f4..8ad915bbd1 100644
--- a/go_repositories.bzl
+++ b/go_repositories.bzl
@@ -157,12 +157,6 @@ def go_repositories():
         sum = "h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=",
         version = "v0.5.0",
     )
-    go_repository(
-        name = "com_github_beanstalkd_go_beanstalk",
-        importpath = "github.com/beanstalkd/go-beanstalk",
-        sum = "h1:IiNwYbAoVBDs5xEOmleGoX+DRD3Moz99EpATbl8672w=",
-        version = "v0.1.0",
-    )
 
     go_repository(
         name = "com_github_beorn7_perks",
@@ -285,12 +279,6 @@ def go_repositories():
         sum = "h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=",
         version = "v2.0.0",
     )
-    go_repository(
-        name = "com_github_creack_pty",
-        importpath = "github.com/creack/pty",
-        sum = "h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=",
-        version = "v1.1.9",
-    )
 
     go_repository(
         name = "com_github_davecgh_go_spew",
@@ -324,24 +312,6 @@ def go_repositories():
         sum = "h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=",
         version = "v0.0.0-20180111231733-ee0de3bc6815",
     )
-    go_repository(
-        name = "com_github_eapache_go_resiliency",
-        importpath = "github.com/eapache/go-resiliency",
-        sum = "h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q=",
-        version = "v1.2.0",
-    )
-    go_repository(
-        name = "com_github_eapache_go_xerial_snappy",
-        importpath = "github.com/eapache/go-xerial-snappy",
-        sum = "h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=",
-        version = "v0.0.0-20180814174437-776d5712da21",
-    )
-    go_repository(
-        name = "com_github_eapache_queue",
-        importpath = "github.com/eapache/queue",
-        sum = "h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=",
-        version = "v1.1.0",
-    )
 
     go_repository(
         name = "com_github_elazarl_goproxy",
@@ -379,18 +349,6 @@ def go_repositories():
         sum = "h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=",
         version = "v1.7.0",
     )
-    go_repository(
-        name = "com_github_fortytw2_leaktest",
-        importpath = "github.com/fortytw2/leaktest",
-        sum = "h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=",
-        version = "v1.3.0",
-    )
-    go_repository(
-        name = "com_github_frankban_quicktest",
-        importpath = "github.com/frankban/quicktest",
-        sum = "h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=",
-        version = "v1.11.3",
-    )
 
     go_repository(
         name = "com_github_fsnotify_fsnotify",
@@ -499,12 +457,6 @@ def go_repositories():
         sum = "h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=",
         version = "v1.4.2",
     )
-    go_repository(
-        name = "com_github_golang_snappy",
-        importpath = "github.com/golang/snappy",
-        sum = "h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=",
-        version = "v0.0.2",
-    )
 
     go_repository(
         name = "com_github_google_btree",
@@ -569,18 +521,6 @@ def go_repositories():
         sum = "h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=",
         version = "v0.0.0-20181017120253-0766667cb4d1",
     )
-    go_repository(
-        name = "com_github_gorilla_securecookie",
-        importpath = "github.com/gorilla/securecookie",
-        sum = "h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=",
-        version = "v1.1.1",
-    )
-    go_repository(
-        name = "com_github_gorilla_sessions",
-        importpath = "github.com/gorilla/sessions",
-        sum = "h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=",
-        version = "v1.2.1",
-    )
 
     go_repository(
         name = "com_github_gorilla_websocket",
@@ -681,8 +621,8 @@ def go_repositories():
     go_repository(
         name = "com_github_hashicorp_go_uuid",
         importpath = "github.com/hashicorp/go-uuid",
-        sum = "h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=",
-        version = "v1.0.2",
+        sum = "h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=",
+        version = "v1.0.1",
     )
 
     go_repository(
@@ -754,42 +694,6 @@ def go_repositories():
         sum = "h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=",
         version = "v1.0.0",
     )
-    go_repository(
-        name = "com_github_jcmturner_aescts_v2",
-        importpath = "github.com/jcmturner/aescts/v2",
-        sum = "h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=",
-        version = "v2.0.0",
-    )
-    go_repository(
-        name = "com_github_jcmturner_dnsutils_v2",
-        importpath = "github.com/jcmturner/dnsutils/v2",
-        sum = "h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=",
-        version = "v2.0.0",
-    )
-    go_repository(
-        name = "com_github_jcmturner_gofork",
-        importpath = "github.com/jcmturner/gofork",
-        sum = "h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8=",
-        version = "v1.0.0",
-    )
-    go_repository(
-        name = "com_github_jcmturner_goidentity_v6",
-        importpath = "github.com/jcmturner/goidentity/v6",
-        sum = "h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=",
-        version = "v6.0.1",
-    )
-    go_repository(
-        name = "com_github_jcmturner_gokrb5_v8",
-        importpath = "github.com/jcmturner/gokrb5/v8",
-        sum = "h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA=",
-        version = "v8.4.2",
-    )
-    go_repository(
-        name = "com_github_jcmturner_rpc_v2",
-        importpath = "github.com/jcmturner/rpc/v2",
-        sum = "h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=",
-        version = "v2.0.3",
-    )
 
     go_repository(
         name = "com_github_jmespath_go_jmespath",
@@ -810,12 +714,6 @@ def go_repositories():
         sum = "h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=",
         version = "v0.1.0",
     )
-    go_repository(
-        name = "com_github_jpillora_backoff",
-        importpath = "github.com/jpillora/backoff",
-        sum = "h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=",
-        version = "v1.0.0",
-    )
 
     go_repository(
         name = "com_github_json_iterator_go",
@@ -854,12 +752,6 @@ def go_repositories():
         sum = "h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=",
         version = "v1.0.0",
     )
-    go_repository(
-        name = "com_github_klauspost_compress",
-        importpath = "github.com/klauspost/compress",
-        sum = "h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg=",
-        version = "v1.11.7",
-    )
 
     go_repository(
         name = "com_github_konsorten_go_windows_terminal_sequences",
@@ -889,14 +781,8 @@ def go_repositories():
     go_repository(
         name = "com_github_kr_text",
         importpath = "github.com/kr/text",
-        sum = "h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=",
-        version = "v0.2.0",
-    )
-    go_repository(
-        name = "com_github_linkedin_goavro_v2",
-        importpath = "github.com/linkedin/goavro/v2",
-        sum = "h1:Vd++Rb/RKcmNJjM0HP/JJFMEWa21eUBVKPYlKehOGrM=",
-        version = "v2.9.7",
+        sum = "h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=",
+        version = "v0.1.0",
     )
 
     go_repository(
@@ -1090,12 +976,6 @@ def go_repositories():
         sum = "h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=",
         version = "v2.0.1+incompatible",
     )
-    go_repository(
-        name = "com_github_pierrec_lz4",
-        importpath = "github.com/pierrec/lz4",
-        sum = "h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A=",
-        version = "v2.6.0+incompatible",
-    )
 
     go_repository(
         name = "com_github_pkg_errors",
@@ -1160,18 +1040,6 @@ def go_repositories():
         sum = "h1:JCHLVE3B+kJde7bIEo5N4J+ZbLhp0J1Fs+ulyRws4gE=",
         version = "v0.0.0-20160726150825-5bd2802263f2",
     )
-    go_repository(
-        name = "com_github_rcrowley_go_metrics",
-        importpath = "github.com/rcrowley/go-metrics",
-        sum = "h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=",
-        version = "v0.0.0-20201227073835-cf1acfcdf475",
-    )
-    go_repository(
-        name = "com_github_riferrei_srclient",
-        importpath = "github.com/riferrei/srclient",
-        sum = "h1:uIJhzPXW+suDsEDOZKf4oTZZXTyxtw98cFC70rFzvgU=",
-        version = "v0.2.1",
-    )
 
     go_repository(
         name = "com_github_rogpeppe_fastuuid",
@@ -1211,18 +1079,6 @@ def go_repositories():
         sum = "h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=",
         version = "v0.0.0-20170313163322-e2103e2c3529",
     )
-    go_repository(
-        name = "com_github_shopify_sarama",
-        importpath = "github.com/Shopify/sarama",
-        sum = "h1:lOi3SfE6OcFlW9Trgtked2aHNZ2BIG/d6Do+PEUAqqM=",
-        version = "v1.28.0",
-    )
-    go_repository(
-        name = "com_github_shopify_toxiproxy",
-        importpath = "github.com/Shopify/toxiproxy",
-        sum = "h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=",
-        version = "v2.1.4+incompatible",
-    )
 
     go_repository(
         name = "com_github_shurcool_sanitized_anchor_name",
@@ -1308,8 +1164,8 @@ def go_repositories():
     go_repository(
         name = "com_github_stretchr_testify",
         importpath = "github.com/stretchr/testify",
-        sum = "h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=",
-        version = "v1.7.0",
+        sum = "h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=",
+        version = "v1.6.1",
     )
     go_repository(
         name = "com_github_subosito_gotenv",
@@ -1349,18 +1205,6 @@ def go_repositories():
         sum = "h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=",
         version = "v0.0.0-20181204163529-d75b2dcb6bc8",
     )
-    go_repository(
-        name = "com_github_xdg_scram",
-        importpath = "github.com/xdg/scram",
-        sum = "h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=",
-        version = "v0.0.0-20180814205039-7eeb5667e42c",
-    )
-    go_repository(
-        name = "com_github_xdg_stringprep",
-        importpath = "github.com/xdg/stringprep",
-        sum = "h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=",
-        version = "v1.0.0",
-    )
 
     go_repository(
         name = "com_github_xiang90_probing",
@@ -1429,8 +1273,8 @@ def go_repositories():
     go_repository(
         name = "in_gopkg_check_v1",
         importpath = "gopkg.in/check.v1",
-        sum = "h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=",
-        version = "v1.0.0-20201130134442-10cb98267c6c",
+        sum = "h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=",
+        version = "v1.0.0-20190902080502-41f04d3bba15",
     )
 
     go_repository(
@@ -1483,8 +1327,8 @@ def go_repositories():
     go_repository(
         name = "in_gopkg_yaml_v3",
         importpath = "gopkg.in/yaml.v3",
-        sum = "h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=",
-        version = "v3.0.0-20210107192922-496545a6307b",
+        sum = "h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=",
+        version = "v3.0.0-20200313102051-9f266ea9e77c",
     )
     go_repository(
         name = "io_etcd_go_bbolt",
@@ -1615,8 +1459,8 @@ def go_repositories():
     go_repository(
         name = "org_golang_x_crypto",
         importpath = "golang.org/x/crypto",
-        sum = "h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=",
-        version = "v0.0.0-20201221181555-eec23a3978ad",
+        sum = "h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=",
+        version = "v0.0.0-20200622213623-75b288015ac9",
     )
     go_repository(
         name = "org_golang_x_exp",
@@ -1654,8 +1498,8 @@ def go_repositories():
     go_repository(
         name = "org_golang_x_net",
         importpath = "golang.org/x/net",
-        sum = "h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=",
-        version = "v0.0.0-20210119194325-5f4716e94777",
+        sum = "h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=",
+        version = "v0.0.0-20201110031124-69a78807bb2b",
     )
     go_repository(
         name = "org_golang_x_oauth2",
@@ -1667,27 +1511,21 @@ def go_repositories():
     go_repository(
         name = "org_golang_x_sync",
         importpath = "golang.org/x/sync",
-        sum = "h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=",
-        version = "v0.0.0-20201020160332-67f06af15bc9",
+        sum = "h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=",
+        version = "v0.0.0-20190911185100-cd5d95a43a6e",
     )
     go_repository(
         name = "org_golang_x_sys",
         importpath = "golang.org/x/sys",
-        sum = "h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=",
-        version = "v0.0.0-20201119102817-f84b799fce68",
-    )
-    go_repository(
-        name = "org_golang_x_term",
-        importpath = "golang.org/x/term",
-        sum = "h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=",
-        version = "v0.0.0-20201126162022-7de9c90e9dd1",
+        sum = "h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=",
+        version = "v0.0.0-20200930185726-fdedc70b468f",
     )
 
     go_repository(
         name = "org_golang_x_text",
         importpath = "golang.org/x/text",
-        sum = "h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=",
-        version = "v0.3.5",
+        sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
+        version = "v0.3.3",
     )
     go_repository(
         name = "org_golang_x_time",
@@ -1705,8 +1543,8 @@ def go_repositories():
     go_repository(
         name = "org_golang_x_xerrors",
         importpath = "golang.org/x/xerrors",
-        sum = "h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=",
-        version = "v0.0.0-20200804184101-5ec99f83aff1",
+        sum = "h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=",
+        version = "v0.0.0-20191204190536-9bdfabe68543",
     )
 
     go_repository(
diff --git a/infrastructure/helm-chart/charts/core/charts/components/charts/integration/charts/webhook/templates/deployments.yaml b/infrastructure/helm-chart/charts/core/charts/components/charts/integration/charts/webhook/templates/deployments.yaml
index 112973944f..9c3233319f 100644
--- a/infrastructure/helm-chart/charts/core/charts/components/charts/integration/charts/webhook/templates/deployments.yaml
+++ b/infrastructure/helm-chart/charts/core/charts/components/charts/integration/charts/webhook/templates/deployments.yaml
@@ -49,26 +49,24 @@ spec:
             configMapKeyRef:
               name: kafka-config
               key: KAFKA_SCHEMA_REGISTRY_URL
+        - name: KAFKA_COMMIT_INTERVAL_MS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_COMMIT_INTERVAL_MS
         - name: WEBHOOK_NAME
           valueFrom:
             configMapKeyRef:
               name: "{{ .Values.component }}"
               key: name
-        - name: MAX_BACKOFF_SECONDS
-          valueFrom:
-            configMapKeyRef:
-              name: integration-webhook
-              key: maxBackoff
         livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-              httpHeaders:
-                - name: Health-Check
-                  value: health-check
-            initialDelaySeconds: 60
-            periodSeconds: 10
-            failureThreshold: 3
+          httpGet:
+            path: /actuator/health
+            port: 8080
+            httpHeaders:
+              - name: Health-Check
+                value: health-check
+          initialDelaySeconds: 60
       initContainers:
       - name: wait
         image: busybox
@@ -156,11 +154,13 @@ spec:
               name: "{{ .Values.component }}"
               key: name
         livenessProbe:
-          tcpSocket:
-            port: 6000
+          httpGet:
+            path: /actuator/health
+            port: 8080
+            httpHeaders:
+              - name: Health-Check
+                value: health-check
           initialDelaySeconds: 60
-          periodSeconds: 10
-          failureThreshold: 3
       initContainers:
       - name: wait
         image: busybox
diff --git a/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/Chart.yaml b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/Chart.yaml
new file mode 100644
index 0000000000..b719648ddb
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for the Viber source
+name: viber
+version: 1.0
diff --git a/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/deployments.yaml b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/deployments.yaml
new file mode 100644
index 0000000000..13769df325
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/deployments.yaml
@@ -0,0 +1,173 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sources-viber-connector
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  labels:
+    app: sources-viber-connector
+    type: sources
+    core.airy.co/managed: "true"
+    core.airy.co/mandatory: "{{ .Values.mandatory }}"
+    core.airy.co/component: "{{ .Values.component }}"
+spec:
+  replicas: 0
+  selector:
+    matchLabels:
+      app: sources-viber-connector
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: sources-viber-connector
+    spec:
+      containers:
+        - name: app
+          image: "{{ .Values.global.kubernetes.containerRegistry}}/{{ .Values.imageConnector }}:{{ .Values.global.kubernetes.appImageTag }}"
+          imagePullPolicy: Always
+          envFrom:
+            - configMapRef:
+                name: security
+            - configMapRef:
+                name: hostnames
+          env:
+            - name: KAFKA_BROKERS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_BROKERS
+            - name: KAFKA_SCHEMA_REGISTRY_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_SCHEMA_REGISTRY_URL
+            - name: KAFKA_COMMIT_INTERVAL_MS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_COMMIT_INTERVAL_MS
+            - name: authToken
+              valueFrom:
+                configMapKeyRef:
+                  name: "{{ .Values.component }}"
+                  key: authToken
+          livenessProbe:
+            httpGet:
+              path: /actuator/health
+              port: 8080
+              httpHeaders:
+                - name: Health-Check
+                  value: health-check
+            initialDelaySeconds: 60
+      initContainers:
+        - name: wait
+          image: busybox
+          command: [ "/bin/sh", "/opt/provisioning/wait-for-minimum-kafkas.sh" ]
+          env:
+            - name: KAFKA_BROKERS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_BROKERS
+            - name: REPLICAS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_MINIMUM_REPLICAS
+          volumeMounts:
+            - name: provisioning-scripts
+              mountPath: /opt/provisioning
+      volumes:
+        - name: provisioning-scripts
+          configMap:
+            name: provisioning-scripts
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sources-viber-events-router
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  labels:
+    app: sources-viber-events-router
+    type: sources
+    core.airy.co/managed: "true"
+    core.airy.co/mandatory: "{{ .Values.mandatory }}"
+    core.airy.co/component: "{{ .Values.component }}"
+  annotations:
+    core.airy.co/config-items-mandatory: "VIBER_AUTH_TOKEN VIBER_ACCOUNT_SID"
+spec:
+  replicas: 0
+  selector:
+    matchLabels:
+      app: sources-viber-events-router
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: sources-viber-events-router
+    spec:
+      containers:
+        - name: app
+          image: "{{ .Values.global.kubernetes.containerRegistry}}/{{ .Values.imageEventsRouter }}:{{ .Values.global.kubernetes.appImageTag }}"
+          imagePullPolicy: Always
+          env:
+            - name: KAFKA_BROKERS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_BROKERS
+            - name: KAFKA_SCHEMA_REGISTRY_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_SCHEMA_REGISTRY_URL
+            - name: KAFKA_COMMIT_INTERVAL_MS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_COMMIT_INTERVAL_MS
+            - name: VIBER_AUTH_TOKEN
+              valueFrom:
+                configMapKeyRef:
+                  name: "{{ .Values.component }}"
+                  key: authToken
+            - name: VIBER_ACCOUNT_SID
+              valueFrom:
+                configMapKeyRef:
+                  name: "{{ .Values.component }}"
+                  key: accountSid
+          livenessProbe:
+            tcpSocket:
+              port: 6000
+            initialDelaySeconds: 60
+            periodSeconds: 10
+            failureThreshold: 3
+      initContainers:
+        - name: wait
+          image: busybox
+          command: [ "/bin/sh", "/opt/provisioning/wait-for-minimum-kafkas.sh" ]
+          env:
+            - name: KAFKA_BROKERS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_BROKERS
+            - name: REPLICAS
+              valueFrom:
+                configMapKeyRef:
+                  name: kafka-config
+                  key: KAFKA_MINIMUM_REPLICAS
+          volumeMounts:
+            - name: provisioning-scripts
+              mountPath: /opt/provisioning
+      volumes:
+        - name: provisioning-scripts
+          configMap:
+            name: provisioning-scripts
diff --git a/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/service.yaml b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/service.yaml
new file mode 100644
index 0000000000..e09bbe1969
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: sources-viber-connector
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  labels:
+    core.airy.co/prometheus: spring
+spec:
+  ports:
+    - name: web
+      port: 80
+      targetPort: 8080
+      protocol: TCP
+  type: NodePort
+  selector:
+    app: sources-viber-connector
diff --git a/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/values.yaml b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/values.yaml
new file mode 100644
index 0000000000..dee7d9e75c
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/components/charts/sources/charts/viber/values.yaml
@@ -0,0 +1,4 @@
+component: sources-viber
+mandatory: false
+imageConnector: sources/viber-connector
+imageEventsRouter: sources/viber-events-router
diff --git a/infrastructure/helm-chart/charts/core/charts/provisioning/templates/job-wait.yaml b/infrastructure/helm-chart/charts/core/charts/provisioning/templates/job-wait.yaml
index de96d6d759..c0f89639db 100644
--- a/infrastructure/helm-chart/charts/core/charts/provisioning/templates/job-wait.yaml
+++ b/infrastructure/helm-chart/charts/core/charts/provisioning/templates/job-wait.yaml
@@ -3,7 +3,9 @@ kind: Job
 metadata:
   name: wait-for-api-communication
   annotations:
-    "helm.sh/hook": "post-install"
+    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": hook-succeeded
 spec:
   template:
     spec:
@@ -29,7 +31,9 @@ kind: Job
 metadata:
   name: wait-for-frontend-ui
   annotations:
-    "helm.sh/hook": "post-install"
+    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": hook-succeeded
 spec:
   template:
     spec:
@@ -55,7 +59,9 @@ kind: Job
 metadata:
   name: wait-for-frontend-chat-plugin
   annotations:
-    "helm.sh/hook": "post-install"
+    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": hook-succeeded
 spec:
   template:
     spec:
diff --git a/infrastructure/helm-chart/charts/core/charts/provisioning/templates/kafka-create-topics.yaml b/infrastructure/helm-chart/charts/core/charts/provisioning/templates/kafka-create-topics.yaml
index 96cab10dec..650f33cc59 100644
--- a/infrastructure/helm-chart/charts/core/charts/provisioning/templates/kafka-create-topics.yaml
+++ b/infrastructure/helm-chart/charts/core/charts/provisioning/templates/kafka-create-topics.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: kafka-create-topics
   annotations:
-    "helm.sh/hook": "pre-install"
+    "helm.sh/hook": "pre-install, pre-upgrade"
+    "helm.sh/hook-weight": "2"
 data:
   create-topics.sh: |
     #!/bin/bash
@@ -41,7 +42,7 @@ data:
 
     kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}application.communication.templates" --config cleanup.policy=compact min.compaction.lag.ms=86400000 segment.bytes=10485760
 
-    kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}application.communication.webhooks" 
+    kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}application.communication.webhooks-v0.29.0" 
 
     kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}ops.application.logs" 
 
@@ -51,3 +52,5 @@ data:
 
     kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}source.twilio.events" 
 
+    kafka-topics.sh --create --if-not-exists --zookeeper "${ZOOKEEPER}" --replication-factor "${REPLICAS}" --partitions "${PARTITIONS}" --topic "${AIRY_CORE_NAMESPACE}source.viber.events" 
+
diff --git a/infrastructure/helm-chart/charts/core/charts/upgrading/Chart.yaml b/infrastructure/helm-chart/charts/core/charts/upgrading/Chart.yaml
new file mode 100644
index 0000000000..753dbeac51
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/upgrading/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: Upgrading of Airy core
+name: upgrading
+version: 0-develop
\ No newline at end of file
diff --git a/infrastructure/helm-chart/charts/core/charts/upgrading/templates/0.29.0.yaml b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/0.29.0.yaml
new file mode 100644
index 0000000000..ad324bd792
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/0.29.0.yaml
@@ -0,0 +1,344 @@
+{{ if eq .Values.global.kubernetes.appImageTag "0.29.0"}}
+# Helper scripts
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: upgrade-{{ .Values.global.kubernetes.appImageTag }}
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "1"
+  labels:
+    core.airy.co/upgrade: "true"
+data:
+  check-existing-wehook.sh: |
+    #!/bin/sh
+    system_token=${SYSTEM_TOKEN}
+    curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer ${system_token}" api-admin/webhooks.info -w "\n%{http_code}\n" > /tmp/response.txt
+    cat /tmp/response.txt
+    status_code=$(cat /tmp/response.txt | tail -n 1)
+    if [ "${status_code}" = "404" ]; then
+        kubectl patch configmap upgrade-{{ .Values.global.kubernetes.appImageTag }} --type merge -p '{"data":{"webhookUsed": "false"}}'
+    else
+      if [ "${status_code}" = "200" ]; then
+        webhooks=$(cat /tmp/response.txt | head -n 1)
+        if [ -z "${webhooks}" ]; then
+          kubectl patch configmap upgrade-{{ .Values.global.kubernetes.appImageTag }} --type merge -p '{"data":{"webhookUsed": "false"}}'
+        else
+          kubectl patch configmap upgrade-{{ .Values.global.kubernetes.appImageTag }} --type merge -p '{"data":{"webhookUsed": "true"}}'
+          echo ${webhooks} > /tmp/webhooks.yaml
+          kubectl delete configmap existing-webhooks
+          sleep 1
+          kubectl create configmap existing-webhooks --from-file=/tmp/webhooks.yaml
+          kubectl label configmap existing-webhooks core.airy.co/upgrade="true"
+        fi
+      fi
+    fi
+
+  subscribe-wehoook.sh: |
+    #!/bin/sh
+    system_token=${SYSTEM_TOKEN}
+    webhookUsed=$(kubectl get configmap upgrade-{{ .Values.global.kubernetes.appImageTag }} -o jsonpath='{.data.webhookUsed}')
+    echo "Webhook used: ${webhookUsed}"
+    if [ "${webhookUsed}" = "true" ]; then
+      request=$(kubectl get configmap existing-webhooks -o jsonpath='{.data.webhooks\.yaml}')
+      curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer ${system_token}" -d "${request}" api-admin/webhooks.subscribe
+    fi
+---
+# Cleanup old jobs
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.global.kubernetes.appImageTag }}-cleanup-upgrade
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "0"
+  labels:
+    core.airy.co/upgrade: "true"
+spec:
+  ttlSecondsAfterFinished: 120
+  template:
+    spec:
+      containers:
+      - name: reset-app
+        image: "bitnami/kubectl"
+        command: ['/bin/sh', '/opt/provisioning/upgrade-cleanup.sh']
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      serviceAccountName: airy-upgrade
+      volumes:
+        - name: upgrading-scripts
+          configMap:
+            name: upgrading-scripts
+      restartPolicy: Never
+  backoffLimit: 3
+---
+# Migrate api-communication
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.global.kubernetes.appImageTag }}-upgrade-api-communication
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "9"
+  labels:
+    core.airy.co/upgrade: "true"
+spec:
+  ttlSecondsAfterFinished: 120
+  template:
+    spec:
+      initContainers:
+      - name: scale-down
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/scale-down-deployment.sh']
+        env:
+        - name: DEPLOYMENT_NAME
+          value: api-communication
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      - name: wait-consumer-group
+        image: "{{ .Values.kafkaImage }}:{{ .Values.kafkaImageTag }}"
+        command:  ['/bin/sh', '/opt/provisioning/wait-for-empty-consumer-group.sh']
+        env:
+        - name: KAFKA_BROKERS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_BROKERS
+        - name: CONSUMER_GROUP
+          value: api.CommunicationStores
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      containers:
+      - name: reset-app
+        image: "{{ .Values.kafkaImage }}:{{ .Values.kafkaImageTag }}"
+        command: ['/bin/sh', '/opt/provisioning/reset-streaming-app.sh']
+        env:
+        - name: KAFKA_BROKERS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_BROKERS
+        - name: INPUT_TOPICS
+          value: 'application.communication.channels,application.communication.messages,application.communication.metadata,application.communication.read-receipt'
+        - name: CONSUMER_GROUP
+          value: api.CommunicationStores
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      serviceAccountName: airy-upgrade
+      volumes:
+        - name: upgrading-scripts
+          configMap:
+            name: upgrading-scripts
+        - name: kafka-config
+          configMap:
+            name: kafka-config
+      restartPolicy: Never
+  backoffLimit: 3
+---
+# Migrate webhooks
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.global.kubernetes.appImageTag }}-upgrade-integration-webhooks
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "10"
+  labels:
+    core.airy.co/upgrade: "true"
+spec:
+  ttlSecondsAfterFinished: 120
+  template:
+    spec:
+      initContainers:
+      - name: wait-api-admin
+        image: busybox
+        command: ["/bin/sh", "/opt/provisioning/wait-for-service.sh"]
+        env:
+        - name: SERVICE_NAME
+          value: api-admin
+        - name: SERVICE_PORT
+          value: "80"
+        volumeMounts:
+        - name: provisioning-scripts
+          mountPath: /opt/provisioning
+      - name: check-webhook
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/check-existing-wehook.sh']
+        envFrom:
+        - configMapRef:
+            name: security
+        volumeMounts:
+        - name: upgrade
+          mountPath: /opt/provisioning
+      - name: scale-down-consumer
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/scale-down-deployment.sh']
+        env:
+        - name: DEPLOYMENT_NAME
+          value: webhook-consumer
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      - name: scale-down-publisher
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/scale-down-deployment.sh']
+        env:
+        - name: DEPLOYMENT_NAME
+          value: webhook-publisher
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      - name: scale-down-beanstalkd
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/scale-down-statefulset.sh']
+        env:
+        - name: STATEFULSET_NAME
+          value: beanstalkd
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      - name: delete-pvc
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/delete-pvc.sh']
+        env:
+        - name: APP_LABEL
+          value: beanstalkd
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      - name: create-topics
+        image: "{{ .Values.kafkaImage }}:{{ .Values.kafkaImageTag }}"
+        command: ["/bin/sh", "/opt/provisioning/create-topics.sh"]
+        env:
+        - name: ZOOKEEPER
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: ZOOKEEPER
+        - name: REPLICAS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_MINIMUM_REPLICAS
+        volumeMounts:
+        - name: kafka-create-topics
+          mountPath: /opt/provisioning
+      - name: wait-consumer-group
+        image: "{{ .Values.kafkaImage }}:{{ .Values.kafkaImageTag }}"
+        command:  ['/bin/sh', '/opt/provisioning/wait-for-empty-consumer-group.sh']
+        env:
+        - name: KAFKA_BROKERS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_BROKERS
+        - name: CONSUMER_GROUP
+          value: webhook.Publisher
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      containers:
+      - name: reset-app
+        image: "{{ .Values.kafkaImage }}:{{ .Values.kafkaImageTag }}"
+        command: ['/bin/sh', '/opt/provisioning/reset-streaming-app.sh']
+        env:
+        - name: KAFKA_BROKERS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_BROKERS
+        - name: INPUT_TOPICS
+          value: 'application.communication.messages,application.communication.metadata,application.communication.webhooks'
+        - name: CONSUMER_GROUP
+          value: webhook.Publisher
+        volumeMounts:
+        - name: upgrading-scripts
+          mountPath: /opt/provisioning
+      serviceAccountName: airy-upgrade
+      volumes:
+        - name: provisioning-scripts
+          configMap:
+            name: provisioning-scripts
+        - name: upgrading-scripts
+          configMap:
+            name: upgrading-scripts
+        - name: kafka-config
+          configMap:
+            name: kafka-config
+        - name: kafka-create-topics
+          configMap:
+            name: kafka-create-topics
+        - name: security
+          configMap:
+            name: security
+        - name: upgrade
+          configMap:
+            name: upgrade-{{ .Values.global.kubernetes.appImageTag }}
+      restartPolicy: Never
+  backoffLimit: 3
+---
+# Subscribe webhook
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.global.kubernetes.appImageTag }}-post-upgrade
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "post-upgrade"
+    "helm.sh/hook-weight": "10"
+  labels:
+    core.airy.co/upgrade: "post-upgrade"
+spec:
+  ttlSecondsAfterFinished: 120
+  template:
+    spec:
+      initContainers:
+      - name: wait-api-admin
+        image: busybox
+        command: ["/bin/sh", "/opt/provisioning/wait-for-service.sh"]
+        env:
+        - name: SERVICE_NAME
+          value: api-admin
+        - name: SERVICE_PORT
+          value: "80"
+        volumeMounts:
+        - name: provisioning-scripts
+          mountPath: /opt/provisioning
+      containers:
+      - name: subscribe-webhook
+        image: bitnami/kubectl
+        command:  ['/bin/sh', '/opt/provisioning/subscribe-wehoook.sh']
+        envFrom:
+        - configMapRef:
+            name: security
+        volumeMounts:
+        - name: upgrade
+          mountPath: /opt/provisioning
+      serviceAccountName: airy-upgrade
+      volumes:
+        - name: provisioning-scripts
+          configMap:
+            name: provisioning-scripts
+        - name: upgrading-scripts
+          configMap:
+            name: upgrading-scripts
+        - name: kafka-config
+          configMap:
+            name: kafka-config
+        - name: upgrade
+          configMap:
+            name: upgrade-{{ .Values.global.kubernetes.appImageTag }}
+        - name: security
+          configMap:
+            name: security
+      restartPolicy: Never
+  backoffLimit: 3
+{{ end }}
diff --git a/infrastructure/helm-chart/charts/core/charts/upgrading/templates/scripts.yaml b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/scripts.yaml
new file mode 100644
index 0000000000..c45ab8879a
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/scripts.yaml
@@ -0,0 +1,70 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: upgrading-scripts
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "-5"
+data:
+  scale-down-deployment.sh: |
+    #!/bin/sh
+    deployment=${DEPLOYMENT_NAME}
+
+    kubectl scale deployment ${deployment} --replicas=0
+
+  scale-down-statefulset.sh: |
+    #!/bin/sh
+    statefulset=${STATEFULSET_NAME}
+
+    kubectl scale statefulset ${statefulset} --replicas=0
+
+  delete-pvc.sh: |
+    #!/bin/sh
+    app_label=${APP_LABEL}
+    kubectl delete pvc -l app=${app_label}
+
+  wait-for-empty-consumer-group.sh: |
+    #!/bin/sh
+    kafka_brokers=${KAFKA_BROKERS:-kafka:9092}
+    consumer_group=${CONSUMER_GROUP}
+    delay=${DELAY:-5}
+
+    if kafka-consumer-groups.sh --bootstrap-server ${kafka_brokers} --list | grep -q ${consumer_group}
+    then
+      while ! kafka-consumer-groups.sh --bootstrap-server ${kafka_brokers} --group ${consumer_group} --describe 2>&1 | grep -q "has no active members"
+      do
+        echo "Waiting for the consumer group to be empty..."
+        sleep ${delay}
+      done
+    fi
+
+  reset-streaming-app.sh: |
+    #!/bin/sh
+    kafka_brokers=${KAFKA_BROKERS:-kafka:9092}
+    consumer_group=${CONSUMER_GROUP}
+    input_topics=${INPUT_TOPICS}
+    offset=${OFFSET:-to-earliest}
+
+    kafka-streams-application-reset.sh --bootstrap-servers ${kafka_brokers} --${offset} --application-id ${consumer_group} --input-topics ${input_topics}
+
+  wait-for-lag.sh: |
+    #!/bin/sh
+    kafka_brokers=${KAFKA_BROKERS:-kafka:9092}
+    consumer_group=${CONSUMER_GROUP}
+    max_consumer_lag=${MAX_CONSUMER_LAG:-5}
+    delay=${DELAY:-10}
+
+    consumer_lag=$(kafka-consumer-groups.sh --bootstrap-server ${kafka_brokers} --group ${consumer_group} --describe | awk '{ print $6; }' | grep -v "-" | awk '{s+=$1} END {print s}')
+    while [ ${consumer_lag} -gt ${max_consumer_lag} ] ; do 
+      echo "Current consumer lag for group ${consumer_group} is ${consumer_lag}. Waiting to reach ${max_consumer_lag}..."
+      sleep ${delay}
+      consumer_lag=$(kafka-consumer-groups.sh --bootstrap-server ${kafka_brokers} --group ${consumer_group} --describe | awk '{ print $6; }' | grep -v "-" | awk '{s+=$1} END {print s}')
+    done
+
+  upgrade-cleanup.sh: |
+    #!/bin/sh
+    kubectl delete configmap -l core.airy.co/upgrade="true"
+    kubectl delete job -l core.airy.co/upgrade="true"
+    kubectl delete job -l core.airy.co/upgrade="post-upgrade"
+    kubectl delete job -l job-name
diff --git a/infrastructure/helm-chart/charts/core/charts/upgrading/templates/serviceaccount.yaml b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..b77c460e73
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/upgrading/templates/serviceaccount.yaml
@@ -0,0 +1,45 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: airy-upgrade
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+automountServiceAccountToken: true
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: airy-upgrade
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+rules:
+- apiGroups: ["extensions", "apps"]
+  resources: ["deployments", "deployments/scale", "statefulsets", "statefulsets/scale"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+- apiGroups: [""]
+  resources: ["configmaps", "persistentvolumeclaims", "persistentvolumes", "persistentvolumeclaims/status", "secrets"]
+  verbs: ["create","delete","get","list","patch","update","watch"]
+- apiGroups: ["extensions", "batch"]
+  resources: ["jobs"]
+  verbs: ["create","delete","get","list","patch","update","watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: airy-upgrade
+  namespace: {{ .Values.global.kubernetes.namespace }}
+  annotations:
+    "helm.sh/hook": "pre-upgrade"
+    "helm.sh/hook-weight": "-10"
+subjects:
+  - kind: ServiceAccount
+    name: airy-upgrade
+    namespace: {{ .Values.global.kubernetes.namespace }}
+roleRef:
+  kind: Role
+  name: airy-upgrade
+  apiGroup: rbac.authorization.k8s.io
diff --git a/infrastructure/helm-chart/charts/core/charts/upgrading/values.yaml b/infrastructure/helm-chart/charts/core/charts/upgrading/values.yaml
new file mode 100644
index 0000000000..5fd911b32c
--- /dev/null
+++ b/infrastructure/helm-chart/charts/core/charts/upgrading/values.yaml
@@ -0,0 +1,2 @@
+kafkaImage: ghcr.io/airyhq/infrastructure/kafka
+kafkaImageTag: 2.7.0
diff --git a/infrastructure/helm-chart/charts/core/templates/ingress.yaml b/infrastructure/helm-chart/charts/core/templates/ingress.yaml
index dc465751a5..c9e604adb8 100644
--- a/infrastructure/helm-chart/charts/core/templates/ingress.yaml
+++ b/infrastructure/helm-chart/charts/core/templates/ingress.yaml
@@ -16,77 +16,14 @@ spec:
                 name: api-websocket
                 port:
                   number: 80
-          - path: /conversations.list
+          - path: /conversations
             pathType: Prefix
             backend:
               service:
                 name: api-communication
                 port:
                   number: 80
-          - path: /conversations.info
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.markRead
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.tag
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.untag
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.setState
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.updateContact
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /conversations.removeState
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /messages.list
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /messages.send
-            pathType: Prefix
-            backend:
-              service:
-                name: api-communication
-                port:
-                  number: 80
-          - path: /messages.suggestReplies
+          - path: /messages
             pathType: Prefix
             backend:
               service:
@@ -163,175 +100,63 @@ spec:
                 name: api-admin
                 port:
                   number: 80
-          - path: /channels.chatplugin.disconnect
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /channels.chatplugin.connect
+          - path: /channels.chatplugin
             pathType: Prefix
             backend:
               service:
                 name: api-admin
                 port:
                   number: 80
-          - path: /webhooks.subscribe
+          - path: /webhooks
             pathType: Prefix
             backend:
               service:
                 name: api-admin
                 port:
                   number: 80
-          - path: /webhooks.unsubscribe
+          - path: /tags
             pathType: Prefix
             backend:
               service:
                 name: api-admin
                 port:
                   number: 80
-          - path: /webhooks.info
+          - path: /templates
             pathType: Prefix
             backend:
               service:
                 name: api-admin
                 port:
                   number: 80
-          - path: /tags.create
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /tags.update
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /tags.list
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /tags.delete
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /templates.create
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /templates.update
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /templates.list
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /templates.delete
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /templates.info
-            pathType: Prefix
-            backend:
-              service:
-                name: api-admin
-                port:
-                  number: 80
-          - path: /channels.facebook.connect
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-facebook-connector
-                port:
-                  number: 80
-          - path: /channels.facebook.disconnect
+          - path: /channels.facebook
             pathType: Prefix
             backend:
               service:
                 name: sources-facebook-connector
                 port:
                   number: 80
-          - path: /channels.instagram.connect
+          - path: /channels.instagram
             pathType: Prefix
             backend:
               service:
                 name: sources-facebook-connector
                 port:
                   number: 80
-          - path: /channels.instagram.disconnect
+          - path: /channels.viber
             pathType: Prefix
             backend:
               service:
-                name: sources-facebook-connector
+                name: sources-viber-connector
                 port:
                   number: 80
-          - path: /channels.facebook.explore
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-facebook-connector
-                port:
-                  number: 80
-          - path: /channels.google.connect
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-google-connector
-                port:
-                  number: 80
-          - path: /channels.google.disconnect
+          - path: /channels.google
             pathType: Prefix
             backend:
               service:
                 name: sources-google-connector
                 port:
                   number: 80
-          - path: /channels.twilio.sms.connect
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-twilio-connector
-                port:
-                  number: 80
-          - path: /channels.twilio.sms.disconnect
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-twilio-connector
-                port:
-                  number: 80
-          - path: /channels.twilio.whatsapp.connect
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-twilio-connector
-                port:
-                  number: 80
-          - path: /channels.twilio.whatsapp.disconnect
+          - path: /channels.twilio
             pathType: Prefix
             backend:
               service:
@@ -366,21 +191,7 @@ spec:
                 name: sources-chatplugin
                 port:
                   number: 80
-          - path: /chatplugin.authenticate
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-chatplugin
-                port:
-                  number: 80
-          - path: /chatplugin.resumeToken
-            pathType: Prefix
-            backend:
-              service:
-                name: sources-chatplugin
-                port:
-                  number: 80
-          - path: /chatplugin.send
+          - path: /chatplugin
             pathType: Prefix
             backend:
               service:
diff --git a/infrastructure/helm-chart/charts/core/templates/ngrok.yaml b/infrastructure/helm-chart/charts/core/templates/ngrok.yaml
index c604607921..a6305f72cf 100644
--- a/infrastructure/helm-chart/charts/core/templates/ngrok.yaml
+++ b/infrastructure/helm-chart/charts/core/templates/ngrok.yaml
@@ -46,6 +46,13 @@ spec:
                 name: sources-twilio-connector
                 port:
                   number: 80
+          - path: /viber
+            pathType: Prefix
+            backend:
+              service:
+                name: sources-viber-connector
+                port:
+                  number: 80
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/infrastructure/lib/go/k8s/util/util.go b/infrastructure/lib/go/k8s/util/util.go
index a024abce4e..a45a90a558 100644
--- a/infrastructure/lib/go/k8s/util/util.go
+++ b/infrastructure/lib/go/k8s/util/util.go
@@ -103,3 +103,20 @@ func ToObjectMeta(kubernetesObject interface{}) ObjectMeta {
 		ObjectMeta: field,
 	}
 }
+
+func ConfirmToProceed() bool {
+	var input string
+	fmt.Println("Are you sure that you want to proceed? [Y/y]")
+	_, err := fmt.Scanln(&input)
+	fmt.Println()
+	if err != nil {
+		return false
+	}
+	proceed := []string{"y", "Y"}
+	for _, v := range proceed {
+		if input == v {
+			return true
+		}
+	}
+	return false
+}
diff --git a/infrastructure/tools/topics/src/main/java/co/airy/tools/topics/Application.java b/infrastructure/tools/topics/src/main/java/co/airy/tools/topics/Application.java
index 5e92b01912..5c4cd1aee7 100644
--- a/infrastructure/tools/topics/src/main/java/co/airy/tools/topics/Application.java
+++ b/infrastructure/tools/topics/src/main/java/co/airy/tools/topics/Application.java
@@ -23,7 +23,9 @@ public static void main(String[] args) {
                 "\n" +
                 "  annotations:" +
                 "\n" +
-                "    \"helm.sh/hook\": \"pre-install\"" +
+                "    \"helm.sh/hook\": \"pre-install, pre-upgrade\"" +
+                "\n" +
+                "    \"helm.sh/hook-weight\": \"2\"" +
                 "\n" +
                 "data:" +
                 "\n" +
diff --git a/lib/java/date/BUILD b/lib/java/date/BUILD
index 90c30f7212..8cf773c22f 100644
--- a/lib/java/date/BUILD
+++ b/lib/java/date/BUILD
@@ -5,10 +5,6 @@ custom_java_library(
     name = "date",
     srcs = glob(["src/main/java/co/airy/date/**/*.java"]),
     visibility = ["//visibility:public"],
-    deps = [
-        "//:jackson",
-        "//:lombok",
-    ],
 )
 
 check_pkg(name = "buildifier")
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceFacebook.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceFacebook.java
deleted file mode 100644
index ee7730b6e3..0000000000
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceFacebook.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package co.airy.kafka.schema;
-
-public abstract class SourceFacebook extends AbstractTopic {
-    @Override
-    public String kind() {
-        return "source";
-    }
-
-    @Override
-    public String domain() {
-        return "facebook";
-    }
-}
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceGoogle.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceGoogle.java
deleted file mode 100644
index f6d487a00b..0000000000
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/SourceGoogle.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package co.airy.kafka.schema;
-
-public abstract class SourceGoogle extends AbstractTopic {
-    @Override
-    public String kind() {
-        return "source";
-    }
-
-    @Override
-    public String domain() {
-        return "google";
-    }
-}
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/application/ApplicationCommunicationWebhooks.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/application/ApplicationCommunicationWebhooks.java
index 3a229131c0..8356a521f5 100644
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/application/ApplicationCommunicationWebhooks.java
+++ b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/application/ApplicationCommunicationWebhooks.java
@@ -5,6 +5,6 @@
 public class ApplicationCommunicationWebhooks extends ApplicationCommunication {
     @Override
     public String dataset() {
-        return "webhooks";
+        return "webhooks-v0.29.0";
     }
 }
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceFacebookEvents.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceFacebookEvents.java
index ef6cfb44f9..b0a900c4b3 100644
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceFacebookEvents.java
+++ b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceFacebookEvents.java
@@ -1,8 +1,16 @@
 package co.airy.kafka.schema.source;
 
-import co.airy.kafka.schema.SourceFacebook;
+import co.airy.kafka.schema.AbstractTopic;
 
-public class SourceFacebookEvents extends SourceFacebook {
+public class SourceFacebookEvents extends AbstractTopic {
+    @Override
+    public String kind() {
+        return "source";
+    }
+    @Override
+    public String domain() {
+        return "facebook";
+    }
     @Override
     public String dataset() {
         return "events";
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceGoogleEvents.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceGoogleEvents.java
index af9a4bf89d..bd48a06ff8 100644
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceGoogleEvents.java
+++ b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceGoogleEvents.java
@@ -1,8 +1,16 @@
 package co.airy.kafka.schema.source;
 
-import co.airy.kafka.schema.SourceGoogle;
+import co.airy.kafka.schema.AbstractTopic;
 
-public class SourceGoogleEvents extends SourceGoogle {
+public class SourceGoogleEvents extends AbstractTopic {
+    @Override
+    public String kind() {
+        return "source";
+    }
+    @Override
+    public String domain() {
+        return "google";
+    }
     @Override
     public String dataset() {
         return "events";
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceTwilioEvents.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceTwilioEvents.java
index 2384b7ad43..29d097f52e 100644
--- a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceTwilioEvents.java
+++ b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceTwilioEvents.java
@@ -1,8 +1,16 @@
 package co.airy.kafka.schema.source;
 
-import co.airy.kafka.schema.SourceTwilio;
+import co.airy.kafka.schema.AbstractTopic;
 
-public class SourceTwilioEvents extends SourceTwilio {
+public class SourceTwilioEvents extends AbstractTopic {
+    @Override
+    public String kind() {
+        return "source";
+    }
+    @Override
+    public String domain() {
+        return "twilio";
+    }
     @Override
     public String dataset() {
         return "events";
diff --git a/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceViberEvents.java b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceViberEvents.java
new file mode 100644
index 0000000000..943e22d941
--- /dev/null
+++ b/lib/java/kafka/schema/src/main/java/co/airy/kafka/schema/source/SourceViberEvents.java
@@ -0,0 +1,18 @@
+package co.airy.kafka.schema.source;
+
+import co.airy.kafka.schema.AbstractTopic;
+
+public class SourceViberEvents extends AbstractTopic {
+    @Override
+    public String kind() {
+        return "source";
+    }
+    @Override
+    public String domain() {
+        return "viber";
+    }
+    @Override
+    public String dataset() {
+        return "events";
+    }
+}
diff --git a/lib/java/kafka/test/src/main/java/co/airy/kafka/test/KafkaTestHelper.java b/lib/java/kafka/test/src/main/java/co/airy/kafka/test/KafkaTestHelper.java
index 810d1c5b61..f80f4e099b 100644
--- a/lib/java/kafka/test/src/main/java/co/airy/kafka/test/KafkaTestHelper.java
+++ b/lib/java/kafka/test/src/main/java/co/airy/kafka/test/KafkaTestHelper.java
@@ -131,5 +131,4 @@ public <T, S> void produceRecords(List<ProducerRecord<T, S>> records) throws Exe
             produceRecord(record);
         }
     }
-
 }
diff --git a/lib/java/test/src/main/java/co/airy/test/Timing.java b/lib/java/test/src/main/java/co/airy/test/Timing.java
index fecd031300..1a8e415f46 100644
--- a/lib/java/test/src/main/java/co/airy/test/Timing.java
+++ b/lib/java/test/src/main/java/co/airy/test/Timing.java
@@ -5,14 +5,14 @@
 
 public class Timing {
     private static final Logger log = AiryLoggerFactory.getLogger(Timing.class);
-    private static final long MAX_WAIT_MS = 30_000;
+    private static final int DEFAULT_MAX_WAIT_MS = 30_000;
 
     public static void retryOnException(RunnableTest runnableTest, String failureMessage) throws InterruptedException {
-        retryOnExceptionWithTimeout(runnableTest, failureMessage);
+        retryOnException(runnableTest, failureMessage, DEFAULT_MAX_WAIT_MS);
     }
 
-    private static void retryOnExceptionWithTimeout(RunnableTest runnableTest, String failureMessage) throws InterruptedException {
-        long expectedEnd = System.currentTimeMillis() + MAX_WAIT_MS;
+    public static void retryOnException(RunnableTest runnableTest, String failureMessage, int maxWaitMs) throws InterruptedException {
+        long expectedEnd = System.currentTimeMillis() + maxWaitMs;
 
         while (true) {
             try {
@@ -28,4 +28,5 @@ private static void retryOnExceptionWithTimeout(RunnableTest runnableTest, Strin
             Thread.sleep(100);
         }
     }
-}
\ No newline at end of file
+
+}
diff --git a/lib/java/text/BUILD b/lib/java/text/BUILD
new file mode 100644
index 0000000000..bfb64c369d
--- /dev/null
+++ b/lib/java/text/BUILD
@@ -0,0 +1,10 @@
+load("@com_github_airyhq_bazel_tools//lint:buildifier.bzl", "check_pkg")
+load("//tools/build:java_library.bzl", "custom_java_library")
+
+custom_java_library(
+    name = "text",
+    srcs = glob(["src/main/java/co/airy/text/**/*.java"]),
+    visibility = ["//visibility:public"],
+)
+
+check_pkg(name = "buildifier")
diff --git a/lib/java/text/src/main/java/co/airy/text/format/TextFormat.java b/lib/java/text/src/main/java/co/airy/text/format/TextFormat.java
new file mode 100644
index 0000000000..8b1a5f3f53
--- /dev/null
+++ b/lib/java/text/src/main/java/co/airy/text/format/TextFormat.java
@@ -0,0 +1,20 @@
+package co.airy.text.format;
+
+public class TextFormat {
+    public static String capitalize(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+
+        char baseChar = str.charAt(0);
+        char updatedChar;
+        updatedChar = Character.toUpperCase(baseChar);
+        if (baseChar == updatedChar) {
+            return str;
+        }
+
+        char[] chars = str.toCharArray();
+        chars[0] = updatedChar;
+        return new String(chars, 0, chars.length);
+    }
+}
diff --git a/lib/typescript/assets/images/icons/viber.svg b/lib/typescript/assets/images/icons/viber.svg
new file mode 100644
index 0000000000..b776d0bd90
--- /dev/null
+++ b/lib/typescript/assets/images/icons/viber.svg
@@ -0,0 +1,32 @@
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+     y="0px"
+     viewBox="0 0 52.511 52.511" style="enable-background:new 0 0 52.511 52.511;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M31.256,0H21.254C10.778,0,2.255,8.521,2.255,18.995v9.01c0,7.8,4.793,14.81,12,17.665v5.841
+			c0,0.396,0.233,0.754,0.595,0.914c0.13,0.058,0.268,0.086,0.405,0.086c0.243,0,0.484-0.089,0.671-0.259L21.725,47h9.531
+			c10.476,0,18.999-8.521,18.999-18.995v-9.01C50.255,8.521,41.732,0,31.256,0z M48.255,28.005C48.255,37.376,40.63,45,31.256,45
+			h-9.917c-0.248,0-0.487,0.092-0.671,0.259l-4.413,3.997v-4.279c0-0.424-0.267-0.802-0.667-0.942
+			C8.81,41.638,4.255,35.196,4.255,28.005v-9.01C4.255,9.624,11.881,2,21.254,2h10.002c9.374,0,16.999,7.624,16.999,16.995V28.005z"
+        />
+        <path d="M39.471,30.493l-6.146-3.992c-0.672-0.437-1.472-0.585-2.255-0.423c-0.784,0.165-1.458,0.628-1.895,1.303l-0.289,0.444
+			c-2.66-0.879-5.593-2.002-7.349-7.085l0.727-0.632h0c1.248-1.085,1.379-2.983,0.294-4.233l-4.808-5.531
+			c-0.362-0.417-0.994-0.46-1.411-0.099l-3.019,2.624c-2.648,2.302-1.411,5.707-1.004,6.826c0.018,0.05,0.04,0.098,0.066,0.145
+			c0.105,0.188,2.612,4.662,6.661,8.786c4.065,4.141,11.404,7.965,11.629,8.076c0.838,0.544,1.781,0.805,2.714,0.805
+			c1.638,0,3.244-0.803,4.202-2.275l2.178-3.354C40.066,31.413,39.934,30.794,39.471,30.493z M35.91,34.142
+			c-0.901,1.388-2.763,1.782-4.233,0.834c-0.073-0.038-7.364-3.835-11.207-7.75c-3.592-3.659-5.977-7.724-6.302-8.291
+			c-0.792-2.221-0.652-3.586,0.464-4.556l2.265-1.968l4.152,4.776c0.369,0.424,0.326,1.044-0.096,1.411l-1.227,1.066
+			c-0.299,0.26-0.417,0.671-0.3,1.049c2.092,6.798,6.16,8.133,9.13,9.108l0.433,0.143c0.433,0.146,0.907-0.021,1.155-0.403
+			l0.709-1.092c0.146-0.226,0.37-0.379,0.63-0.434c0.261-0.056,0.527-0.004,0.753,0.143l5.308,3.447L35.91,34.142z"/>
+        <path d="M28.538,16.247c-0.532-0.153-1.085,0.156-1.236,0.688c-0.151,0.531,0.157,1.084,0.688,1.235
+			c1.49,0.424,2.677,1.613,3.097,3.104c0.124,0.44,0.525,0.729,0.962,0.729c0.09,0,0.181-0.012,0.272-0.037
+			c0.531-0.15,0.841-0.702,0.691-1.234C32.405,18.578,30.69,16.859,28.538,16.247z"/>
+        <path d="M36.148,22.219c0.09,0,0.181-0.012,0.272-0.037c0.532-0.15,0.841-0.703,0.691-1.234c-1.18-4.183-4.509-7.519-8.689-8.709
+			c-0.531-0.153-1.084,0.158-1.235,0.689c-0.151,0.531,0.157,1.084,0.688,1.235c3.517,1,6.318,3.809,7.311,7.328
+			C35.311,21.931,35.711,22.219,36.148,22.219z"/>
+        <path d="M27.991,7.582c-0.532-0.153-1.085,0.156-1.236,0.689c-0.151,0.531,0.157,1.084,0.688,1.235
+			c5.959,1.695,10.706,6.453,12.388,12.416c0.124,0.44,0.525,0.729,0.962,0.729c0.09,0,0.181-0.012,0.272-0.037
+			c0.531-0.15,0.841-0.703,0.691-1.234C39.887,14.753,34.613,9.467,27.991,7.582z"/>
+	</g>
+</g>
+</svg>
diff --git a/lib/typescript/render/SourceMessage.tsx b/lib/typescript/render/SourceMessage.tsx
index 6b356e2b4b..b2ab1173bd 100644
--- a/lib/typescript/render/SourceMessage.tsx
+++ b/lib/typescript/render/SourceMessage.tsx
@@ -23,7 +23,7 @@ export class SourceMessage extends React.Component<RenderPropsUnion, SourceMessa
   }
 
   errorFallback() {
-    return <Text fromContact={this.props.content.fromContact || false} text="Could not render this content" />;
+    return <Text fromContact={this.props.message.fromContact || false} text="Could not render this content" />;
   }
 
   render() {
diff --git a/lib/typescript/render/outbound/index.ts b/lib/typescript/render/outbound/index.ts
index df93b0f13c..944283e65f 100644
--- a/lib/typescript/render/outbound/index.ts
+++ b/lib/typescript/render/outbound/index.ts
@@ -2,6 +2,7 @@ import {FacebookMapper} from './facebook';
 import {ChatpluginMapper} from './chatplugin';
 import {GoogleMapper} from './google';
 import {TwilioMapper} from './twilio';
+import {ViberMapper} from './viber';
 
 export const getOutboundMapper = (source: string) => {
   switch (source) {
@@ -15,6 +16,8 @@ export const getOutboundMapper = (source: string) => {
     case 'twilio.sms':
     case 'twilio.whatsapp':
       return new TwilioMapper();
+    case 'viber':
+      return new ViberMapper();
     default: {
       console.error('Unknown source ', source);
     }
diff --git a/lib/typescript/render/outbound/viber.ts b/lib/typescript/render/outbound/viber.ts
new file mode 100644
index 0000000000..1187e60beb
--- /dev/null
+++ b/lib/typescript/render/outbound/viber.ts
@@ -0,0 +1,14 @@
+import {OutboundMapper} from './mapper';
+
+export class ViberMapper extends OutboundMapper {
+  getTextPayload(text: string): any {
+    return {
+      text: text,
+      type: 'text',
+    };
+  }
+
+  isTextSupported(): boolean {
+    return true;
+  }
+}
diff --git a/lib/typescript/render/props.ts b/lib/typescript/render/props.ts
index deb1482166..2802a92f6a 100644
--- a/lib/typescript/render/props.ts
+++ b/lib/typescript/render/props.ts
@@ -23,7 +23,10 @@ export type CommandUnion = SuggestedReplyCommand | QuickReplyCommand;
 
 interface RenderProps {
   contentType: 'message' | 'template' | 'suggestedReplies' | 'quickReplies';
-  content: Content;
+  message: {
+    content: Content;
+    fromContact?: boolean;
+  };
   source: string;
 }
 
diff --git a/lib/typescript/render/providers/chatplugin/ChatPluginRender.tsx b/lib/typescript/render/providers/chatplugin/ChatPluginRender.tsx
index fb8dfb31f9..7dbcc883cc 100644
--- a/lib/typescript/render/providers/chatplugin/ChatPluginRender.tsx
+++ b/lib/typescript/render/providers/chatplugin/ChatPluginRender.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import {RenderPropsUnion} from '../../props';
 import {AttachmentUnion, ContentUnion, SimpleAttachment} from './chatPluginModel';
-import {Message} from 'model';
 import {Text} from '../../components/Text';
 import {RichText} from './components/RichText';
 import {RichCard} from './components/RichCard';
@@ -10,12 +9,12 @@ import {RichCardCarousel} from './components/RichCardCarousel';
 import {QuickReplies} from './components/QuickReplies';
 
 export const ChatPluginRender = (props: RenderPropsUnion) => {
-  return render(mapContent(props.content), props);
+  return render(mapContent(props.message), props);
 };
 
 function render(content: ContentUnion, props: RenderPropsUnion) {
   const defaultProps = {
-    fromContact: props.content.fromContact || false,
+    fromContact: props.message.fromContact || false,
     commandCallback: 'commandCallback' in props ? props.commandCallback : null,
   };
   const invertedProps = {...defaultProps, fromContact: !defaultProps.fromContact};
@@ -30,7 +29,6 @@ function render(content: ContentUnion, props: RenderPropsUnion) {
       return (
         <RichText
           {...propsToUse}
-          message={props.content}
           text={content.text}
           fallback={content.fallback}
           containsRichText={content.containsRichtText}
@@ -60,7 +58,7 @@ function render(content: ContentUnion, props: RenderPropsUnion) {
   }
 }
 
-function mapContent(message: Message): ContentUnion {
+function mapContent(message): ContentUnion {
   const messageContent = message.content.message ?? message.content;
 
   if (messageContent.quick_replies) {
diff --git a/lib/typescript/render/providers/chatplugin/components/RichText/index.tsx b/lib/typescript/render/providers/chatplugin/components/RichText/index.tsx
index 5fc92c0c7e..2462516c8f 100644
--- a/lib/typescript/render/providers/chatplugin/components/RichText/index.tsx
+++ b/lib/typescript/render/providers/chatplugin/components/RichText/index.tsx
@@ -1,12 +1,9 @@
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
-import {Message} from 'model';
-
 import styles from './index.module.scss';
 
 type RichTextRenderProps = {
-  message: Message;
   text: string;
   fromContact: boolean;
   fallback: string;
@@ -14,9 +11,9 @@ type RichTextRenderProps = {
 };
 
 export const RichText = (props: RichTextRenderProps) => {
-  const {message, text, fromContact} = props;
+  const {text, fromContact} = props;
   return (
-    <div className={fromContact ? styles.contactContent : styles.memberContent} id={`message-item-${message.id}`}>
+    <div className={fromContact ? styles.contactContent : styles.memberContent}>
       <ReactMarkdown className={styles.richText} skipHtml={true} linkTarget={'_blank'}>
         {text}
       </ReactMarkdown>
diff --git a/lib/typescript/render/providers/facebook/FacebookRender.tsx b/lib/typescript/render/providers/facebook/FacebookRender.tsx
index 7238edbfae..530f349cb4 100644
--- a/lib/typescript/render/providers/facebook/FacebookRender.tsx
+++ b/lib/typescript/render/providers/facebook/FacebookRender.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import {Message} from 'model';
 import {RenderPropsUnion} from '../../props';
 import {Text} from '../../components/Text';
 import {Image} from '../../components/Image';
@@ -19,7 +18,7 @@ import {MediaTemplate} from './components/MediaTemplate';
 import {FallbackAttachment} from './components/FallbackAttachment';
 
 export const FacebookRender = (props: RenderPropsUnion) => {
-  const message: Message = props.content;
+  const message = props.message;
   const content = message.fromContact ? facebookInbound(message) : facebookOutbound(message);
   return render(content, props);
 };
@@ -27,60 +26,36 @@ export const FacebookRender = (props: RenderPropsUnion) => {
 function render(content: ContentUnion, props: RenderPropsUnion) {
   switch (content.type) {
     case 'text':
-      return <Text fromContact={props.content.fromContact || false} text={content.text} />;
+      return <Text fromContact={props.message.fromContact || false} text={content.text} />;
 
     case 'fallback':
-      return (
-        <>
-          <FallbackAttachment fromContact={props.content.fromContact || false} content={content} />
-        </>
-      );
+      return <FallbackAttachment fromContact={props.message.fromContact || false} content={content} />;
 
     case 'postback':
-      return <Text fromContact={props.content.fromContact || false} text={content.title ?? content.payload} />;
+      return <Text fromContact={props.message.fromContact || false} text={content.title ?? content.payload} />;
 
     case 'image':
-      return (
-        <>
-          <Image imageUrl={content.imageUrl} />
-        </>
-      );
+      return <Image imageUrl={content.imageUrl} />;
 
     case 'images':
-      return (
-        <>
-          <Image images={content.images} />
-        </>
-      );
+      return <Image images={content.images} />;
 
     case 'video':
-      return (
-        <>
-          <Video videoUrl={content.videoUrl} />
-        </>
-      );
+      return <Video videoUrl={content.videoUrl} />;
 
     case 'buttonTemplate':
       return <ButtonTemplate template={content} />;
 
     case 'genericTemplate':
-      return (
-        <>
-          <GenericTemplate template={content} />
-        </>
-      );
+      return <GenericTemplate template={content} />;
 
     case 'mediaTemplate':
-      return (
-        <>
-          <MediaTemplate template={content} />
-        </>
-      );
+      return <MediaTemplate template={content} />;
 
     case 'quickReplies':
       return (
         <QuickReplies
-          fromContact={props.content.fromContact || false}
+          fromContact={props.message.fromContact || false}
           text={content.text}
           attachment={content.attachment}
           quickReplies={content.quickReplies}
@@ -148,7 +123,7 @@ const parseAttachment = (
   };
 };
 
-function facebookInbound(message: Message): ContentUnion {
+function facebookInbound(message): ContentUnion {
   const messageJson = message.content.message ?? message.content;
 
   if (messageJson.attachment?.type === 'fallback' || messageJson.attachments?.[0].type === 'fallback') {
@@ -192,7 +167,7 @@ function facebookInbound(message: Message): ContentUnion {
   };
 }
 
-function facebookOutbound(message: Message): ContentUnion {
+function facebookOutbound(message): ContentUnion {
   const messageJson = message.content.message ?? message.content;
 
   if (messageJson.quick_replies) {
diff --git a/lib/typescript/render/providers/google/GoogleRender.tsx b/lib/typescript/render/providers/google/GoogleRender.tsx
index ce3b55579d..c7a90d2004 100644
--- a/lib/typescript/render/providers/google/GoogleRender.tsx
+++ b/lib/typescript/render/providers/google/GoogleRender.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 
 import {RenderPropsUnion} from '../../props';
 import {ContentUnion} from './googleModel';
-import {Message} from 'model';
 
 import {Text} from '../../components/Text';
 import {Image} from '../../components/Image';
@@ -12,7 +11,7 @@ import {RichCardCarousel} from './components/RichCardCarousel';
 import {RequestedLiveAgent} from './components/RequestedLiveAgent';
 
 export const GoogleRender = (props: RenderPropsUnion) => {
-  const message: Message = props.content;
+  const message = props.message;
   const content = message.fromContact ? googleInbound(message) : googleOutbound(message);
   return render(content, props);
 };
@@ -20,7 +19,7 @@ export const GoogleRender = (props: RenderPropsUnion) => {
 function render(content: ContentUnion, props: RenderPropsUnion) {
   switch (content.type) {
     case 'text':
-      return <Text fromContact={props.content.fromContact || false} text={content.text} />;
+      return <Text fromContact={props.message.fromContact || false} text={content.text} />;
 
     case 'requestedLiveAgent':
       return <RequestedLiveAgent />;
@@ -31,7 +30,7 @@ function render(content: ContentUnion, props: RenderPropsUnion) {
     case 'suggestions':
       return (
         <Suggestions
-          fromContact={props.content.fromContact || false}
+          fromContact={props.message.fromContact || false}
           text={content.text}
           image={content.image}
           fallback={content.fallback}
@@ -54,7 +53,7 @@ function render(content: ContentUnion, props: RenderPropsUnion) {
   }
 }
 
-function googleInbound(message: Message): ContentUnion {
+function googleInbound(message): ContentUnion {
   const messageJson = message.content.message ?? message.content;
 
   if (messageJson.richCard?.standaloneCard) {
@@ -135,7 +134,7 @@ function googleInbound(message: Message): ContentUnion {
   };
 }
 
-function googleOutbound(message: Message): ContentUnion {
+function googleOutbound(message): ContentUnion {
   const messageJson = message.content.message ?? message.content;
   const maxNumberOfSuggestions = 13;
 
diff --git a/lib/typescript/render/providers/google/components/RichText/index.tsx b/lib/typescript/render/providers/google/components/RichText/index.tsx
index 496106943c..79db27b31e 100644
--- a/lib/typescript/render/providers/google/components/RichText/index.tsx
+++ b/lib/typescript/render/providers/google/components/RichText/index.tsx
@@ -1,12 +1,9 @@
 import React from 'react';
 import ReactMarkdown from 'react-markdown';
 
-import {Message} from 'model';
-
 import styles from './index.module.scss';
 
 type RichTextRenderProps = {
-  message: Message;
   text: string;
   fromContact?: boolean;
   fallback: string;
@@ -14,9 +11,9 @@ type RichTextRenderProps = {
 };
 
 export const RichText = (props: RichTextRenderProps) => {
-  const {message, text, fromContact} = props;
+  const {text, fromContact} = props;
   return (
-    <div className={fromContact ? styles.contactContent : styles.memberContent} id={`message-item-${message.id}`}>
+    <div className={fromContact ? styles.contactContent : styles.memberContent}>
       <ReactMarkdown className={styles.richText} skipHtml={true} linkTarget={'_blank'}>
         {text}
       </ReactMarkdown>
diff --git a/lib/typescript/render/providers/twilio/TwilioRender.tsx b/lib/typescript/render/providers/twilio/TwilioRender.tsx
index e49bb0fd3f..ed536002dc 100644
--- a/lib/typescript/render/providers/twilio/TwilioRender.tsx
+++ b/lib/typescript/render/providers/twilio/TwilioRender.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
-import {Message} from 'model';
 import {Text} from '../../components/Text';
 import {RenderPropsUnion} from '../../props';
 import {ContentUnion} from './twilioModel';
 
 export const TwilioRender = (props: RenderPropsUnion) => {
-  const message: Message = props.content;
+  const message = props.message;
   const content = message.fromContact ? inboundContent(message) : outboundContent(message);
   return render(content, props);
 };
@@ -13,11 +12,11 @@ export const TwilioRender = (props: RenderPropsUnion) => {
 function render(content: ContentUnion, props: RenderPropsUnion) {
   switch (content.type) {
     case 'text':
-      return <Text fromContact={props.content.fromContact || false} text={content.text} />;
+      return <Text fromContact={props.message.fromContact || false} text={content.text} />;
   }
 }
 
-const inboundContent = (message: Message): ContentUnion => {
+const inboundContent = (message): ContentUnion => {
   const messageContent = message.content;
   const startText = messageContent.search('&Body=');
   const endText = messageContent.search('&FromCountry=');
@@ -32,7 +31,7 @@ const inboundContent = (message: Message): ContentUnion => {
   };
 };
 
-const outboundContent = (message: Message): ContentUnion => {
+const outboundContent = (message): ContentUnion => {
   const messageContent = message.content.message ?? message.content;
   return {
     type: 'text',
diff --git a/lib/typescript/render/providers/viber/ViberRender.tsx b/lib/typescript/render/providers/viber/ViberRender.tsx
new file mode 100644
index 0000000000..513f47485b
--- /dev/null
+++ b/lib/typescript/render/providers/viber/ViberRender.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import {Text} from '../../components/Text';
+import {RenderPropsUnion} from '../../props';
+import {ContentUnion} from './viberModel';
+import {Image} from '../../components/Image';
+import {Video} from '../../components/Video';
+
+export const ViberRender = (props: RenderPropsUnion) => {
+  const message = props.message;
+  const content = message.fromContact ? inboundContent(message) : outboundContent(message);
+  return render(content, props);
+};
+
+function render(content: ContentUnion, props: RenderPropsUnion) {
+  switch (content.type) {
+    case 'text':
+      return <Text fromContact={props.message.fromContact || false} text={content.text} />;
+    case 'picture':
+      return (
+        <div>
+          <Image imageUrl={content.media} altText={content.text} />
+          <Text fromContact={props.message.fromContact || false} text={content.text} />
+        </div>
+      );
+    case 'contact':
+      return (
+        <Text
+          fromContact={props.message.fromContact || false}
+          text={`Shared this contact with you: ${content.contact.name} (${content.contact.phone_number})`}
+        />
+      );
+    case 'video':
+      return <Video videoUrl={content.media} />;
+  }
+
+  return null;
+}
+
+// Viber already uses a type identifier so we only need to cast to our interface
+const inboundContent = (message): ContentUnion => message.content?.message;
+
+const outboundContent = (message): ContentUnion => message.content;
diff --git a/lib/typescript/render/providers/viber/viberModel.ts b/lib/typescript/render/providers/viber/viberModel.ts
new file mode 100644
index 0000000000..4e594c175c
--- /dev/null
+++ b/lib/typescript/render/providers/viber/viberModel.ts
@@ -0,0 +1,34 @@
+export interface Content {
+  type: 'text' | 'picture' | 'video' | 'contact';
+}
+
+export interface TextContent extends Content {
+  type: 'text';
+  text: string;
+}
+
+export interface PictureContent extends Content {
+  type: 'picture';
+  text: string;
+  media: string;
+  thumbnail?: string;
+}
+
+export interface VideoContent extends Content {
+  type: 'video';
+  text: string;
+  media: string;
+  thumbnail?: string;
+  size: number;
+  duration: 10;
+}
+
+export interface ContactContent extends Content {
+  type: 'contact';
+  contact: {
+    name: string;
+    phone_number: string;
+  };
+}
+
+export type ContentUnion = TextContent | PictureContent | VideoContent | ContactContent;
diff --git a/lib/typescript/render/renderProviders.ts b/lib/typescript/render/renderProviders.ts
index 739ae3f7a6..0dbefa7f0e 100644
--- a/lib/typescript/render/renderProviders.ts
+++ b/lib/typescript/render/renderProviders.ts
@@ -2,6 +2,7 @@ import {FacebookRender} from './providers/facebook/FacebookRender';
 import {ChatPluginRender} from './providers/chatplugin/ChatPluginRender';
 import {GoogleRender} from './providers/google/GoogleRender';
 import {TwilioRender} from './providers/twilio/TwilioRender';
+import {ViberRender} from './providers/viber/ViberRender';
 import {RenderPropsUnion} from './props';
 
 type Provider = (messageRenderProps: RenderPropsUnion) => JSX.Element;
@@ -13,4 +14,5 @@ export const renderProviders: {[key: string]: Provider} = {
   'twilio.sms': TwilioRender,
   'twilio.whatsapp': TwilioRender,
   google: GoogleRender,
+  viber: ViberRender,
 };
diff --git a/lib/typescript/websocketclient/index.ts b/lib/typescript/websocketclient/index.ts
index b40da9ff51..3a15188ca2 100644
--- a/lib/typescript/websocketclient/index.ts
+++ b/lib/typescript/websocketclient/index.ts
@@ -37,26 +37,24 @@ export class WebSocketClient {
     this.stompWrapper.initConnection();
   }
 
-  destroyConnection = () => {
-    this.stompWrapper.destroyConnection();
-  };
+  destroyConnection = () => this.stompWrapper.destroyConnection();
 
   onEvent = (body: string) => {
     const json = JSON.parse(body) as EventPayload;
     switch (json.type) {
-      case 'channel':
+      case 'channel.updated':
         this.callbackMap.onChannel?.(camelcaseKeys(json.payload, {deep: true, stopPaths: ['metadata.user_data']}));
         break;
-      case 'message':
+      case 'message.created':
         this.callbackMap.onMessage?.(json.payload.conversation_id, json.payload.channel_id, {
           ...camelcaseKeys(json.payload.message, {deep: true, stopPaths: ['content']}),
           sentAt: new Date(json.payload.message.sent_at),
         });
         break;
-      case 'metadata':
+      case 'metadata.updated':
         this.callbackMap.onMetadata?.(json.payload);
         break;
-      case 'tag':
+      case 'tag.updated':
         this.callbackMap.onTag?.(json.payload);
         break;
       default:
@@ -64,7 +62,5 @@ export class WebSocketClient {
     }
   };
 
-  onError = () => {
-    this.callbackMap.onError && this.callbackMap.onError();
-  };
+  onError = () => this.callbackMap.onError && this.callbackMap.onError();
 }
diff --git a/lib/typescript/websocketclient/payload.ts b/lib/typescript/websocketclient/payload.ts
index e02c44e46c..bcda043094 100644
--- a/lib/typescript/websocketclient/payload.ts
+++ b/lib/typescript/websocketclient/payload.ts
@@ -1,11 +1,11 @@
 import {DeliveryState, Metadata, MetadataEvent, Tag} from 'model';
 
 interface Event {
-  type: 'message' | 'channel' | 'metadata' | 'tag';
+  type: 'message.created' | 'channel.updated' | 'metadata.updated' | 'tag.updated';
 }
 
-export interface MessageEventPayload extends Event {
-  type: 'message';
+export interface MessageCreatedPayload extends Event {
+  type: 'message.created';
   payload: {
     conversation_id: string;
     channel_id: string;
@@ -19,8 +19,8 @@ export interface MessageEventPayload extends Event {
   };
 }
 
-export interface ChannelEventPayload extends Event {
-  type: 'channel';
+export interface ChannelUpdatedPayload extends Event {
+  type: 'channel.updated';
   payload: {
     id: string;
     metadata?: Metadata & {
@@ -33,14 +33,14 @@ export interface ChannelEventPayload extends Event {
   };
 }
 
-export interface MetadataEventPayload extends Event {
-  type: 'metadata';
+export interface MetadataUpdatedPayload extends Event {
+  type: 'metadata.updated';
   payload: MetadataEvent;
 }
 
-export interface TagEventPayload extends Event {
-  type: 'tag';
+export interface TagUpdatedPayload extends Event {
+  type: 'tag.updated';
   payload: Tag;
 }
 
-export type EventPayload = MessageEventPayload | ChannelEventPayload | MetadataEventPayload | TagEventPayload;
+export type EventPayload = MessageCreatedPayload | ChannelUpdatedPayload | MetadataUpdatedPayload | TagUpdatedPayload;
diff --git a/maven_install.json b/maven_install.json
index 7e25d5c8a5..4d98a022bb 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,6 +1,6 @@
 {
     "dependency_tree": {
-        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -907779890,
+        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -2028044817,
         "conflict_resolution": {
             "com.fasterxml.jackson.core:jackson-annotations:2.10.0": "com.fasterxml.jackson.core:jackson-annotations:2.11.4",
             "com.fasterxml.jackson.core:jackson-core:2.10.0": "com.fasterxml.jackson.core:jackson-core:2.11.4",
@@ -1412,20 +1412,48 @@
                 "sha256": "3c8d29393129090b9f46a7f6852a70ff1e9d7bd581343e3d0fb895ad33c524fa",
                 "url": "https://repo1.maven.org/maven2/com/puppycrawl/tools/checkstyle/8.37/checkstyle-8.37.jar"
             },
+            {
+                "coord": "com.squareup.okhttp3:okhttp:3.5.0",
+                "dependencies": [
+                    "org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21",
+                    "org.jetbrains:annotations:13.0",
+                    "com.squareup.okio:okio:2.8.0",
+                    "org.jetbrains.kotlin:kotlin-stdlib:1.4.21"
+                ],
+                "directDependencies": [
+                    "com.squareup.okio:okio:2.8.0"
+                ],
+                "exclusions": [
+                    "ch.qos.logback:logback-classic",
+                    "org.springframework.boot:spring-boot-starter-tomcat",
+                    "org.springframework.boot:spring-boot-starter-logging",
+                    "org.slf4j:slf4j-log4j12"
+                ],
+                "file": "v1/https/repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.5.0/okhttp-3.5.0.jar",
+                "mirror_urls": [
+                    "https://packages.confluent.io/maven/com/squareup/okhttp3/okhttp/3.5.0/okhttp-3.5.0.jar",
+                    "https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.5.0/okhttp-3.5.0.jar",
+                    "https://jitpack.io/com/squareup/okhttp3/okhttp/3.5.0/okhttp-3.5.0.jar"
+                ],
+                "sha256": "eecd834b09d12c3cd568b811522b97012619f7f00378c3c719a1957fac6458ef",
+                "url": "https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/3.5.0/okhttp-3.5.0.jar"
+            },
             {
                 "coord": "com.squareup.okio:okio:2.8.0",
                 "dependencies": [
-                    "org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21"
+                    "org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21",
+                    "org.jetbrains:annotations:13.0",
+                    "org.jetbrains.kotlin:kotlin-stdlib:1.4.21"
                 ],
                 "directDependencies": [
+                    "org.jetbrains.kotlin:kotlin-stdlib:1.4.21",
                     "org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21"
                 ],
                 "exclusions": [
-                    "org.slf4j:slf4j-log4j12",
-                    "org.jetbrains.kotlin:kotlin-stdlib",
-                    "org.springframework.boot:spring-boot-starter-tomcat",
                     "ch.qos.logback:logback-classic",
-                    "org.springframework.boot:spring-boot-starter-logging"
+                    "org.springframework.boot:spring-boot-starter-tomcat",
+                    "org.springframework.boot:spring-boot-starter-logging",
+                    "org.slf4j:slf4j-log4j12"
                 ],
                 "file": "v1/https/repo1.maven.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.jar",
                 "mirror_urls": [
@@ -1673,6 +1701,48 @@
                 "sha256": "dfb7bae2f404cfe0b72b4d23944698cb716b7665171812a0a4d0f5926c0fac79",
                 "url": "https://repo1.maven.org/maven2/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar"
             },
+            {
+                "coord": "com.viber:viber-bot:1.0.11",
+                "dependencies": [
+                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
+                    "com.squareup.okhttp3:okhttp:3.5.0",
+                    "com.google.j2objc:j2objc-annotations:1.3",
+                    "com.fasterxml.jackson.core:jackson-core:2.11.4",
+                    "com.fasterxml.jackson.core:jackson-annotations:2.11.4",
+                    "com.google.code.findbugs:jsr305:3.0.2",
+                    "org.slf4j:slf4j-api:1.7.30",
+                    "org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21",
+                    "com.squareup.okio:okio:2.8.0",
+                    "com.fasterxml.jackson.core:jackson-databind:2.11.4",
+                    "com.google.errorprone:error_prone_annotations:2.3.4",
+                    "com.google.guava:failureaccess:1.0.1",
+                    "com.google.guava:guava:29.0-jre",
+                    "org.jetbrains.kotlin:kotlin-stdlib:1.4.21",
+                    "org.jetbrains:annotations:13.0",
+                    "org.checkerframework:checker-qual:2.11.1"
+                ],
+                "directDependencies": [
+                    "com.squareup.okhttp3:okhttp:3.5.0",
+                    "com.google.code.findbugs:jsr305:3.0.2",
+                    "org.slf4j:slf4j-api:1.7.30",
+                    "com.fasterxml.jackson.core:jackson-databind:2.11.4",
+                    "com.google.guava:guava:29.0-jre"
+                ],
+                "exclusions": [
+                    "ch.qos.logback:logback-classic",
+                    "org.springframework.boot:spring-boot-starter-tomcat",
+                    "org.springframework.boot:spring-boot-starter-logging",
+                    "org.slf4j:slf4j-log4j12"
+                ],
+                "file": "v1/https/repo1.maven.org/maven2/com/viber/viber-bot/1.0.11/viber-bot-1.0.11.jar",
+                "mirror_urls": [
+                    "https://packages.confluent.io/maven/com/viber/viber-bot/1.0.11/viber-bot-1.0.11.jar",
+                    "https://repo1.maven.org/maven2/com/viber/viber-bot/1.0.11/viber-bot-1.0.11.jar",
+                    "https://jitpack.io/com/viber/viber-bot/1.0.11/viber-bot-1.0.11.jar"
+                ],
+                "sha256": "691679c6e85aaaecada4a6e6bd702779c8a572b3c010f6ff2b9c71e91fbe9962",
+                "url": "https://repo1.maven.org/maven2/com/viber/viber-bot/1.0.11/viber-bot-1.0.11.jar"
+            },
             {
                 "coord": "com.yammer.metrics:metrics-core:2.2.0",
                 "dependencies": [
diff --git a/package.json b/package.json
index ebbafc3ea3..f4710584d1 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,13 @@
     "@crello/react-lottie": "^0.0.11",
     "@reduxjs/toolkit": "^1.6.1",
     "@stomp/stompjs": "^6.1.0",
-    "@types/node": "16.4.10",
-    "@types/react": "17.0.15",
+    "@types/node": "16.7.1",
+    "@types/react": "17.0.19",
     "@types/react-dom": "17.0.9",
     "@types/react-redux": "7.1.18",
     "@types/react-router-dom": "^5.1.8",
     "camelcase-keys": "^7.0.0",
-    "core-js": "3.16.0",
+    "core-js": "3.16.2",
     "emoji-mart": "3.0.1",
     "linkifyjs": "^2.1.9",
     "lodash-es": "^4.17.21",
@@ -21,7 +21,7 @@
     "react-autosize-textarea": "^7.1.0",
     "react-color": "^2.19.3",
     "react-dom": "16.14.0",
-    "react-markdown": "^6.0.3",
+    "react-markdown": "^7.0.0",
     "react-modal": "^3.14.3",
     "react-redux": "7.2.4",
     "react-router-dom": "5.2.0",
@@ -31,24 +31,24 @@
     "typesafe-actions": "^5.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.14.8",
+    "@babel/core": "7.15.0",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
     "@babel/plugin-transform-spread": "^7.14.6",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.14.5",
+    "@babel/preset-typescript": "^7.15.0",
     "@bazel/typescript": "^3.6.0",
     "@svgr/webpack": "^5.5.0",
     "@types/lodash-es": "^4.17.4",
     "@types/react-window-infinite-loader": "^1.0.4",
     "@types/resize-observer-browser": "^0.1.6",
     "@typescript-eslint/eslint-plugin": "^4.29.1",
-    "@typescript-eslint/parser": "^4.29.0",
+    "@typescript-eslint/parser": "^4.29.2",
     "babel-loader": "^8.0.6",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^6.2.0",
-    "cypress": "^8.1.0",
+    "cypress": "^8.3.0",
     "eslint": "^7.32.0",
     "eslint-plugin-react": "^7.24.0",
     "file-loader": "^6.2.0",
@@ -56,15 +56,15 @@
     "minimist": "^1.2.5",
     "prettier": "^2.3.2",
     "react-hot-loader": "^4.13.0",
-    "sass": "^1.37.0",
+    "sass": "^1.38.0",
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "4.2.4",
     "url-loader": "^4.1.1",
-    "webpack": "5.49.0",
+    "webpack": "5.51.1",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.7.2",
+    "webpack-cli": "^4.8.0",
     "webpack-dev-server": "^3.11.2"
   }
 }
diff --git a/repositories.bzl b/repositories.bzl
index 29a9441bda..1a7cb00cc0 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -10,6 +10,7 @@ airy_jvm_deps = [
     "com.jayway.jsonpath:json-path:2.4.0",
     "com.dinstone:beanstalkc:2.3.0",
     "com.twilio.sdk:twilio:7.51.0",
+    "com.viber:viber-bot:1.0.11",
     "io.confluent:kafka-avro-serializer:6.1.1",
     "io.confluent:kafka-schema-registry-client:6.1.1",
     "io.confluent:kafka-schema-registry:6.1.1",
diff --git a/yarn.lock b/yarn.lock
index 5a9a72148c..3c9d53b78a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21,20 +21,20 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
   integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
 
-"@babel/core@7.14.8", "@babel/core@^7.12.3":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
-  integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+"@babel/core@7.15.0", "@babel/core@^7.12.3":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8"
+  integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==
   dependencies:
     "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.14.8"
-    "@babel/helper-compilation-targets" "^7.14.5"
-    "@babel/helper-module-transforms" "^7.14.8"
+    "@babel/generator" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.0"
+    "@babel/helper-module-transforms" "^7.15.0"
     "@babel/helpers" "^7.14.8"
-    "@babel/parser" "^7.14.8"
+    "@babel/parser" "^7.15.0"
     "@babel/template" "^7.14.5"
-    "@babel/traverse" "^7.14.8"
-    "@babel/types" "^7.14.8"
+    "@babel/traverse" "^7.15.0"
+    "@babel/types" "^7.15.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -42,15 +42,6 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070"
-  integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==
-  dependencies:
-    "@babel/types" "^7.14.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15"
@@ -97,16 +88,16 @@
     "@babel/helper-replace-supers" "^7.14.5"
     "@babel/helper-split-export-declaration" "^7.14.5"
 
-"@babel/helper-create-class-features-plugin@^7.14.6":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542"
-  integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==
+"@babel/helper-create-class-features-plugin@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"
+  integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.14.5"
     "@babel/helper-function-name" "^7.14.5"
-    "@babel/helper-member-expression-to-functions" "^7.14.5"
+    "@babel/helper-member-expression-to-functions" "^7.15.0"
     "@babel/helper-optimise-call-expression" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.15.0"
     "@babel/helper-split-export-declaration" "^7.14.5"
 
 "@babel/helper-create-regexp-features-plugin@^7.14.5":
@@ -189,21 +180,7 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
-  integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.14.5"
-    "@babel/helper-simple-access" "^7.14.8"
-    "@babel/helper-split-export-declaration" "^7.14.5"
-    "@babel/helper-validator-identifier" "^7.14.8"
-    "@babel/template" "^7.14.5"
-    "@babel/traverse" "^7.14.8"
-    "@babel/types" "^7.14.8"
-
-"@babel/helper-module-transforms@^7.15.0":
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08"
   integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==
@@ -289,11 +266,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
   integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
 
-"@babel/helper-validator-identifier@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
-  integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
-
 "@babel/helper-validator-identifier@^7.14.9":
   version "7.14.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48"
@@ -341,12 +313,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.14.5", "@babel/parser@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4"
-  integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==
-
-"@babel/parser@^7.15.0":
+"@babel/parser@^7.14.5", "@babel/parser@^7.15.0":
   version "7.15.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.2.tgz#08d4ffcf90d211bf77e7cc7154c6f02d468d2b1d"
   integrity sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==
@@ -873,12 +840,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typescript@^7.14.5":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c"
-  integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==
+"@babel/plugin-transform-typescript@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz#553f230b9d5385018716586fc48db10dd228eb7e"
+  integrity sha512-WIIEazmngMEEHDaPTx0IZY48SaAmjVWe3TRSX7cmJXn0bEv9midFzAjxiruOWYIVf5iQ10vFx7ASDpgEO08L5w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.6"
+    "@babel/helper-create-class-features-plugin" "^7.15.0"
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-typescript" "^7.14.5"
 
@@ -999,14 +966,14 @@
     "@babel/plugin-transform-react-jsx-development" "^7.14.5"
     "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
 
-"@babel/preset-typescript@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz#aa98de119cf9852b79511f19e7f44a2d379bcce0"
-  integrity sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==
+"@babel/preset-typescript@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
+  integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-transform-typescript" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.15.0"
 
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.13.17"
@@ -1024,22 +991,7 @@
     "@babel/parser" "^7.14.5"
     "@babel/types" "^7.14.5"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"
-  integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.14.8"
-    "@babel/helper-function-name" "^7.14.5"
-    "@babel/helper-hoist-variables" "^7.14.5"
-    "@babel/helper-split-export-declaration" "^7.14.5"
-    "@babel/parser" "^7.14.8"
-    "@babel/types" "^7.14.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.15.0":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8", "@babel/traverse@^7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98"
   integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==
@@ -1349,6 +1301,13 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@types/debug@^4.0.0":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/eslint-scope@^3.7.0":
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
@@ -1437,15 +1396,25 @@
   dependencies:
     "@types/unist" "*"
 
+"@types/mdurl@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
 "@types/minimatch@*":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
   integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
 
-"@types/node@*", "@types/node@16.4.10":
-  version "16.4.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.10.tgz#e57e2a54fc6da58da94b3571b1cb456d39f88597"
-  integrity sha512-TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ==
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
+"@types/node@*", "@types/node@16.7.1":
+  version "16.7.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0"
+  integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==
 
 "@types/node@^10.1.0":
   version "10.17.55"
@@ -1521,10 +1490,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.15":
-  version "17.0.15"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.15.tgz#c7533dc38025677e312606502df7656a6ea626d0"
-  integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw==
+"@types/react@*", "@types/react@17.0.19":
+  version "17.0.19"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991"
+  integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -1550,7 +1519,7 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
+"@types/unist@*", "@types/unist@^2.0.0":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
@@ -1587,24 +1556,16 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.29.0":
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.0.tgz#e5367ca3c63636bb5d8e0748fcbab7a4f4a04289"
-  integrity sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==
+"@typescript-eslint/parser@^4.29.2":
+  version "4.29.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.2.tgz#1c7744f4c27aeb74610c955d3dce9250e95c370a"
+  integrity sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.29.0"
-    "@typescript-eslint/types" "4.29.0"
-    "@typescript-eslint/typescript-estree" "4.29.0"
+    "@typescript-eslint/scope-manager" "4.29.2"
+    "@typescript-eslint/types" "4.29.2"
+    "@typescript-eslint/typescript-estree" "4.29.2"
     debug "^4.3.1"
 
-"@typescript-eslint/scope-manager@4.29.0":
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz#cf5474f87321bedf416ef65839b693bddd838599"
-  integrity sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==
-  dependencies:
-    "@typescript-eslint/types" "4.29.0"
-    "@typescript-eslint/visitor-keys" "4.29.0"
-
 "@typescript-eslint/scope-manager@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.1.tgz#f25da25bc6512812efa2ce5ebd36619d68e61358"
@@ -1613,28 +1574,23 @@
     "@typescript-eslint/types" "4.29.1"
     "@typescript-eslint/visitor-keys" "4.29.1"
 
-"@typescript-eslint/types@4.29.0":
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.0.tgz#c8f1a1e4441ea4aca9b3109241adbc145f7f8a4e"
-  integrity sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==
+"@typescript-eslint/scope-manager@4.29.2":
+  version "4.29.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz#442b0f029d981fa402942715b1718ac7fcd5aa1b"
+  integrity sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==
+  dependencies:
+    "@typescript-eslint/types" "4.29.2"
+    "@typescript-eslint/visitor-keys" "4.29.2"
 
 "@typescript-eslint/types@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.1.tgz#94cce6cf7cc83451df03339cda99d326be2feaf5"
   integrity sha512-Jj2yu78IRfw4nlaLtKjVaGaxh/6FhofmQ/j8v3NXmAiKafbIqtAPnKYrf0sbGjKdj0hS316J8WhnGnErbJ4RCA==
 
-"@typescript-eslint/typescript-estree@4.29.0":
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz#af7ab547757b86c91bfdbc54ff86845410856256"
-  integrity sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==
-  dependencies:
-    "@typescript-eslint/types" "4.29.0"
-    "@typescript-eslint/visitor-keys" "4.29.0"
-    debug "^4.3.1"
-    globby "^11.0.3"
-    is-glob "^4.0.1"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@4.29.2":
+  version "4.29.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd"
+  integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==
 
 "@typescript-eslint/typescript-estree@4.29.1":
   version "4.29.1"
@@ -1649,13 +1605,18 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.29.0":
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz#1ff60f240def4d85ea68d4fd2e4e9759b7850c04"
-  integrity sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==
+"@typescript-eslint/typescript-estree@4.29.2":
+  version "4.29.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219"
+  integrity sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==
   dependencies:
-    "@typescript-eslint/types" "4.29.0"
-    eslint-visitor-keys "^2.0.0"
+    "@typescript-eslint/types" "4.29.2"
+    "@typescript-eslint/visitor-keys" "4.29.2"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
 "@typescript-eslint/visitor-keys@4.29.1":
   version "4.29.1"
@@ -1665,6 +1626,14 @@
     "@typescript-eslint/types" "4.29.1"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.29.2":
+  version "4.29.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df"
+  integrity sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==
+  dependencies:
+    "@typescript-eslint/types" "4.29.2"
+    eslint-visitor-keys "^2.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -1798,10 +1767,10 @@
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278"
-  integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==
+"@webpack-cli/serve@^1.5.2":
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec"
+  integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2146,10 +2115,10 @@ babel-plugin-polyfill-regenerator@^0.2.2:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
 
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
-  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
+bail@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.1.tgz#d676736373a374058a935aec81b94c12ba815771"
+  integrity sha512-d5FoTAr2S5DSUPKl85WNm2yUwsINN8eidIdIwsOge2t33DaOfOdSmmsI11jMN3GmALCXaw+Y6HMVHDzePshFAA==
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -2401,20 +2370,20 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-character-entities-legacy@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
-  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
+character-entities-legacy@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-2.0.0.tgz#57f4d00974c696e8f74e9f493e7fcb75b44d7ee7"
+  integrity sha512-YwaEtEvWLpFa6Wh3uVLrvirA/ahr9fki/NUd/Bd4OR6EdJ8D22hovYQEOUCBfQfcqnC4IAMGMsHXY1eXgL4ZZA==
 
-character-entities@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
-  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
+character-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.0.tgz#508355fcc8c73893e0909efc1a44d28da2b6fdf3"
+  integrity sha512-oHqMj3eAuJ77/P5PaIRcqk+C3hdfNwyCD2DAUcD5gyXkegAuF2USC40CEqPscDk4I8FRGMTojGJQkXDsN5QlJA==
 
-character-reference-invalid@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
-  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
+character-reference-invalid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.0.tgz#a0bdeb89c051fe7ed5d3158b2f06af06984f2813"
+  integrity sha512-pE3Z15lLRxDzWJy7bBHBopRwfI20sbrMVLQTC7xsPglCHf4Wv1e167OgYAFP78co2XlhojDyAqA+IAJse27//g==
 
 check-more-types@^2.24.0:
   version "2.24.0"
@@ -2590,10 +2559,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-comma-separated-tokens@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
-  integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
+comma-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98"
+  integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -2725,10 +2694,10 @@ core-js-compat@^3.16.0, core-js-compat@^3.9.1:
     browserslist "^4.16.6"
     semver "7.0.0"
 
-core-js@3.16.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986"
-  integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==
+core-js@3.16.2:
+  version "3.16.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
+  integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2849,10 +2818,10 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b"
   integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==
 
-cypress@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.1.0.tgz#9aaed7fb2a4d1876528b72d437f97bc824db0735"
-  integrity sha512-GXjlqPjY/6HPbQwAp3AvlA1Mk/NoJTAmqVSUhQsuM/1xDpd/FQHkxVuq5h6O6RrAoCXSgpZPXFsVtdqE+FwEJw==
+cypress@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.0.tgz#ba906d2170888073ad94b2be1b994a749bbb7c7d"
+  integrity sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q==
   dependencies:
     "@cypress/request" "^2.88.5"
     "@cypress/xvfb" "^1.2.4"
@@ -4406,18 +4375,18 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-alphabetical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
-  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
+is-alphabetical@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.0.tgz#ef6e2caea57c63450fffc7abb6cbdafc5eb96e96"
+  integrity sha512-5OV8Toyq3oh4eq6sbWTYzlGdnMT/DPI5I0zxUBxjiigQsZycpkKF3kskkao3JyYGuYDHvhgJF+DrjMQp9SX86w==
 
-is-alphanumerical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
-  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
+is-alphanumerical@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.0.tgz#0fbfeb6a72d21d91143b3d182bf6cf5909ee66f6"
+  integrity sha512-t+2GlJ+hO9yagJ+jU3+HSh80VKvz/3cG2cxbGGm4S0hjKuhWQXgPVUVOZz3tqZzMjhmphZ+1TIJTlRZRoe6GCQ==
   dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
+    is-alphabetical "^2.0.0"
+    is-decimal "^2.0.0"
 
 is-arguments@^1.0.4:
   version "1.1.0"
@@ -4505,10 +4474,10 @@ is-date-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
-is-decimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
-  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+is-decimal@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.0.tgz#db1140337809fd043a056ae40a9bd1cdc563034c"
+  integrity sha512-QfrfjQV0LjoWQ1K1XSoEZkTAzSa14RKVMa5zg3SdAfzEmQzRM4+tbSFWb78creCeA9rNBzaZal92opi1TwPWZw==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -4569,10 +4538,10 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-hexadecimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
-  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+is-hexadecimal@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.0.tgz#8e1ec9f48fe3eabd90161109856a23e0907a65d5"
+  integrity sha512-vGOtYkiaxwIiR0+Ng/zNId+ZZehGfINwTzdrDqc6iubbnQWhnPuYymOzOKUDqa2cSl59yHnEh2h6MvRLQsyNug==
 
 is-installed-globally@~0.4.0:
   version "0.4.0"
@@ -4628,10 +4597,10 @@ is-path-inside@^3.0.2:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+is-plain-obj@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22"
+  integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw==
 
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
@@ -5086,42 +5055,50 @@ material-colors@^1.2.1:
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
   integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
 
-mdast-util-definitions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
-  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
-  dependencies:
-    unist-util-visit "^2.0.0"
-
-mdast-util-from-markdown@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
-  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
+mdast-util-definitions@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.0.tgz#b6d10ef00a3c4cf191e8d9a5fa58d7f4a366f817"
+  integrity sha512-5hcR7FL2EuZ4q6lLMUK5w4lHT2H3vqL9quPvYZ/Ku5iifrirfMHiGdhxdXMUbUkDmz5I+TYMd7nbaxUhbQkfpQ==
   dependencies:
     "@types/mdast" "^3.0.0"
-    mdast-util-to-string "^2.0.0"
-    micromark "~2.11.0"
-    parse-entities "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
+    "@types/unist" "^2.0.0"
+    unist-util-visit "^3.0.0"
 
-mdast-util-to-hast@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
-  integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
+mdast-util-from-markdown@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.0.0.tgz#c517313cd999ec2b8f6d447b438c5a9d500b89c9"
+  integrity sha512-uj2G60sb7z1PNOeElFwCC9b/Se/lFXuLhVKFOAY2EHz/VvgbupTQRNXPoZl7rGpXYL6BNZgcgaybrlSWbo7n/g==
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.0"
-    mdast-util-definitions "^4.0.0"
+    mdast-util-to-string "^3.0.0"
+    micromark "^3.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    parse-entities "^3.0.0"
+    unist-util-stringify-position "^3.0.0"
+
+mdast-util-to-hast@^11.0.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-11.2.0.tgz#54d76f1539be21a6559b2aa36e97bb07d2ab43ab"
+  integrity sha512-KSYbg4PA9wk5YwoCZCPxbUAjdYunNN5TqTXoZp/9taRDGQS65cL2fFgKc78l0f3deg4p1LP9xdhmMuUrhAUSZA==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    "@types/mdurl" "^1.0.0"
+    mdast-util-definitions "^5.0.0"
     mdurl "^1.0.0"
-    unist-builder "^2.0.0"
-    unist-util-generated "^1.0.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^2.0.0"
+    unist-builder "^3.0.0"
+    unist-util-generated "^2.0.0"
+    unist-util-position "^4.0.0"
+    unist-util-visit "^3.0.0"
 
-mdast-util-to-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
-  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
+mdast-util-to-string@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
+  integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
 
 mdn-data@2.0.14:
   version "2.0.14"
@@ -5171,13 +5148,185 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromark@~2.11.0:
-  version "2.11.4"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
-  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+micromark-core-commonmark@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.1.tgz#a64987cafe872e8b80bc8f2352a5d988586ac4f1"
+  integrity sha512-vEOw8hcQ3nwHkKKNIyP9wBi8M50zjNajtmI+cCUWcVfJS+v5/3WCh4PLKf7PPRZFUutjzl4ZjlHwBWUKfb/SkA==
+  dependencies:
+    micromark-factory-destination "^1.0.0"
+    micromark-factory-label "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-factory-title "^1.0.0"
+    micromark-factory-whitespace "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-classify-character "^1.0.0"
+    micromark-util-html-tag-name "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    parse-entities "^3.0.0"
+
+micromark-factory-destination@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e"
+  integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-label@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.0.tgz#b316ec479b474232973ff13b49b576f84a6f2cbb"
+  integrity sha512-XWEucVZb+qBCe2jmlOnWr6sWSY6NHx+wtpgYFsm4G+dufOf6tTQRRo0bdO7XSlGPu5fyjpJenth6Ksnc5Mwfww==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-space@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633"
+  integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-title@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.0.tgz#708f7a8044f34a898c0efdb4f55e4da66b537273"
+  integrity sha512-flvC7Gx0dWVWorXuBl09Cr3wB5FTuYec8pMGVySIp2ZlqTcIjN/lFohZcP0EG//krTptm34kozHk7aK/CleCfA==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-whitespace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c"
+  integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-character@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86"
+  integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-chunked@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06"
+  integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-classify-character@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20"
+  integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-combine-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5"
+  integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-decode-numeric-character-reference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946"
+  integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-encode@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.0.tgz#c409ecf751a28aa9564b599db35640fccec4c068"
+  integrity sha512-cJpFVM768h6zkd8qJ1LNRrITfY4gwFt+tziPcIf71Ui8yFzY9wG3snZQqiWVq93PG4Sw6YOtcNiKJfVIs9qfGg==
+
+micromark-util-html-tag-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed"
+  integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g==
+
+micromark-util-normalize-identifier@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828"
+  integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-resolve-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88"
+  integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
+micromark-util-sanitize-uri@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2"
+  integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-subtokenize@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.0.tgz#6f006fa719af92776c75a264daaede0fb3943c6a"
+  integrity sha512-EsnG2qscmcN5XhkqQBZni/4oQbLFjz9yk3ZM/P8a3YUjwV6+6On2wehr1ALx0MxK3+XXXLTzuBKHDFeDFYRdgQ==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-symbol@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.0.tgz#91cdbcc9b2a827c0129a177d36241bcd3ccaa34d"
+  integrity sha512-NZA01jHRNCt4KlOROn8/bGi6vvpEmlXld7EHcRH+aYWUfL3Wc8JLUNNlqUMKa0hhz6GrpUWsHtzPmKof57v0gQ==
+
+micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.1.tgz#8bb8a092d93d326bd29fe29602799f2d0d922fd4"
+  integrity sha512-UT0ylWEEy80RFYzK9pEaugTqaxoD/j0Y9WhHpSyitxd99zjoQz7JJ+iKuhPAgOW2MiPSUAx+c09dcqokeyaROA==
+
+micromark@^3.0.0:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.5.tgz#d24792c8a06f201d5608c106dbfadef34c299684"
+  integrity sha512-QfjERBnPw0G9mxhOCkkbRP0n8SX8lIBLrEKeEVceviUukqVMv3hWE4AgNTOK/W6GWqtPvvIHg2Apl3j1Dxm6aQ==
   dependencies:
+    "@types/debug" "^4.0.0"
     debug "^4.0.0"
-    parse-entities "^2.0.0"
+    micromark-core-commonmark "^1.0.1"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    parse-entities "^3.0.0"
 
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -5660,17 +5809,17 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
-  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
+parse-entities@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-3.0.0.tgz#9ed6d6569b6cfc95ade058d683ddef239dad60dc"
+  integrity sha512-AJlcIFDNPEP33KyJLguv0xJc83BNvjxwpuUIcetyXUsLpVXAUCePJ5kIoYtEN2R1ac0cYaRu/vk9dVFkewHQhQ==
   dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
+    character-entities "^2.0.0"
+    character-entities-legacy "^2.0.0"
+    character-reference-invalid "^2.0.0"
+    is-alphanumerical "^2.0.0"
+    is-decimal "^2.0.0"
+    is-hexadecimal "^2.0.0"
 
 parse-json@^5.0.0:
   version "5.2.0"
@@ -5736,9 +5885,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -5917,7 +6066,7 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -5926,12 +6075,10 @@ prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.6.0, prop-types@^15.6.1,
     object-assign "^4.1.1"
     react-is "^16.8.1"
 
-property-information@^5.3.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
-  integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
-  dependencies:
-    xtend "^4.0.0"
+property-information@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.0.1.tgz#7c668d9f2b9cb63bc3e105d8b8dfee7221a17800"
+  integrity sha512-F4WUUAF7fMeF4/JUFHNBWDaKDXi2jbvqBW/y6o5wsf3j19wTZ7S60TmtB5HoBhtgw7NKQRMWuz5vk2PR0CygUg==
 
 protobufjs@6.8.8:
   version "6.8.8"
@@ -6111,24 +6258,24 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-markdown@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-6.0.3.tgz#625ec767fa321d91801129387e7d31ee0cb99254"
-  integrity sha512-kQbpWiMoBHnj9myLlmZG9T1JdoT/OEyHK7hqM6CqFT14MAkgWiWBUYijLyBmxbntaN6dCDicPcUhWhci1QYodg==
+react-markdown@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-7.0.0.tgz#66565968e8513af070eeef65abc77e80fc1a9b87"
+  integrity sha512-qdWfKxMgdKF3kHAV5pmcB12fAvytPoTpYwKTO6O/I3HujrK7sKIv6j4RnXVNLrNUh+TaBk+KtqpGzIKslX2rDg==
   dependencies:
     "@types/hast" "^2.0.0"
-    "@types/unist" "^2.0.3"
-    comma-separated-tokens "^1.0.0"
-    prop-types "^15.7.2"
-    property-information "^5.3.0"
+    "@types/unist" "^2.0.0"
+    comma-separated-tokens "^2.0.0"
+    prop-types "^15.0.0"
+    property-information "^6.0.0"
     react-is "^17.0.0"
-    remark-parse "^9.0.0"
-    remark-rehype "^8.0.0"
-    space-separated-tokens "^1.1.0"
+    remark-parse "^10.0.0"
+    remark-rehype "^9.0.0"
+    space-separated-tokens "^2.0.0"
     style-to-object "^0.3.0"
-    unified "^9.0.0"
-    unist-util-visit "^2.0.0"
-    vfile "^4.0.0"
+    unified "^10.0.0"
+    unist-util-visit "^4.0.0"
+    vfile "^5.0.0"
 
 react-modal@^3.14.3:
   version "3.14.3"
@@ -6327,19 +6474,24 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remark-parse@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
-  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
+remark-parse@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.0.tgz#65e2b2b34d8581d36b97f12a2926bb2126961cb4"
+  integrity sha512-07ei47p2Xl7Bqbn9H2VYQYirnAFJPwdMuypdozWsSbnmrkgA2e2sZLZdnDNrrsxR4onmIzH/J6KXqKxCuqHtPQ==
   dependencies:
-    mdast-util-from-markdown "^0.8.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    unified "^10.0.0"
 
-remark-rehype@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945"
-  integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==
+remark-rehype@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-9.0.0.tgz#83532a48e048373411ca50c53d84fb1a35bc7bfe"
+  integrity sha512-SFA+mPWu45ynFPKeT3h5eNNVAYoMp3wizr3KSKh1IQ9L6dLSyD25/df6/vv8EW8ji3O3dnZGdbLQl592Tn+ydg==
   dependencies:
-    mdast-util-to-hast "^10.2.0"
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-hast "^11.0.0"
+    unified "^10.0.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
@@ -6535,10 +6687,10 @@ sass-loader@^12.1.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.37.0.tgz#f1b03a9d072ee9053a29d125c8130c78e92827c2"
-  integrity sha512-B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w==
+sass@^1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.38.0.tgz#2f3e60a1efdcdc910586fa79dc89d3399a145b4f"
+  integrity sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 
@@ -6880,10 +7032,10 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-space-separated-tokens@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
-  integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
+space-separated-tokens@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b"
+  integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
@@ -7259,10 +7411,10 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
-  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
+trough@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96"
+  integrity sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w==
 
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
@@ -7383,17 +7535,18 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
-unified@^9.0.0:
-  version "9.2.1"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
-  integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
+unified@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.0.tgz#4e65eb38fc2448b1c5ee573a472340f52b9346fe"
+  integrity sha512-4U3ru/BRXYYhKbwXV6lU6bufLikoAavTwev89H5UxY8enDFaAT2VXmIXYNm6hb5oHPng/EXr77PVyDFcptbk5g==
   dependencies:
-    bail "^1.0.0"
+    "@types/unist" "^2.0.0"
+    bail "^2.0.0"
     extend "^3.0.0"
     is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^5.0.0"
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -7410,49 +7563,68 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
-unist-builder@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
-  integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
+unist-builder@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04"
+  integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
 
-unist-util-generated@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
-  integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
+unist-util-generated@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113"
+  integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==
 
-unist-util-is@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
-  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
+unist-util-is@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236"
+  integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==
 
-unist-util-position@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
-  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
+unist-util-position@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.1.tgz#f8484b2da19a897a0180556d160c28633070dbb9"
+  integrity sha512-mgy/zI9fQ2HlbOtTdr2w9lhVaiFUHWQnZrFF2EUoVOqtAUdzqMtNiD99qA5a1IcjWVR8O6aVYE9u7Z2z1v0SQA==
 
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
-  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+unist-util-stringify-position@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9"
+  integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA==
   dependencies:
-    "@types/unist" "^2.0.2"
+    "@types/unist" "^2.0.0"
 
-unist-util-visit-parents@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
-  integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==
+unist-util-visit-parents@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"
+  integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
+    unist-util-is "^5.0.0"
 
-unist-util-visit@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
-  integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
+unist-util-visit-parents@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.0.0.tgz#5ae2440f8710a0c18a2b4ba0c4471d18e1090494"
+  integrity sha512-CVaLOYPM/EaFTYMytbaju3Tw4QI3DHnHFnL358FkEu0hZOzSm/hqBdVwOQDR60jF5ZzhB1tlZlRH0ll/yekZIQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
+unist-util-visit@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b"
+  integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-is "^4.0.0"
-    unist-util-visit-parents "^3.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^4.0.0"
+
+unist-util-visit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.0.0.tgz#6e1f7e8e163921d20281354c38bfd3244b64580a"
+  integrity sha512-3HWTvrtU10/E7qgPznBfiOyG0TXj9W8c1GSfaI8L9GkaG1pLePiQPZ7E35a0R3ToQ/zcy4Im6aZ9WBgOTnv1MQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.0.0"
 
 universalify@^2.0.0:
   version "2.0.0"
@@ -7509,9 +7681,9 @@ url-loader@^4.1.1:
     schema-utils "^3.0.0"
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -7583,23 +7755,23 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-message@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
-  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+vfile-message@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.2.tgz#db7eaebe7fecb853010f2ef1664427f52baf8f74"
+  integrity sha512-UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww==
   dependencies:
     "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
 
-vfile@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
-  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
+vfile@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.1.0.tgz#18e78016f0f71e98d737d40f0fca921dc264a600"
+  integrity sha512-4o7/DJjEaFPYSh0ckv5kcYkJTHQgCKdL8ozMM1jLAxO9ox95IzveDPXCZp08HamdWq8JXTkClDvfAKaeLQeKtg==
   dependencies:
     "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+    vfile-message "^3.0.0"
 
 warning@^4.0.3:
   version "4.0.3"
@@ -7638,15 +7810,15 @@ webpack-bundle-analyzer@^4.4.2:
     sirv "^1.0.7"
     ws "^7.3.1"
 
-webpack-cli@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
-  integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
+webpack-cli@^4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1"
+  integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
     "@webpack-cli/configtest" "^1.0.4"
     "@webpack-cli/info" "^1.3.0"
-    "@webpack-cli/serve" "^1.5.1"
+    "@webpack-cli/serve" "^1.5.2"
     colorette "^1.2.1"
     commander "^7.0.0"
     execa "^5.0.0"
@@ -7728,10 +7900,10 @@ webpack-sources@^3.2.0:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
   integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
 
-webpack@5.49.0:
-  version "5.49.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.49.0.tgz#e250362b781a9fb614ba0a97ed67c66b9c5310cd"
-  integrity sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==
+webpack@5.51.1:
+  version "5.51.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.51.1.tgz#41bebf38dccab9a89487b16dbe95c22e147aac57"
+  integrity sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.50"
@@ -7856,11 +8028,6 @@ ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
   integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
 
-xtend@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
 y18n@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.2.tgz#c504495ba9b59230dd60226d1dd89c3c0a1b745e"