diff --git a/src/middlewared/middlewared/plugins/apps/ix_apps/query.py b/src/middlewared/middlewared/plugins/apps/ix_apps/query.py
index f57b777935358..8d33c9cfc384e 100644
--- a/src/middlewared/middlewared/plugins/apps/ix_apps/query.py
+++ b/src/middlewared/middlewared/plugins/apps/ix_apps/query.py
@@ -181,6 +181,7 @@ def translate_resources_to_desired_workflow(app_resources: dict) -> dict:
             'port_config': container_ports_config,
             'state': state,
             'volume_mounts': [v.__dict__ for v in volume_mounts],
+            'id': container['Id'],
         })
         workloads['used_ports'].extend(container_ports_config)
         volumes.update(volume_mounts)
diff --git a/src/middlewared/middlewared/plugins/apps/logs.py b/src/middlewared/middlewared/plugins/apps/logs.py
new file mode 100644
index 0000000000000..91585be98d71f
--- /dev/null
+++ b/src/middlewared/middlewared/plugins/apps/logs.py
@@ -0,0 +1,87 @@
+import errno
+
+import docker.errors
+from dateutil.parser import parse, ParserError
+from docker.models.containers import Container
+
+from middlewared.event import EventSource
+from middlewared.schema import Dict, Int, Str
+from middlewared.service import CallError
+from middlewared.validators import Range
+
+from .ix_apps.docker.utils import get_docker_client
+
+
+class AppContainerLogsFollowTailEventSource(EventSource):
+
+    """
+    Retrieve logs of a container/service in an app.
+
+    Name of app and id of container/service is required.
+    Optionally `tail_lines` and `limit_bytes` can be specified.
+
+    `tail_lines` is an option to select how many lines of logs to retrieve for the said container. It
+    defaults to 500. If set to `null`, it will retrieve complete logs of the container.
+    """
+    ACCEPTS = Dict(
+        Int('tail_lines', default=500, validators=[Range(min_=1)], null=True),
+        Str('app_name', required=True),
+        Str('container_id', required=True),
+    )
+    RETURNS = Dict(
+        Str('data', required=True),
+        Str('timestamp', required=True, null=True)
+    )
+
+    def __init__(self, *args, **kwargs):
+        super(AppContainerLogsFollowTailEventSource, self).__init__(*args, **kwargs)
+        self.logs_stream = None
+
+    def validate_log_args(self, app_name, container_id) -> Container:
+        app = self.middleware.call_sync('app.get_instance', app_name)
+        if app['state'] != 'RUNNING':
+            raise CallError(f'App "{app_name}" is not running')
+
+        if not any(c['id'] == container_id for c in app['active_workloads']['container_details']):
+            raise CallError(f'Container "{container_id}" not found in app "{app_name}"', errno=errno.ENOENT)
+
+        docker_client = get_docker_client()
+        try:
+            container = docker_client.containers.get(container_id)
+        except docker.errors.NotFound:
+            raise CallError(f'Container "{container_id}" not found')
+
+        return container
+
+    def run_sync(self):
+        app_name = self.arg['app_name']
+        container_id = self.arg['container_id']
+        tail_lines = self.arg['tail_lines'] or 'all'
+
+        container = self.validate_log_args(app_name, container_id)
+        self.logs_stream = container.logs(stream=True, follow=True, timestamps=True, tail=tail_lines)
+
+        for log_entry in map(bytes.decode, self.logs_stream):
+            # Event should contain a timestamp in RFC3339 format, we should parse it and supply it
+            # separately so UI can highlight the timestamp giving us a cleaner view of the logs
+            timestamp = log_entry.split(maxsplit=1)[0].strip()
+            try:
+                timestamp = str(parse(timestamp))
+            except (TypeError, ParserError):
+                timestamp = None
+            else:
+                log_entry = log_entry.split(maxsplit=1)[-1].lstrip()
+
+            self.send_event('ADDED', fields={'data': log_entry, 'timestamp': timestamp})
+
+    async def cancel(self):
+        await super().cancel()
+        if self.logs_stream:
+            await self.middleware.run_in_thread(self.logs_stream.close)
+
+    async def on_finish(self):
+        self.logs_stream = None
+
+
+def setup(middleware):
+    middleware.register_event_source('app.container_log_follow', AppContainerLogsFollowTailEventSource)