diff --git a/.gitignore b/.gitignore
index 3f374b125..5fc30282a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,11 +22,15 @@ build/
 .env.local
 .env.*.local
 src/.env
-*.pem
+src/publishers/crypto
+!src/publishers/crypto/README.md
 *.key
 *.log
 *.crt
 *.asc
+*.pub
+*.pem
+*.p12
 local/
 
 # settings of editors
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15567a065..8b4b4cc3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [v23.09.1] - 2023-09-27
+### Breaking change! (Only for docker users with customized or new report templates)
+
+**Background:**
+Presenter docker maps `/app/templates` directory to `presenters_templates` container.
+This override original `/app/templates` files with user modifications.
+When new or updated templates arrive with new version, they stay hidden due this mapping.
+
+**Solution:**
+Remap user changes to `/app/templates/user_templates` directory.
+There is need then just update old template path in `Configuration / Product Types`:
+e.g.  `/app/templates/file.html` -> `/app/templates/user_templates/file.html`
+
 ### Added
 * New reports (OSINT, Disinfo, Offensive, Weekly)
 * Keycloak authentication support
@@ -31,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fixed bots crash, better Regex
 * Added missing TOR binary to the collectors
 * Improved templates
+* Fixed bug when new templates stay hiden due wrong docker mapping
 * A lot of various fixes
 
 Thanks for the contributions: @sebix, @multiflexi
diff --git a/docker/Dockerfile.bots b/docker/Dockerfile.bots
index fc2ec693c..a989a105c 100644
--- a/docker/Dockerfile.bots
+++ b/docker/Dockerfile.bots
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
diff --git a/docker/Dockerfile.collectors b/docker/Dockerfile.collectors
index a77621c42..edc46df14 100644
--- a/docker/Dockerfile.collectors
+++ b/docker/Dockerfile.collectors
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
diff --git a/docker/Dockerfile.presenters b/docker/Dockerfile.presenters
index 8f1b61026..27737392e 100644
--- a/docker/Dockerfile.presenters
+++ b/docker/Dockerfile.presenters
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
@@ -20,59 +20,15 @@ RUN \
     apk add --no-cache \
     libpng \
     libjpeg \
-    wkhtmltopdf
+    py3-gobject3 \
+    pango
 
 # install fonts
 RUN \
     apk add --no-cache \
     msttcorefonts-installer \
     fontconfig \
-    font-noto \
-    font-noto-adlam \
-    font-noto-adlamunjoined \
-    font-noto-arabic \
-    font-noto-armenian \
-    font-noto-avestan \
-    font-noto-bamum \
-    font-noto-bengali \
-    font-noto-buhid \
-    font-noto-carian \
-    font-noto-chakma \
-    font-noto-cherokee \
-    font-noto-cypriot \
-    font-noto-deseret \
-    font-noto-devanagari \
-    font-noto-ethiopic \
-    font-noto-extra \
-    font-noto-georgian \
-    font-noto-glagolitic \
-    font-noto-gothic \
-    font-noto-gujarati \
-    font-noto-gurmukhi \
-    font-noto-hebrew \
-    font-noto-kannada \
-    font-noto-kayahli \
-    font-noto-khmer \
-    font-noto-lao \
-    font-noto-lisu \
-    font-noto-malayalam \
-    font-noto-mandaic \
-    font-noto-myanmar \
-    font-noto-nko \
-    font-noto-olchiki \
-    font-noto-oldturkic \
-    font-noto-oriya \
-    font-noto-osage \
-    font-noto-osmanya \
-    font-noto-shavian \
-    font-noto-sinhala \
-    font-noto-tamil \
-    font-noto-telugu \
-    font-noto-thaana \
-    font-noto-thai \
-    font-noto-tibetan \
-    font-noto-tifinagh \
-    font-noto-vai \
+    font-noto-all \
     terminus-font \
     ttf-opensans \
     font-bakoma \
diff --git a/docker/Dockerfile.publishers b/docker/Dockerfile.publishers
index 5ee5a7ead..c4f50e78c 100644
--- a/docker/Dockerfile.publishers
+++ b/docker/Dockerfile.publishers
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine3.17 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.9-alpine3.17 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
@@ -25,9 +25,9 @@ RUN pip install --no-cache-dir ./custom_packages/taranis_ng_shared-*.whl && rm -
 
 COPY ./src/publishers/requirements.txt /app/requirements.txt
 RUN apk add --no-cache \
-    swig\
+    swig \
     libmagic \
-    gnupg 
+    gnupg
 
 RUN \
     apk add --no-cache --virtual .build-deps build-base \
diff --git a/docker/README.md b/docker/README.md
index 571783ca0..f03ff8add 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -37,13 +37,17 @@ entrypoint, and the [gunicorn](https://gunicorn.org/) configuration file.
 ## Prerequisites
 
 - [Docker](https://docs.docker.com/engine/install/)
-- [docker-compose](https://docs.docker.com/compose/install/) >= 1.27.0
+- [docker-compose](https://docs.docker.com/compose/install/) >= 1.27.0 (In July 2023, Compose V1 has been deprecated)
+
+or
+
+- [Compose V2](https://docs.docker.com/compose/migrate/), which is part of standard Docker Engine installation
 - (Optional) [Vim](https://www.vim.org/) or other text editor - for configuration and development
 
 Please note it is important to use the abovementioned version of
 `docker-compose` or newer, otherwise the build and deploy will fail.
 
-## Quickly build and run Taranis NG using `docker-compose`
+## Quickly build and run Taranis NG using `docker-compose` or `docker compose`
 
 _First_, you need to clone the source code repository:
 
@@ -66,12 +70,21 @@ _Finally_, either deploy the ready-made images from Docker hub with:
 docker-compose -f docker/docker-compose.yml pull
 docker-compose -f docker/docker-compose.yml up --no-build
 ```
+or
+```bash
+docker compose -f docker/docker-compose.yml pull
+docker compose -f docker/docker-compose.yml up --no-build
+```
 
 or, alternatively, build and run the containers with:
 
 ```bash
 TARANIS_NG_TAG=build docker-compose -f docker/docker-compose.yml up --build --pull
 ```
+or
+```bash
+TARANIS_NG_TAG=build docker compose -f docker/docker-compose.yml up --build --pull
+```
 (`--pull` updates the base images)
 
 **Voila, Taranis NG is up and running. Visit your instance by navigating to
diff --git a/docker/docker-compose-keycloak.yml b/docker/docker-compose-keycloak.yml
index d8d702964..eb7ff2b23 100644
--- a/docker/docker-compose-keycloak.yml
+++ b/docker/docker-compose-keycloak.yml
@@ -1,68 +1,15 @@
 version: "3.9"
 
 services:
-  redis:
-    image: "redis:${REDIS_TAG}"
-    restart: unless-stopped
-    environment:
-      TZ: "${TZ}"
-    volumes:
-      - "redis_conf:/usr/local/etc/redis"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
-  database:
-    image: "postgres:${POSTGRES_TAG}"
-    restart: unless-stopped
-    environment:
-      POSTGRES_DB: "taranis-ng"
-      POSTGRES_USER: "taranis-ng"
-      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
-      TZ: "${TZ}"
-      PGTZ: "${TZ}"
-    command: ["postgres", "-c", "shared_buffers=${DB_SHARED_BUFFERS}", "-c", "max_connections=${DB_MAX_CONNECTIONS}"]
-    volumes:
-      - "database_data:/var/lib/postgresql/data"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
   core:
-    depends_on: 
-      - "redis"
-      - "database"
-    restart: unless-stopped
-    image: "skcert/taranis-ng-core:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.core
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
     environment: 
-      REDIS_URL: "redis://redis"
-      DB_URL: "database"
-      DB_DATABASE: "taranis-ng"
-      DB_USER: "taranis-ng"
-      DB_PASSWORD: "${POSTGRES_PASSWORD}"
-      DB_POOL_SIZE: 100
-      DB_POOL_RECYCLE: 300
-      DB_POOL_TIMEOUT: 30
+      TARANIS_NG_AUTHENTICATOR: "keycloak"
 
-      JWT_SECRET_KEY: "${JWT_SECRET_KEY}"
       OPENID_LOGOUT_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/keycloak/auth/realms/taranis-ng/protocol/openid-connect/logout?redirect_uri=GOTO_URL"
       TARANIS_NG_KEYCLOAK_INTERNAL_URL: "http://keycloak:8080"
       TARANIS_NG_KEYCLOAK_REALM: "taranis-ng"
       TARANIS_NG_KEYCLOAK_CLIENT_ID: "taranis-ng"
       TARANIS_NG_KEYCLOAK_CLIENT_SECRET: "supersecret"
-      TARANIS_NG_AUTHENTICATOR: "keycloak"
       KEYCLOAK_USER_MANAGEMENT: "true"
       KEYCLOAK_SERVER_URL: "http://keycloak:8080"
       KEYCLOAK_ADMIN_USERNAME: "admin"
@@ -70,220 +17,8 @@ services:
       KEYCLOAK_REALM_NAME: "taranis-ng"
       KEYCLOAK_CLIENT_SECRET_KEY: "supersecret"
       KEYCLOAK_VERIFY: "true"
-      WORKERS_PER_CORE: "1"
-
-      CVE_UPDATE_FILE: "${CVE_UPDATE_FILE}"
-      CPE_UPDATE_FILE: "${CPE_UPDATE_FILE}"
-
-      TZ: "${TZ}"
-      DEBUG: "true"
-      DEBUG_SQL: "false"
-      # to allow automatic initialisation of collectors/presenters/publishers
-      COLLECTOR_PRESENTER_PUBLISHER_API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.services.taranis-api.loadbalancer.server.port: "80"
-
-      traefik.http.routers.taranis-api-443.entrypoints: "websecure"
-      traefik.http.routers.taranis-api-443.rule: "PathPrefix(`/api/`)"
-      traefik.http.routers.taranis-api-443.tls: "true"
-      traefik.http.routers.taranis-api-443.tls.domains[0].main: "${TARANIS_NG_HOSTNAME}"
-      traefik.http.routers.taranis-api-443.service: "taranis-api"
-
-      traefik.http.routers.taranis-sse-443.entrypoints: "websecure"
-      traefik.http.routers.taranis-sse-443.rule: "PathPrefix(`/sse`)"
-      traefik.http.routers.taranis-sse-443.tls: "true"
-      traefik.http.routers.taranis-sse-443.tls.domains[0].main: "${TARANIS_NG_HOSTNAME}"
-      traefik.http.routers.taranis-sse-443.service: "taranis-api"
-
-    volumes:
-      - "core_data:/data"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
-  bots:
-    depends_on:
-      core:
-        condition: service_healthy
-    image: "skcert/taranis-ng-bots:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.bots
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
-    environment:
-      API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
-      TARANIS_NG_CORE_URL: "http://core"
-      TARANIS_NG_CORE_SSE: "http://core/sse"
-      WORKERS_PER_CORE: "1"
-      TZ: "${TZ}"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-    
-  collectors:
-    depends_on:
-      core:
-        condition: service_healthy
-    restart: unless-stopped
-    image: "skcert/taranis-ng-collectors:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.collectors
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
-    environment:
-      TARANIS_NG_CORE_URL: "http://core"
-      API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
-      WORKERS_PER_CORE: "1"
-      DEBUG: "true"
-      TZ: "${TZ}"
-    volumes:
-      - "collector_storage:/app/storage"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-    
-  presenters:
-    depends_on:
-      core:
-        condition: service_healthy
-    restart: unless-stopped
-    image: "skcert/taranis-ng-presenters:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.presenters
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
-    environment:
-      TARANIS_NG_CORE_URL: "http://core"
-      API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
-      WORKERS_PER_CORE: "1"
-      TZ: "${TZ}"
-    ports:
-      - "${PRESENTER_PORT}:80"
-    volumes:
-      - "presenters_templates:/app/templates"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-    
-  publishers:
-    depends_on:
-      core:
-        condition: service_healthy
-    restart: unless-stopped
-    image: "skcert/taranis-ng-publishers:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.publishers
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
-    environment:
-      TARANIS_NG_CORE_URL: "http://core"
-      API_KEY: "${COLLECTOR_PRESENTER_PUBLISHER_API_KEY}"
-      WORKERS_PER_CORE: "1"
-      TZ: "${TZ}"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
 
   gui:
-    depends_on:
-      - "core"
-    restart: unless-stopped
-    image: "skcert/taranis-ng-gui:${TARANIS_NG_TAG}"
-    build:
-      context: ..
-      dockerfile: ./docker/Dockerfile.gui
-      args:
-        HTTP_PROXY: "${HTTP_PROXY}"
-        HTTPS_PROXY: "${HTTPS_PROXY}"
-        http_proxy: "${HTTP_PROXY}"
-        https_proxy: "${HTTPS_PROXY}"
-#    ports: 
-#      - "8080:80"
     environment:
-      NGINX_WORKERS: "4"
-      NGINX_CONNECTIONS: "16"
-      VUE_APP_TARANIS_NG_URL: "${TARANIS_NG_HTTPS_URI}"
-      VUE_APP_TARANIS_NG_CORE_API: "${TARANIS_NG_HTTPS_URI}/api/v1"
-      VUE_APP_TARANIS_NG_CORE_SSE: "${TARANIS_NG_HTTPS_URI}/sse"
-      VUE_APP_TARANIS_NG_LOCALE: en
       VUE_APP_TARANIS_NG_LOGOUT_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/auth/logout?gotoUrl=TARANIS_GUI_URI"
       VUE_APP_TARANIS_NG_LOGIN_URL: "${TARANIS_NG_HTTPS_URI}/api/v1/keycloak/auth/realms/taranis-ng/protocol/openid-connect/auth?response_type=code&client_id=taranis-ng&redirect_uri=TARANIS_GUI_URI"
-      TZ: "${TZ}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.services.taranis-gui.loadbalancer.server.port: "80"
-
-      traefik.http.middlewares.redirect-to-443.redirectscheme.scheme: "https"
-      traefik.http.middlewares.redirect-to-443.redirectscheme.port: "${TARANIS_NG_HTTPS_PORT}"
-
-      traefik.http.routers.taranis-gui-80.entrypoints: "web"
-      traefik.http.routers.taranis-gui-80.rule: "PathPrefix(`/`)"
-      traefik.http.routers.taranis-gui-80.middlewares: "redirect-to-443"
-
-      traefik.http.routers.taranis-gui-443.entrypoints: "websecure"
-      traefik.http.routers.taranis-gui-443.rule: "PathPrefix(`/`)"
-      traefik.http.routers.taranis-gui-443.tls: "true"
-      traefik.http.routers.taranis-gui-443.tls.domains[0].main: "${TARANIS_NG_HOSTNAME}"
-      traefik.http.routers.taranis-gui-443.service: "taranis-gui"
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
-  traefik:
-    depends_on:
-      - "gui"
-      - "core"
-    restart: unless-stopped
-    image: "traefik:latest"
-    environment:
-      TZ: "${TZ}"
-    ports: 
-      - "${TARANIS_NG_HTTP_PORT}:80"
-      - "${TARANIS_NG_HTTPS_PORT}:443"
-      - "${TRAEFIK_MANAGEMENT_PORT}:9090"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./traefik:/etc/traefik:ro"
-      - "./tls:/opt/certs"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
-volumes:
-  redis_conf:
-  database_data:
-  core_data:
-  presenters_templates:
-  collector_storage:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 16d10b53f..2f4be5755 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -97,6 +97,7 @@ services:
     depends_on:
       core:
         condition: service_healthy
+    restart: unless-stopped
     image: "skcert/taranis-ng-bots:${TARANIS_NG_TAG}"
     build:
       context: ..
@@ -168,7 +169,7 @@ services:
     ports:
       - "${PRESENTER_PORT}:80"
     volumes:
-      - "presenters_templates:/app/templates"
+      - "presenters_templates:/app/templates/user_templates"
     logging:
       driver: "json-file"
       options:
diff --git a/src/bots/managers/auth_manager.py b/src/bots/managers/auth_manager.py
index c7d94a288..24b59d938 100644
--- a/src/bots/managers/auth_manager.py
+++ b/src/bots/managers/auth_manager.py
@@ -1,11 +1,16 @@
+"""Authorization manager for the API.
+
+Returns:
+    wrapper: Wrapper function for the API endpoints.
+"""
 from functools import wraps
 from flask import request
 import os
 import ssl
 
-api_key = os.getenv('API_KEY')
+api_key = os.getenv("API_KEY")
 
-if os.getenv('SSL_VERIFICATION') == "False":
+if os.getenv("SSL_VERIFICATION") == "False":
     try:
         _create_unverified_https_context = ssl._create_unverified_context
     except AttributeError:
@@ -15,11 +20,18 @@
 
 
 def api_key_required(fn):
+    """Check for API key in the request header.
+
+    Arguments:
+        fn -- The function to be decorated.
+    Returns:
+        wrapper: Wrapper function for the API endpoints.
+    """
+
     @wraps(fn)
     def wrapper(*args, **kwargs):
-
-        if not request.headers.has_key('Authorization') or request.headers['Authorization'] != ('Bearer ' + api_key):
-            return {'error': 'not authorized'}, 401
+        if "Authorization" not in request.headers.keys() or request.headers["Authorization"] != ("Bearer " + api_key):
+            return {"error": "not authorized"}, 401
         else:
             return fn(*args, **kwargs)
 
diff --git a/src/bots/managers/log_manager.py b/src/bots/managers/log_manager.py
index 5f3dffb0c..3ee01c657 100644
--- a/src/bots/managers/log_manager.py
+++ b/src/bots/managers/log_manager.py
@@ -83,6 +83,9 @@ def log_critical(message):
         sys_logger = None
         log_debug("Unable to connect to syslog server!")
         log_debug(ex)
+else: 
+    # disable log duplicities on the screen if we have SYSLOG disabled
+    sys_logger = None
 
 def log_system_activity(module, message):
     log_info("[{}] {}".format(module, message))
diff --git a/src/bots/requirements.txt b/src/bots/requirements.txt
index 4139b7a7e..bc21d0327 100644
--- a/src/bots/requirements.txt
+++ b/src/bots/requirements.txt
@@ -1,26 +1,13 @@
-certifi==2019.11.28
-Flask==1.1.4
-Flask-Cors==3.0.10
-Flask-RESTful==0.3.7
-gevent==21.8.0
-greenlet==1.1.1
-gunicorn==20.0.4
-idna==2.8
-marshmallow==3.18.0
+Flask==3.0.0
+Flask-Cors==4.0.0
+Flask-RESTful==0.3.10
+gevent==23.9.1
+gunicorn==21.2.0
+marshmallow==3.20.1
 marshmallow-enum==1.5.1
-Jinja2==2.11.3
-MarkupSafe==1.1.0
-oauthlib==3.1.0
+oauthlib==3.2.2
 PySocks==1.7.1
-python-dateutil==2.8.1
-python-dotenv==0.10.5
-pytz==2019.3
-requests==2.26.0
-requests-oauthlib==1.3.0
-schedule==0.6.0
-six==1.14.0
-sseclient-py==1.7
-tweepy==3.8.0
-urllib3==1.26.7
-Werkzeug==0.16.0
-zipp==3.1.0
+python-dotenv==1.0.0
+requests==2.31.0
+schedule==1.2.1
+sseclient-py==1.8.0
diff --git a/src/collectors/collectors/atom_collector.py b/src/collectors/collectors/atom_collector.py
index 8edcf2d03..73713c7dc 100644
--- a/src/collectors/collectors/atom_collector.py
+++ b/src/collectors/collectors/atom_collector.py
@@ -1,12 +1,14 @@
 import datetime
 import hashlib
 import uuid
+import traceback
 import feedparser
 import requests
 from bs4 import BeautifulSoup
 from dateutil.parser import parse
 
 from .base_collector import BaseCollector
+from managers import log_manager
 from shared.schema.news_item import NewsItemData
 from shared.schema.parameter import Parameter, ParameterType
 
@@ -30,6 +32,7 @@ def collect(self, source):
         feed_url = source.parameter_values['ATOM_FEED_URL']
         user_agent = source.parameter_values['USER_AGENT']
         interval = source.parameter_values['REFRESH_INTERVAL']
+        log_manager.log_collector_activity("atom", source.name, "Starting collector for url: {}".format(feed_url))
 
         proxies = {}
         if 'PROXY_SERVER' in source.parameter_values:
@@ -50,16 +53,14 @@ def collect(self, source):
 
             news_items = []
 
+            limit = BaseCollector.history(interval)
             for feed_entry in feed['entries']:
-
-                limit = BaseCollector.history(interval)
                 published = feed_entry['updated']
                 published = parse(published, tzinfos=BaseCollector.timezone_info())
-
                 if str(published) > str(limit):
 
                     link_for_article = feed_entry['link']
-
+                    log_manager.log_collector_activity("atom", source.name, "Processing entry [{}]".format(link_for_article))
                     if proxies:
                         page = requests.get(link_for_article, headers={'User-Agent': user_agent}, proxies=proxies)
                     else:
@@ -85,4 +86,8 @@ def collect(self, source):
 
             BaseCollector.publish(news_items, source)
         except Exception as error:
+            log_manager.log_collector_activity("atom", source.name, "ATOM collection exceptionally failed")
             BaseCollector.print_exception(source, error)
+            log_manager.log_debug(traceback.format_exc())
+        
+        log_manager.log_debug("{} collection finished.".format(self.type))
diff --git a/src/collectors/collectors/rss_collector.py b/src/collectors/collectors/rss_collector.py
index dd8bf3517..5c81f5440 100644
--- a/src/collectors/collectors/rss_collector.py
+++ b/src/collectors/collectors/rss_collector.py
@@ -1,3 +1,4 @@
+"""RSS collector module."""
 import datetime
 import hashlib
 import uuid
@@ -17,13 +18,19 @@
 
 
 class RSSCollector(BaseCollector):
+    """RSS collector class.
+
+    Arguments:
+        BaseCollector -- Base collector class.
+    """
+
     type = "RSS_COLLECTOR"
     name = "RSS Collector"
     description = "Collector for gathering data from RSS feeds"
 
     parameters = [
         Parameter(0, "FEED_URL", "Feed URL", "Full url for RSS feed", ParameterType.STRING),
-        Parameter(0, "USER_AGENT", "User agent", "Type of user agent", ParameterType.STRING)
+        Parameter(0, "USER_AGENT", "User agent", "Type of user agent", ParameterType.STRING),
     ]
 
     parameters.extend(BaseCollector.parameters)
@@ -32,45 +39,52 @@ class RSSCollector(BaseCollector):
 
     @BaseCollector.ignore_exceptions
     def collect(self, source):
+        """Collect data from RSS feed.
 
-        feed_url = source.parameter_values['FEED_URL']
-        interval = source.parameter_values['REFRESH_INTERVAL']
+        Arguments:
+            source -- Source object.
+        """
+        feed_url = source.parameter_values["FEED_URL"]
+        # interval = source.parameter_values["REFRESH_INTERVAL"]
 
-        log_manager.log_collector_activity('rss', source.name, 'Starting collector for url: {}'.format(feed_url))
+        log_manager.log_collector_activity("rss", source.name, "Starting collector for url: {}".format(feed_url))
 
-        user_agent = source.parameter_values['USER_AGENT']
+        user_agent = source.parameter_values["USER_AGENT"]
         if user_agent:
             feedparser.USER_AGENT = user_agent
-            user_agent_headers = {'User-Agent': user_agent}
+            # user_agent_headers = {"User-Agent": user_agent}
         else:
-            user_agent_headers = { }
+            # user_agent_headers = {}
+            pass
 
         # use system proxy
         proxy_handler = None
         opener = urllib.request.urlopen
 
-        if 'PROXY_SERVER' in source.parameter_values:
-            proxy_server = source.parameter_values['PROXY_SERVER']
+        if "PROXY_SERVER" in source.parameter_values:
+            proxy_server = source.parameter_values["PROXY_SERVER"]
 
             # disable proxy - do not use system proxy
-            if proxy_server == 'none':
+            if proxy_server == "none":
                 proxy_handler = urllib.request.ProxyHandler({})
             else:
                 proxy = re.search(r"^(http|https|socks4|socks5)://([a-zA-Z0-9\-\.\_]+):(\d+)/?$", proxy_server)
                 if proxy:
                     scheme, host, port = proxy.groups()
                     # classic HTTP/HTTPS proxy
-                    if scheme in ['http', 'https']:
-                        proxy_handler = urllib.request.ProxyHandler({
-                            'http': '{}://{}:{}'.format(scheme, host, port),
-                            'https': '{}://{}:{}'.format(scheme, host, port),
-                            'ftp': '{}://{}:{}'.format(scheme, host, port)
-                        })
+                    if scheme in ["http", "https"]:
+                        proxy_handler = urllib.request.ProxyHandler(
+                            {
+                                "http": "{}://{}:{}".format(scheme, host, port),
+                                "https": "{}://{}:{}".format(scheme, host, port),
+                                "ftp": "{}://{}:{}".format(scheme, host, port),
+                            }
+                        )
                     # socks4 proxy
-                    elif scheme == 'socks4':
+                    elif scheme == "socks4":
                         proxy_handler = SocksiPyHandler(socks.SOCKS4, host, int(port))
                     # socks5 proxy
-                    elif scheme == 'socks5':
+                    elif scheme == "socks5":
                         proxy_handler = SocksiPyHandler(socks.SOCKS5, host, int(port))
 
         # use proxy in urllib
@@ -79,63 +93,72 @@ def collect(self, source):
 
         try:
             if proxy_handler:
-                feed = feedparser.parse(feed_url, handlers = [proxy_handler])
+                feed = feedparser.parse(feed_url, handlers=[proxy_handler])
             else:
                 feed = feedparser.parse(feed_url)
 
-            log_manager.log_collector_activity('rss', source.name, 'RSS returned feed with {} entries'.format(len(feed['entries'])))
+            log_manager.log_collector_activity("rss", source.name, "RSS returned feed with {} entries".format(len(feed["entries"])))
 
             news_items = []
 
-            for feed_entry in feed['entries']:
-
-                for key in ['author', 'published', 'title', 'description', 'link']:
-                    if not feed_entry.has_key(key):
-                        feed_entry[key] = ''
+            for feed_entry in feed["entries"]:
+                for key in ["author", "published", "title", "description", "link"]:
+                    if key not in feed_entry.keys():
+                        feed_entry[key] = ""
 
-                limit = BaseCollector.history(interval)
-                published = feed_entry['published']
-                published = dateparser.parse(published, settings={'DATE_ORDER': 'DMY'})
+                # limit = BaseCollector.history(interval)
+                published = feed_entry["published"]
+                published = dateparser.parse(published, settings={"DATE_ORDER": "DMY"})
 
                 # if published > limit: TODO: uncomment after testing, we need some initial data now
-                link_for_article = feed_entry['link']
+                link_for_article = feed_entry["link"]
                 if not link_for_article:
                     log_manager.log_collector_activity("rss", source.name, "Skipping (empty link)")
                     continue
 
-                log_manager.log_collector_activity('rss', source.name, 'Processing entry [{}]'.format(link_for_article))
+                log_manager.log_collector_activity("rss", source.name, "Processing entry [{}]".format(link_for_article))
 
-                html_content = ''
+                html_content = ""
                 request = urllib.request.Request(link_for_article)
-                request.add_header('User-Agent', user_agent)
+                request.add_header("User-Agent", user_agent)
 
                 with opener(request) as response:
                     html_content = response.read()
 
-                soup = BeautifulSoup(html_content, features='html.parser')
+                soup = BeautifulSoup(html_content, features="html.parser")
 
-                content = ''
+                content = ""
 
                 if html_content:
-                    content_text = [p.text.strip() for p in soup.findAll('p')]
-                    replaced_str = '\xa0'
+                    content_text = [p.text.strip() for p in soup.findAll("p")]
+                    replaced_str = "\xa0"
                     if replaced_str:
-                        content = [w.replace(replaced_str, ' ') for w in content_text]
-                        content = ' '.join(content)
-
-                for_hash = feed_entry['author'] + feed_entry['title'] + feed_entry['link']
-
-                news_item = NewsItemData(uuid.uuid4(), hashlib.sha256(for_hash.encode()).hexdigest(),
-                                        feed_entry['title'], feed_entry['description'], feed_url, feed_entry['link'],
-                                        feed_entry['published'], feed_entry['author'], datetime.datetime.now(),
-                                        content, source.id, [])
+                        content = [w.replace(replaced_str, " ") for w in content_text]
+                        content = " ".join(content)
+
+                for_hash = feed_entry["author"] + feed_entry["title"] + feed_entry["link"]
+
+                news_item = NewsItemData(
+                    uuid.uuid4(),
+                    hashlib.sha256(for_hash.encode()).hexdigest(),
+                    feed_entry["title"],
+                    feed_entry["description"],
+                    feed_url,
+                    feed_entry["link"],
+                    feed_entry["published"],
+                    feed_entry["author"],
+                    datetime.datetime.now(),
+                    content,
+                    source.id,
+                    [],
+                )
 
                 news_items.append(news_item)
 
             BaseCollector.publish(news_items, source)
 
         except Exception as error:
-            log_manager.log_collector_activity('rss', source.name, 'RSS collection exceptionally failed')
+            log_manager.log_collector_activity("rss", source.name, "RSS collection exceptionally failed")
             BaseCollector.print_exception(source, error)
             log_manager.log_debug(traceback.format_exc())
 
diff --git a/src/collectors/collectors/web_collector.py b/src/collectors/collectors/web_collector.py
index 8151e7744..2f14d401c 100644
--- a/src/collectors/collectors/web_collector.py
+++ b/src/collectors/collectors/web_collector.py
@@ -12,7 +12,9 @@
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 from selenium.webdriver.chrome.options import Options as ChromeOptions
+from selenium.webdriver.chrome.service import Service as ChromeService
 from selenium.webdriver.firefox.options import Options as FirefoxOptions
+from selenium.webdriver.firefox.service import Service as FirefoxService
 from urllib.parse import urlparse
 import os
 import dateparser
@@ -137,17 +139,17 @@ def __find_element_by(driver, element_selector):
 
         element = None
         if prefix == 'id':
-            element = driver.find_element_by_id(selector)
+            element = driver.find_element(By.ID, selector)
         if prefix == 'name':
-            element = driver.find_element_by_name(selector)
+            element = driver.find_element(By.NAME, selector)
         elif prefix == 'xpath':
-            element = driver.find_element_by_xpath(selector)
+            element = driver.find_element(By.XPATH, selector)
         elif prefix in [ 'tag_name', 'tag' ]:
-            element = driver.find_element_by_tag_name(selector)
+            element = driver.find_element(By.TAG_NAME, selector)
         elif prefix in [ 'class_name', 'class' ]:
-            element = driver.find_element_by_class_name(selector)
+            element = driver.find_element(By.CLASS_NAME, selector)
         elif prefix in [ 'css_selector', 'css' ]:
-            element = driver.find_element_by_css_selector(selector)
+            element = driver.find_element(By.CSS_SELECTOR, selector)
 
         return element
 
@@ -177,17 +179,17 @@ def __find_elements_by(driver, element_selector):
 
         elements = None
         if prefix == 'id':
-            elements = [ driver.find_element_by_id(selector) ]
+            elements = [ driver.find_element(By.ID, selector) ]
         if prefix == 'name':
-            elements = driver.find_elements_by_name(selector)
+            elements = driver.find_element(By.NAME, selector)
         elif prefix == 'xpath':
-            elements = driver.find_elements_by_xpath(selector)
+            elements = driver.find_element(By.XPATH, selector)
         elif prefix in [ 'tag_name', 'tag' ]:
-            elements = driver.find_elements_by_tag_name(selector)
+            elements = driver.find_elements(By.TAG_NAME, selector)
         elif prefix in [ 'class_name', 'class' ]:
-            elements = driver.find_elements_by_class_name(selector)
+            elements = driver.find_element(By.CLASS_NAME, selector)
         elif prefix in [ 'css_selector', 'css' ]:
-            elements = driver.find_elements_by_css_selector(selector)
+            elements = driver.find_elements(By.CSS_SELECTOR, selector)
         return elements
 
     @staticmethod
@@ -368,12 +370,12 @@ def __get_headless_driver_chrome(self):
         chrome_options.add_argument("--headless")
         chrome_options.add_argument('--ignore-certificate-errors')
         chrome_options.add_argument('--incognito')
+        chrome_service = ChromeService(executable_path=chrome_driver_executable)
         if self.user_agent:
             chrome_options.add_argument('user-agent=' + self.user_agent)
         if self.tor_service.lower() == 'yes':
             socks_proxy = "socks5://127.0.0.1:9050"
             chrome_options.add_argument('--proxy-server={}'.format(socks_proxy))
-            driver = webdriver.Chrome(executable_path=chrome_driver_executable, options=chrome_options)
         elif self.proxy:
             webdriver.DesiredCapabilities.CHROME['proxy'] = {
                 "proxyType": "MANUAL",
@@ -381,10 +383,8 @@ def __get_headless_driver_chrome(self):
                 "ftpProxy": self.proxy,
                 "sslProxy": self.proxy
             }
-            driver = webdriver.Chrome(executable_path=chrome_driver_executable, options=chrome_options)
-        else:
-            driver = webdriver.Chrome(executable_path=chrome_driver_executable, options=chrome_options)
-
+            
+        driver = webdriver.Chrome(service=chrome_service, options=chrome_options)
         log_manager.log_debug('Chrome driver initialized.')
         return driver
 
@@ -406,30 +406,26 @@ def __get_headless_driver_firefox(self):
         if self.user_agent:
             firefox_options.add_argument('user-agent=' + self.user_agent)
 
-        profile = webdriver.FirefoxProfile()
-        firefox_capabilities = webdriver.DesiredCapabilities.FIREFOX
-        firefox_capabilities['marionette'] = True
-
         if self.tor_service.lower() == 'yes':
-            profile.set_preference('network.proxy.type', 1) # manual proxy config
-            profile.set_preference('network.proxy.socks', '127.0.0.1')
-            profile.set_preference('network.proxy.socks_port', 9050)
-            profile.set_preference('network.proxy.no_proxies_on', f'localhost, ::1, 127.0.0.1, {core_url_host}, 127.0.0.0/8');
+            firefox_options.set_preference('network.proxy.type', 1) # manual proxy config
+            firefox_options.set_preference('network.proxy.socks', '127.0.0.1')
+            firefox_options.set_preference('network.proxy.socks_port', 9050)
+            firefox_options.set_preference('network.proxy.no_proxies_on', f'localhost, ::1, 127.0.0.1, {core_url_host}, 127.0.0.0/8');
 
         elif self.proxy:
-            profile.set_preference('network.proxy.type', 1) # manual proxy config
-            profile.set_preference('network.proxy.http', self.proxy_host)
-            profile.set_preference('network.proxy.http_port', int(self.proxy_port))
-            profile.set_preference('network.proxy.ssl', self.proxy_host)
-            profile.set_preference('network.proxy.ssl_port', int(self.proxy_port))
-            profile.set_preference('network.proxy.ftp', self.proxy)
-            profile.set_preference('network.proxy.ftp_port', int(self.proxy_port))
-            profile.set_preference('network.proxy.no_proxies_on', f'localhost, ::1, 127.0.0.1, {core_url_host}, 127.0.0.0/8');
+            firefox_options.set_preference('network.proxy.type', 1) # manual proxy config
+            firefox_options.set_preference('network.proxy.http', self.proxy_host)
+            firefox_options.set_preference('network.proxy.http_port', int(self.proxy_port))
+            firefox_options.set_preference('network.proxy.ssl', self.proxy_host)
+            firefox_options.set_preference('network.proxy.ssl_port', int(self.proxy_port))
+            firefox_options.set_preference('network.proxy.ftp', self.proxy)
+            firefox_options.set_preference('network.proxy.ftp_port', int(self.proxy_port))
+            firefox_options.set_preference('network.proxy.no_proxies_on', f'localhost, ::1, 127.0.0.1, {core_url_host}, 127.0.0.0/8');
         else:
-            profile.set_preference('network.proxy.type', 0) # no proxy
+            firefox_options.set_preference('network.proxy.type', 0) # no proxy
 
-        profile.update_preferences()
-        driver = webdriver.Firefox(profile, executable_path=firefox_driver_executable, options=firefox_options, capabilities=firefox_capabilities)
+        firefox_service = FirefoxService(executable_path=firefox_driver_executable)
+        driver = webdriver.Firefox(service=firefox_service, options=firefox_options)
 
         log_manager.log_debug('Firefox driver initialized.')
         return driver
@@ -518,8 +514,11 @@ def __browse_title_page(self, index_url):
                 popup = WebDriverWait(browser, 10).until(EC.presence_of_element_located(self.__get_element_locator(self.selectors['popup_close'])))
             except Exception as ex:
                 log_manager.log_collector_activity('web', self.source.name, 'Popup find error: ' + traceback.format_exc())
-            if popup:
-                popup.click()
+            try:
+                if popup:
+                    popup.click()
+            except Exception as ex:
+                log_manager.log_collector_activity('web', self.source.name, 'Popup click error: ' + traceback.format_exc())
 
         # if there is a "load more" selector, click on it!
         page = 1
diff --git a/src/collectors/managers/auth_manager.py b/src/collectors/managers/auth_manager.py
index c7d94a288..28d4ce145 100644
--- a/src/collectors/managers/auth_manager.py
+++ b/src/collectors/managers/auth_manager.py
@@ -1,11 +1,16 @@
+"""Authorization manager for the API.
+
+Returns:
+    wrapper: Wrapper function for the API endpoints.
+"""
 from functools import wraps
 from flask import request
 import os
 import ssl
 
-api_key = os.getenv('API_KEY')
+api_key = os.getenv("API_KEY")
 
-if os.getenv('SSL_VERIFICATION') == "False":
+if os.getenv("SSL_VERIFICATION") == "False":
     try:
         _create_unverified_https_context = ssl._create_unverified_context
     except AttributeError:
@@ -15,11 +20,19 @@
 
 
 def api_key_required(fn):
+    """Check for API key in the request header.
+
+    Arguments:
+        fn -- The function to be decorated.
+
+    Returns:
+        wrapper: Wrapper function for the API endpoints.
+    """
+
     @wraps(fn)
     def wrapper(*args, **kwargs):
-
-        if not request.headers.has_key('Authorization') or request.headers['Authorization'] != ('Bearer ' + api_key):
-            return {'error': 'not authorized'}, 401
+        if "Authorization" not in request.headers.keys() or request.headers["Authorization"] != ("Bearer " + api_key):
+            return {"error": "not authorized"}, 401
         else:
             return fn(*args, **kwargs)
 
diff --git a/src/collectors/managers/log_manager.py b/src/collectors/managers/log_manager.py
index 07a2f6db0..176860ba7 100644
--- a/src/collectors/managers/log_manager.py
+++ b/src/collectors/managers/log_manager.py
@@ -83,6 +83,9 @@ def log_critical(message):
         sys_logger = None
         log_warning("Unable to connect to syslog server!")
         log_warning(ex)
+else: 
+    # disable log duplicities on the screen if we have SYSLOG disabled
+    sys_logger = None
 
 def log_system_activity(module, message):
     log_info("[{}] {}".format(module, message))
diff --git a/src/collectors/requirements.txt b/src/collectors/requirements.txt
index 4352be63b..d7b1d1d38 100644
--- a/src/collectors/requirements.txt
+++ b/src/collectors/requirements.txt
@@ -1,30 +1,19 @@
-beautifulsoup4==4.8.1
-bleach==4.1.0
-certifi==2021.10.8
-feedparser==5.2.1
-Flask==1.1.4
-Flask-Cors==3.0.10
-Flask-RESTful==0.3.7
-gevent==21.8.0
-greenlet==1.1.1
-gunicorn==20.0.4
-lxml==4.6.5
-marshmallow==3.18.0
+beautifulsoup4==4.12.2
+bleach==6.1.0
+dateparser==1.2.0
+feedparser==6.0.10
+Flask==3.0.0
+Flask-Cors==4.0.0
+Flask-RESTful==0.3.10
+gevent==23.9.1
+gunicorn==21.2.0
+marshmallow==3.20.1
 marshmallow-enum==1.5.1
-Jinja2==2.11.3
-MarkupSafe==1.1.0
-pyslack==0.5.0
 PySocks==1.7.1
-python-dateutil==2.8.1
-python-dotenv==0.10.5
-pytz==2019.3
-requests==2.26.0
-schedule==0.6.0
-selenium==4.0.0
-six==1.14.0
-slackclient==1.0.7
-soupsieve==1.9.5
-tweepy==3.8.0
-Werkzeug==0.16.0
-zipp==3.1.0
-dateparser==1.1.1
+python-dateutil==2.8.2
+python-dotenv==1.0.0
+requests==2.31.0
+schedule==1.2.1
+selenium==4.15.2
+slackclient==1.3.2
+tweepy==4.14.0
diff --git a/src/core/README.md b/src/core/README.md
index c7ee28cc6..457b230ff 100644
--- a/src/core/README.md
+++ b/src/core/README.md
@@ -55,7 +55,9 @@ KEYCLOAK_REALM_NAME: "taranis-ng"
 KEYCLOAK_USER_MANAGEMENT: "false"
 ```
 
-You can use and modify the existing `docker-compose-keycloak.yml` example in the repository.
+You can use and modify the existing `docker-compose-keycloak.yml` example in the repository and
+run with ```docker-compose -f docker-compose.yml -f docker-compose-keycloak.yml```
+
 
 # **LDAP authentication**
 If you prefer to authenticate users with LDAP, you need to set environment variables similarly to this:
diff --git a/src/core/managers/log_manager.py b/src/core/managers/log_manager.py
index 16b15acc2..c265b19ae 100644
--- a/src/core/managers/log_manager.py
+++ b/src/core/managers/log_manager.py
@@ -31,8 +31,6 @@
     gunicorn_logger.setLevel(logging.DEBUG)
     sys_logger.setLevel(logging.DEBUG)
 
-
-
 # alter the sensitive value for logging, based on LOG_SENSITIVE_DATA env variable:
 #
 # LOG_SENSITIVE_DATA=no (or undefined) - remove sensitive data
@@ -59,7 +57,6 @@ def sensitive_value(value):
     else:
         return '•••••'
 
-
 # used to decrypt the encrypted secrets from the logs
 # source: https://github.com/gdavid7/cryptocode/blob/main/cryptocode.py
 # TODO: add a command line wrapper around this function
@@ -106,8 +103,6 @@ def generate_escaped_data(request_data):
     data = re.sub(r'(^\s+)|(\s+$)', '', data)
     return data
 
-
-
 # send a debug message
 def log_debug(message):
     formatted_message = "[{}] {}".format(module_id,message)
@@ -168,18 +163,18 @@ def log_critical(message):
         sys_logger = None
         log_debug("Unable to connect to syslog server!")
         log_debug(ex)
-
+else: 
+    # disable log duplicities on the screen if we have SYSLOG disabled
+    sys_logger = None
 
 def resolve_ip_address():
     headers_list = request.headers.getlist("X-Forwarded-For")
     ip_address = headers_list[0] if headers_list else request.remote_addr
     return ip_address
 
-
 def resolve_method():
     return request.method
 
-
 def resolve_resource():
     fp_len = len(request.full_path)
     if request.full_path[fp_len - 1] == '?':
@@ -187,17 +182,14 @@ def resolve_resource():
     else:
         return request.full_path
 
-
 def store_activity(activity_type, activity_detail, request_data = None):
     LogRecord.store(resolve_ip_address(), None, None, None, None, module_id, activity_type, resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_user_activity(user, activity_type, activity_detail, request_data = None):
     LogRecord.store(resolve_ip_address(), user.id, user.name, None, None, module_id, activity_type, resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_access_error_activity(user, activity_detail, request_data = None):
     ip = resolve_ip_address()
     log_text = "TARANIS NG Access Error (IP: {}, User ID: {}, User Name: {}, Method: {}, Resource: {}, Activity Detail: {}, Activity Data: {})".format(
@@ -220,7 +212,6 @@ def store_access_error_activity(user, activity_detail, request_data = None):
     LogRecord.store(ip, user.id, user.name, None, None, module_id, "ACCESS_ERROR", resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_data_error_activity(user, activity_detail, request_data = None):
     db.session.rollback()
     ip = resolve_ip_address()
@@ -243,7 +234,6 @@ def store_data_error_activity(user, activity_detail, request_data = None):
     LogRecord.store(ip, user.id, user.name, None, None, module_id, "DATA_ERROR", resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_data_error_activity_no_user(activity_detail, request_data = None):
     db.session.rollback()
     ip = resolve_ip_address()
@@ -264,7 +254,6 @@ def store_data_error_activity_no_user(activity_detail, request_data = None):
     LogRecord.store(ip, None, None, None, None, module_id, "PUBLIC_ACCESS_DATA_ERROR", resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_auth_error_activity(activity_detail, request_data = None):
     db.session.rollback()
     log_text = "TARANIS NG Auth Error (Method: {}, Resource: {}, Activity Detail: {}, Activity Data: {})".format(
@@ -283,7 +272,6 @@ def store_auth_error_activity(activity_detail, request_data = None):
     LogRecord.store(resolve_ip_address(), None, None, None, None, module_id, "AUTH_ERROR", resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_user_auth_error_activity(user, activity_detail, request_data = None):
     db.session.rollback()
     ip = resolve_ip_address()
@@ -304,12 +292,10 @@ def store_user_auth_error_activity(user, activity_detail, request_data = None):
     LogRecord.store(ip, user.id, user.name, None, None, module_id, "AUTH_ERROR", resolve_resource(),
                     activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_system_activity(system_id, system_name, activity_type, activity_detail, request_data = None):
     LogRecord.store(resolve_ip_address(), None, None, system_id, system_name, module_id, activity_type,
                     resolve_resource(), activity_detail, resolve_method(), generate_escaped_data(request_data))
 
-
 def store_system_error_activity(system_id, system_name, activity_type, activity_detail, request_data = None):
     db.session.rollback()
     ip = resolve_ip_address()
diff --git a/src/core/migrations/versions/d776f47ce040_update_pdf_template_path.py b/src/core/migrations/versions/d776f47ce040_update_pdf_template_path.py
new file mode 100644
index 000000000..7357d6a3f
--- /dev/null
+++ b/src/core/migrations/versions/d776f47ce040_update_pdf_template_path.py
@@ -0,0 +1,83 @@
+"""Correct old presenter template details
+
+Revision ID: d776f47ce040
+Revises: 1c4eed243364
+Create Date: 2023-11-24 12:58:32.377642
+
+"""
+from alembic import op
+from sqlalchemy import orm, Column, ForeignKey, String, Integer, Boolean, text
+from sqlalchemy.ext.declarative import declarative_base
+import sqlalchemy as sa
+
+Base = declarative_base()
+
+# revision identifiers, used by Alembic.
+revision = 'd776f47ce040'
+down_revision = '1c4eed243364'
+branch_labels = None
+depends_on = None
+
+class Presenter_d776f47ce040(Base):
+    __tablename__ = 'presenter'
+    id = Column(String(64), primary_key=True)
+    type = Column(String, nullable=False)
+
+class PresenterParameter_d776f47ce040(Base):
+    __tablename__ = 'presenter_parameter'
+    presenter_id = Column(String(64), ForeignKey('presenter.id'), primary_key=True, nullable=False)
+    parameter_id = Column(Integer, ForeignKey('parameter.id'), primary_key=True, nullable=False)
+
+class Parameter_d776f47ce040(Base):
+    __tablename__ = 'parameter'
+    id = Column(Integer, primary_key=True, server_default=text("nextval('parameter_id_seq'::regclass)"))
+    key = Column(String, nullable=False)
+    name = Column(String, nullable=False)
+    description = Column(String)
+
+class ParameterValue_d776f47ce040(Base):
+    __tablename__ = 'parameter_value'
+    id = Column(Integer, primary_key=True, server_default=text("nextval('parameter_value_id_seq'::regclass)"))
+    value = Column(String, nullable=False)
+    parameter_id = Column(ForeignKey('parameter.id'))
+
+def upgrade():
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    # add cascade delete
+    delete_previous()
+    # parameter -> presenter_parameter
+    op.create_foreign_key('presenter_parameter_parameter_id_fkey', 'presenter_parameter', 'parameter', ['parameter_id'], ['id'], ondelete='CASCADE')
+
+    # Correct old presenter template details
+    presenters = session.query(Presenter_d776f47ce040).filter_by(type = 'PDF_PRESENTER').all()
+    for pres in presenters:
+        presenterParameters = session.query(PresenterParameter_d776f47ce040).filter_by(presenter_id = pres.id).all()
+        for presParam in presenterParameters:
+            parameters = session.query(Parameter_d776f47ce040).filter_by(id = presParam.parameter_id).all()
+            for param in parameters:
+                if param.key == "HEADER_TEMPLATE_PATH" or param.key == "FOOTER_TEMPLATE_PATH":
+                    session.delete(param)
+                    print(f"Old parameter deleted... ({param.key})", flush=True)
+                elif param.key == "BODY_TEMPLATE_PATH":
+                    param.key = "PDF_TEMPLATE_PATH"
+                    param.name = "PDF template with its path"
+                    param.description = "Path of pdf template file"
+                    session.add(param)
+                    val = session.query(ParameterValue_d776f47ce040).filter_by(parameter_id = param.id).first()
+                    if val:
+                        val.value = val.value.replace("pdf_body_template.html", "pdf_template.html")
+                        session.add(val)
+                        print(f"Old parameter updated... ({param.key})", flush=True)
+                session.commit()
+
+def downgrade():
+    delete_previous()
+    # parameter -> presenter_parameter
+    op.create_foreign_key('presenter_parameter_parameter_id_fkey', 'presenter_parameter', 'parameter', ['parameter_id'], ['id'])
+
+def delete_previous():
+    print("Deleting previous constraints...", flush=True)
+    op.drop_constraint('presenter_parameter_parameter_id_fkey', 'presenter_parameter', type_='foreignkey')
+    print("Adding new constraints...", flush=True)
\ No newline at end of file
diff --git a/src/core/model/report_item.py b/src/core/model/report_item.py
index a10de345a..b1bf3fd10 100644
--- a/src/core/model/report_item.py
+++ b/src/core/model/report_item.py
@@ -375,14 +375,15 @@ def update_report_item(cls, id, data, user):
 
                 if 'attribute_id' in data:
                     for attribute in report_item.attributes:
-                        if attribute.id == data['attribute_id']:
+                        # sometime we compare: int & int or int & str
+                        if str(attribute.id) == str(data['attribute_id']):
                             if attribute.value != data['attribute_value']:
                                 modified = True
                                 attribute.value = data['attribute_value']
                                 data['attribute_value'] = ''
                                 attribute.user = user
                                 attribute.last_updated = datetime.now()
-                                break
+                            break
 
             if 'add' in data:
                 if 'attribute_id' in data:
@@ -407,7 +408,8 @@ def update_report_item(cls, id, data, user):
                 if 'attribute_id' in data:
                     attribute_to_delete = None
                     for attribute in report_item.attributes:
-                        if attribute.id == data['attribute_id']:
+                        # sometime we compare: int & int or int & str
+                        if str(attribute.id) == str(data['attribute_id']):
                             attribute_to_delete = attribute
                             break
 
@@ -466,7 +468,7 @@ def get_updated_data(cls, id, data):
 
                 if 'attribute_id' in data:
                     for attribute in report_item.attributes:
-                        if attribute.id == data['attribute_id']:
+                        if str(attribute.id) == data['attribute_id']:
                             data['attribute_value'] = attribute.value
                             data['attribute_last_updated'] = attribute.last_updated.strftime('%d.%m.%Y - %H:%M')
                             data['attribute_user'] = attribute.user.name
@@ -489,7 +491,7 @@ def get_updated_data(cls, id, data):
 
                 if 'attribute_id' in data:
                     for attribute in report_item.attributes:
-                        if attribute.id == data['attribute_id']:
+                        if str(attribute.id) == data['attribute_id']:
                             data['attribute_value'] = attribute.value
                             data['binary_mime_type'] = attribute.binary_mime_type
                             data['binary_size'] = attribute.binary_size
diff --git a/src/gui/src/components/analyze/NewReportItem.vue b/src/gui/src/components/analyze/NewReportItem.vue
index e8bf6a539..80782b3a9 100644
--- a/src/gui/src/components/analyze/NewReportItem.vue
+++ b/src/gui/src/components/analyze/NewReportItem.vue
@@ -226,14 +226,14 @@
 </template>
 
 <style>
-.taranis-ng-vertical-view {
-    position: relative;
-}
+    .taranis-ng-vertical-view {
+        position: relative;
+    }
 
-.v-dialog__content,
-.v-dialog--fullscreen {
-    position: absolute;
-}
+    .v-dialog__content,
+    .v-dialog--fullscreen {
+        position: fixed;
+    }
 </style>
 
 <script>
@@ -542,6 +542,7 @@ export default {
                 }
             }
         },
+
         report_item_unlocked(data) {
             if (this.edit === true && this.report_item.id === data.report_item_id) {
                 if (data.user_id !== this.$store.getters.getUserId) {
@@ -549,6 +550,7 @@ export default {
                 }
             }
         },
+
         report_item_updated(data_info) {
             if (this.edit === true && this.report_item.id === data_info.report_item_id) {
                 if (data_info.user_id !== this.$store.getters.getUserId) {
@@ -561,10 +563,24 @@ export default {
                         } else if (data.completed !== undefined) {
                             this.report_item.completed = data.completed
                         }
+                        // if more users work on the same report -> update locked field with new value
+                        if (data.update !== undefined) {
+                            endLoop: for (let i = 0; i < this.attribute_groups.length; i++) {
+                                for (let j = 0; j < this.attribute_groups[i].attribute_group_items.length; j++) {
+                                    for (let k = 0; k < this.attribute_groups[i].attribute_group_items[j].values.length; k++) {
+                                        if (this.attribute_groups[i].attribute_group_items[j].values[k].id == data.attribute_id) {
+                                            this.attribute_groups[i].attribute_group_items[j].values[k].value = data.attribute_value;
+                                            break endLoop;
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     })
                 }
             }
         },
+
         showDetail(report_item) {
             getReportItem(report_item.id).then((response) => {
 
@@ -755,6 +771,7 @@ export default {
             }
             return available;
         },
+
         importCSV() {
             let csv_lines = this.csv.length;
             let sorted_csv = new Array();
diff --git a/src/presenters/managers/auth_manager.py b/src/presenters/managers/auth_manager.py
index c7d94a288..24b59d938 100644
--- a/src/presenters/managers/auth_manager.py
+++ b/src/presenters/managers/auth_manager.py
@@ -1,11 +1,16 @@
+"""Authorization manager for the API.
+
+Returns:
+    wrapper: Wrapper function for the API endpoints.
+"""
 from functools import wraps
 from flask import request
 import os
 import ssl
 
-api_key = os.getenv('API_KEY')
+api_key = os.getenv("API_KEY")
 
-if os.getenv('SSL_VERIFICATION') == "False":
+if os.getenv("SSL_VERIFICATION") == "False":
     try:
         _create_unverified_https_context = ssl._create_unverified_context
     except AttributeError:
@@ -15,11 +20,18 @@
 
 
 def api_key_required(fn):
+    """Check for API key in the request header.
+
+    Arguments:
+        fn -- The function to be decorated.
+    Returns:
+        wrapper: Wrapper function for the API endpoints.
+    """
+
     @wraps(fn)
     def wrapper(*args, **kwargs):
-
-        if not request.headers.has_key('Authorization') or request.headers['Authorization'] != ('Bearer ' + api_key):
-            return {'error': 'not authorized'}, 401
+        if "Authorization" not in request.headers.keys() or request.headers["Authorization"] != ("Bearer " + api_key):
+            return {"error": "not authorized"}, 401
         else:
             return fn(*args, **kwargs)
 
diff --git a/src/presenters/managers/log_manager.py b/src/presenters/managers/log_manager.py
index f4f965464..b6cbd81ba 100644
--- a/src/presenters/managers/log_manager.py
+++ b/src/presenters/managers/log_manager.py
@@ -83,6 +83,9 @@ def log_critical(message):
         sys_logger = None
         log_debug("Unable to connect to syslog server!")
         log_debug(ex)
+else: 
+    # disable log duplicities on the screen if we have SYSLOG disabled
+    sys_logger = None
 
 def log_system_activity(module, message):
     log_info("[{}] {}".format(module, message))
diff --git a/src/presenters/presenters/base_presenter.py b/src/presenters/presenters/base_presenter.py
index a1e9e4cb6..bdba59444 100644
--- a/src/presenters/presenters/base_presenter.py
+++ b/src/presenters/presenters/base_presenter.py
@@ -1,3 +1,8 @@
+"""Base presenter.
+
+Returns:
+    _description_
+"""
 from shared.schema.presenter import PresenterSchema
 from managers import log_manager
 import json
@@ -7,15 +12,24 @@
 
 
 class BasePresenter:
+    """Base presenter class."""
+
     type = "BASE_PRESENTER"
     name = "Base Presenter"
     description = "Base abstract type for all presenters"
 
     parameters = list()
 
-    # helper class
     @staticmethod
     def json_default(value):
+        """Serialize a value to JSON.
+
+        Arguments:
+            value -- value to serialize
+
+        Returns:
+            dict: serialized value
+        """
         if isinstance(value, datetime.date):
             return dict(year=value.year, month=value.month, day=value.day)
         elif isinstance(value, types.MappingProxyType):
@@ -23,17 +37,36 @@ def json_default(value):
         else:
             return value.__dict__
 
-    # helper class
     class AttributesObject:
+        """Helper class: object holding all attributes of a report item."""
+
         def toJSON(self):
+            """Serialize the object to JSON.
+
+            Returns:
+                json.dumps(self): serialized object
+            """
             return json.dumps(self, default=BasePresenter.json_default, sort_keys=True, indent=4)
 
-    # helper class
     class ReportItemObject:
+        """Helper class: object holding all data about a report item."""
+
         def toJSON(self):
+            """Serialize the object to JSON.
+
+            Returns:
+                json.dumps(self): serialized object
+            """
             return json.dumps(self, default=BasePresenter.json_default, sort_keys=True, indent=4)
 
         def __init__(self, report_item, report_types, attribute_map):
+            """Initialize the object.
+
+            Arguments:
+                report_item -- report item to initialize the object with
+                report_types -- report types
+                attribute_map -- attribute map
+            """
             # report item itself
             self.name = report_item.title
             self.name_prefix = report_item.title_prefix
@@ -52,66 +85,55 @@ def __init__(self, report_item, report_types, attribute_map):
             # embedded news items
             self.news_items = list()
             for news_item_aggregate in report_item.news_item_aggregates:
-                for news_item in news_item_aggregate['news_items']:
-                    self.news_items.append(news_item['news_item_data'])
+                for news_item in news_item_aggregate["news_items"]:
+                    self.news_items.append(news_item["news_item_data"])
 
             self.attrs = BasePresenter.AttributesObject()
 
-            # group the values ; identify attributes with the same names
-            attribute_group_items = dict()
-            attribute_group_items_by_name = dict()
-            
-            # print (dir(report_item), flush=True)
+            attribute_group_items = {}
+            attribute_groups = {}
 
             for attribute in report_item.attributes:
                 attribute_group_item_id = attribute.attribute_group_item_id
-                if attribute_group_item_id not in attribute_group_items:
-                    attribute_group_items[attribute_group_item_id] = list()
-                attribute_group_items[attribute_group_item_id].append(attribute)  ######
+                attribute_group_items.setdefault(attribute_group_item_id, []).append(attribute)
 
                 attr_type = attribute_map[attribute_group_item_id]
                 attr_key = attr_type.title.lower().replace(" ", "_")
-                if attr_key not in attribute_group_items_by_name:
-                    attribute_group_items_by_name[attr_key] = 1
-                else:
-                    attribute_group_items_by_name[attr_key] += 1
-                # print(">>>", attr_key + ":", attribute.value, flush=True)
 
-            for attribute_group_item_id in attribute_group_items.keys():
+                attribute_groups.setdefault(attr_key, set()).add(attribute_group_item_id)
+
+            for attribute_group_item_id, attribute_group_item in attribute_group_items.items():
                 attr_type = attribute_map[attribute_group_item_id]
                 attr_key = attr_type.title.lower().replace(" ", "_")
 
-                attribute_group_item = attribute_group_items[attribute_group_item_id]
-                # print("=>>", attribute_group_item, flush=True)
-
-                min_occurrence = attribute_map[attribute_group_item_id].min_occurrence
-                max_occurrence = attribute_map[attribute_group_item_id].max_occurrence
+                max_occurrence = attr_type.max_occurrence
+                value_to_add = (
+                    attribute_group_item[0].value
+                    if max_occurrence == 1 and attribute_group_item
+                    else [attribute.value for attribute in attribute_group_item]
+                )
 
-                value_to_add = None
-                if max_occurrence == 1:
-                    if len(attribute_group_item) > 0:
-                        value_to_add = attribute_group_item[0].value
-                else:
-                    value_to_add = list()
-                    for attribute in attribute_group_item:
-                        value_to_add.append(attribute.value)
-
-                how_many_with_the_same_name = attribute_group_items_by_name[attr_key]
-                # print("===", attr_key + ":", value_to_add, how_many_with_the_same_name, flush=True)
+                how_many_with_the_same_name = len(attribute_groups[attr_key])
                 if how_many_with_the_same_name == 1:
                     setattr(self.attrs, attr_key, value_to_add)
                 else:
                     if not hasattr(self.attrs, attr_key):
-                        setattr(self.attrs, attr_key, list())
+                        setattr(self.attrs, attr_key, [])
                     getattr(self.attrs, attr_key).append(value_to_add)
 
-    # object holding all that we received from the CORE
     class InputDataObject:
+        """Object holding all that we received from the CORE."""
+
         def toJSON(self):
+            """Serialize the object to JSON.
+
+            Returns:
+                json.dumps(self): serialized object
+            """
             return json.dumps(self, default=BasePresenter.json_default, sort_keys=True, indent=4)
 
         def get_max_tlp(self, reports):
-            """Returns the highest TLP value from a list of reports
+            """Get the highest TLP value from a list of reports.
 
             Args:
                 reports (list): list of reports
@@ -119,14 +141,7 @@ def get_max_tlp(self, reports):
             Returns:
                 max_tlp: Highest TLP value from the list of reports
             """
-            color_values = {
-                            'WHITE': 0,
-                            'CLEAR': 1,
-                            'GREEN': 2,
-                            'AMBER': 3,
-                            'AMBER+STRICT': 4,
-                            'RED': 5
-                            }
+            color_values = {"WHITE": 0, "CLEAR": 1, "GREEN": 2, "AMBER": 3, "AMBER+STRICT": 4, "RED": 5}
             colors = []
 
             for report in reports:
@@ -139,13 +154,27 @@ def get_max_tlp(self, reports):
             return max_tlp
 
         def add_link_prefix(self, report, letter):
-            pattern = r'\[(\d+)\]'
+            """Add link prefix to the report description and recommendations.
+
+            Arguments:
+                report -- report to add link prefix to
+                letter -- letter to use as a link prefix
+
+            Returns:
+                description, recommendations: report description and recommendations with link prefix added
+            """
+            pattern = r"\[(\d+)\]"
             description = re.sub(pattern, lambda match: f"[{letter}{match.group(1)}]", report.attrs.description)
             recommendations = re.sub(pattern, lambda match: f"[{letter}{match.group(1)}]", report.attrs.recommendations)
 
             return description, recommendations
 
         def __init__(self, presenter_input):
+            """Initialize the object.
+
+            Arguments:
+                presenter_input -- input data
+            """
             # types of report items (e.g. vuln report, disinfo report)
             report_types = dict()
             for report_type in presenter_input.report_types:
@@ -160,12 +189,13 @@ def __init__(self, presenter_input):
                         attribute_map[attribute_group_item.id] = attribute_group_item
 
             self.product = presenter_input.product
+            self.product.date = datetime.datetime.now()
             self.report_items = list()
 
             for report in presenter_input.reports:
                 self.report_items.append(BasePresenter.ReportItemObject(report, report_types, attribute_map))
 
-            letter = 'A'
+            letter = "A"
             vul_report_count = 0
             for report in self.report_items:
                 if report.type == "Vulnerability Report":
@@ -177,23 +207,38 @@ def __init__(self, presenter_input):
                 self.product.max_tlp = self.get_max_tlp(self.report_items)
 
     def get_info(self):
+        """Get info about the presenter.
+
+        Returns:
+            info_schema.dump(self): info about the presenter
+        """
         info_schema = PresenterSchema()
         return info_schema.dump(self)
 
     def print_exception(self, error):
+        """Print exception.
+
+        Arguments:
+            error -- exception to print
+        """
         log_manager.log_debug_trace("[{0}] {1}".format(self.name, error))
 
     @staticmethod
     def generate_input_data(presenter_input):
+        """Generate input data for the presenter.
+
+        Arguments:
+            presenter_input -- input data
+
+        Returns:
+            data_obj: input data object
+        """
         data = BasePresenter.InputDataObject(presenter_input)
         data_json = data.toJSON()
         log_manager.log_info("=== TEMPLATING FROM THE FOLLOWING INPUT ===\n" + data_json)
         data_obj = json.loads(data_json)
         return data_obj
 
-    def generate(self, presenter_input):
-        pass
-
     # used in JINJA templating for formating "string date" to "date"
     def _filter_datetime(date, fmtin=None, fmtout=None):
         if date == "":
@@ -204,4 +249,4 @@ def _filter_datetime(date, fmtin=None, fmtout=None):
         native = date.replace(tzinfo=None)
         if not fmtout:
             fmtout = "%-d.%-m.%Y"
-        return native.strftime(fmtout)
\ No newline at end of file
+        return native.strftime(fmtout)
diff --git a/src/presenters/presenters/pdf_presenter.py b/src/presenters/presenters/pdf_presenter.py
index 260340da6..fdad204a1 100644
--- a/src/presenters/presenters/pdf_presenter.py
+++ b/src/presenters/presenters/pdf_presenter.py
@@ -1,96 +1,97 @@
+"""PDF Presenter.
+
+Returns:
+    dict: mime type and base64 encoded data of the generated PDF document
+"""
 import datetime
 import os
 import tempfile
 from base64 import b64encode
 import jinja2
-import pdfkit
+from weasyprint import HTML
 
 from .base_presenter import BasePresenter
 from shared.schema.parameter import Parameter, ParameterType
 
 
 class PDFPresenter(BasePresenter):
+    """PDF Presenter class.
+
+    Args:
+        BasePresenter (class): Base presenter class
+    """
+
     type = "PDF_PRESENTER"
     name = "PDF Presenter"
     description = "Presenter for generating PDF documents"
 
-    parameters = [
-        Parameter(0, "HEADER_TEMPLATE_PATH", "Header template path", "Path of header template file",
-                  ParameterType.STRING),
-        Parameter(0, "BODY_TEMPLATE_PATH", "Body template path", "Path of body template file",
-                  ParameterType.STRING),
-        Parameter(0, "FOOTER_TEMPLATE_PATH", "Footer template path", "Path of footer template file",
-                  ParameterType.STRING)
-    ]
+    parameters = [Parameter(0, "PDF_TEMPLATE_PATH", "Template path", "Path of header template file", ParameterType.STRING)]
 
     parameters.extend(BasePresenter.parameters)
 
     def generate(self, presenter_input):
+        """Generate PDF document.
+
+        Args:
+            presenter_input (_type_): Parameters from settings
 
+        Returns:
+            dict: mime type and base64 encoded data of the generated PDF document
+        """
         try:
             temporary_directory = tempfile.gettempdir() + "/"
-            output_body_html = temporary_directory + 'pdf_body.html'
-            output_pdf = temporary_directory + 'pdf_report__' + datetime.datetime.now().strftime(
-                "%d-%m-%Y_%H:%M") + '.pdf'
+            output_html = temporary_directory + "pdf_body.html"
+            output_pdf = temporary_directory + "pdf_report__" + datetime.datetime.now().strftime("%d-%m-%Y_%H:%M") + ".pdf"
 
-            pdf_header_template = presenter_input.parameter_values_map['HEADER_TEMPLATE_PATH']
-            pdf_footer_template = presenter_input.parameter_values_map['FOOTER_TEMPLATE_PATH']
-            head, tail = os.path.split(presenter_input.parameter_values_map['BODY_TEMPLATE_PATH'])
+            head, tail = os.path.split(presenter_input.parameter_values_map["PDF_TEMPLATE_PATH"])
 
             input_data = BasePresenter.generate_input_data(presenter_input)
 
             env = jinja2.Environment(loader=jinja2.FileSystemLoader(head))
             env.filters["strfdate"] = BasePresenter._filter_datetime
-            body = env.get_template(tail)
-            output_text = body.render(data=input_data)
-            with open(output_body_html, 'w') as output_file:
+            pdf = env.get_template(tail)
+            output_text = pdf.render(data=input_data)
+            with open(output_html, "w") as output_file:
                 output_file.write(output_text)
 
             if not os.path.exists(temporary_directory):
                 os.mkdir(temporary_directory)
 
-            options = {
-                'dpi': 500,
-                'page-size': 'A4',
-                'margin-top': '1.55in',
-                'margin-right': '0.75in',
-                'margin-bottom': '1.55in',
-                'margin-left': '0.75in',
-                'encoding': "UTF-8",
-                'header-html': pdf_header_template,
-                'footer-html': pdf_footer_template,
-                'custom-header': [
-                    ('Accept-Encoding', 'gzip')
-                ],
-                'no-outline': None,
-                'enable-local-file-access': None
-            }
-
-            pdfkit.from_file(input=output_body_html, output_path=output_pdf, options=options)
-
-            encoding = 'UTF-8'
+            # options = {
+            #     'dpi': 500,
+            #     'page-size': 'A4',
+            #     'margin-top': '1.55in',
+            #     'margin-right': '0.75in',
+            #     'margin-bottom': '1.55in',
+            #     'margin-left': '0.75in',
+            #     'encoding': "UTF-8",
+            #     'header-html': pdf_header_template,
+            #     'footer-html': pdf_footer_template,
+            #     'custom-header': [
+            #         ('Accept-Encoding', 'gzip')
+            #     ],
+            #     'no-outline': None,
+            #     'enable-local-file-access': None
+            # }
+            HTML(output_html).write_pdf(output_pdf)
+
+            encoding = "UTF-8"
             file = output_pdf
 
-            with open(file, 'rb') as open_file:
+            with open(file, "rb") as open_file:
                 byte_content = open_file.read()
 
             base64_bytes = b64encode(byte_content)
 
             data = base64_bytes.decode(encoding)
 
-            presenter_output = {
-                'mime_type': 'application/pdf',
-                'data': data
-            }
+            presenter_output = {"mime_type": "application/pdf", "data": data}
 
-            os.remove(output_body_html)
+            os.remove(output_html)
             os.remove(file)
 
             return presenter_output
         except Exception as error:
             BasePresenter.print_exception(self, error)
-            presenter_output = {
-                'mime_type': 'text/plain',
-                'data': b64encode(("TEMPLATING ERROR\n"+str(error)).encode()).decode('UTF-8')
-            }
+            presenter_output = {"mime_type": "text/plain", "data": b64encode(("TEMPLATING ERROR\n" + str(error)).encode()).decode("UTF-8")}
             return presenter_output
diff --git a/src/presenters/requirements.txt b/src/presenters/requirements.txt
index 7d4b125d3..bebd77dd8 100644
--- a/src/presenters/requirements.txt
+++ b/src/presenters/requirements.txt
@@ -1,17 +1,10 @@
-Flask==1.1.4
-Flask-Cors==3.0.10
-Flask-RESTful==0.3.7
-gevent==21.8.0
-greenlet==1.1.1
-gunicorn==20.0.4
-Jinja2==2.11.3
-MarkupSafe==1.1.0
-marshmallow==3.18.0
+Flask==3.0.0
+Flask-Cors==4.0.0
+Flask-RESTful==0.3.10
+gevent==23.9.1
+gunicorn==21.2.0
+Jinja2==3.1.2
+marshmallow==3.20.1
 marshmallow-enum==1.5.1
-pdfkit==0.6.1
-PyJWT==1.7.1
-python-dotenv==0.10.5
-pytz==2019.3
-PyYAML==6.0.1
-six==1.14.0
-Werkzeug==0.16.0
+python-dotenv==1.0.0
+weasyprint==60.1
diff --git a/src/presenters/templates/images/taranis.svg b/src/presenters/templates/images/taranis.svg
new file mode 100644
index 000000000..2801b9584
--- /dev/null
+++ b/src/presenters/templates/images/taranis.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="50" viewBox="0 0 435 84"
+     style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="taranis-logo" >
+        <path id="Taranis"
+            d="M355.998,61.705l-32,0l-4,-4l0,-8l8,0l0,4l24,0l0,-8l-28,0l-4,-4l0,-16l4,-4l32,0l4,4l0,8l-8,0l0,-4l-24,0l0,8l28,0l4,4l0,16l-4,4Zm-42,0l-8,0l0,-40l8,0l0,40Zm-92,0l-8,0l0,-40l26,0l14,14l0,26l-8,0l0,-8l-24,0l0,8Zm-60,0l-8,0l0,-8l-24,0l0,8l-8,0l0,-26l14,-14l26,0l0,40Zm106,0l-8,0l0,-40l8,0l24,28l0,-28l8,0l0,40l-8,0l-24,-28l0,28Zm-92,0l-8,0l0,-40l32,0l8,8l0,16l-4,4l4,4l0,8l-8,0l0,-4l-4,-4l-20,0l0,8Zm-54,-32l-16,0l0,32l-8,0l0,-32l-16,0l0,-8l40,0l0,8Zm302.795,-2c1.217,0 2.205,0.988 2.205,2.205l0,23.591c0,1.216 -0.988,2.204 -2.205,2.204l-45.591,0c-1.216,0 -2.204,-0.988 -2.204,-2.204l0,-23.591c0,-1.217 0.988,-2.205 2.204,-2.205l45.591,0Zm-270.795,2l-14,0l-10,10l0,6l24,0l0,-16Zm42,0l-20,0l0,16l20,0l4,-4l0,-8l-4,-4Zm40,0l-14,0l0,16l24,0l0,-6l-10,-10Z"
+        />
+        <path id="NG"
+            d="M420.998,31.705l2,2l0,4l-4,0l0,-2l-12,0l0,12l12,0l0,-4l-6,0l0,-4l10,0l0,12l-18,0l-2,-2l0,-16l2,-2l16,0Zm-36,20l-4,0l0,-20l4,0l12,14l0,-14l4,0l0,20l-4,0l-12,-14l0,14Z"
+            style="fill:#fff;"
+        />
+        <path id="Logo"
+            d="M51.249,31.04c-1.668,-2.343 -1.452,-5.619 0.648,-7.72c2.342,-2.341 6.144,-2.341 8.486,0c2.341,2.342 2.341,6.144 0,8.486c-2.101,2.1 -5.377,2.316 -7.72,0.648l-4.345,4.345c2.238,2.877 2.238,6.935 0,9.812l4.345,4.345c2.343,-1.668 5.619,-1.452 7.72,0.649c2.341,2.341 2.341,6.143 0,8.485c-2.101,2.101 -5.377,2.317 -7.72,0.648l-4.345,4.346c2.441,3.137 2.219,7.68 -0.663,10.562c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.191 0,-11.313c2.883,-2.883 7.426,-3.104 10.563,-0.664l4.345,-4.345c-1.477,-2.074 -1.477,-4.88 0,-6.953l-4.345,-4.346c-3.137,2.441 -7.68,2.22 -10.563,-0.663c-1.306,-1.306 -2.066,-2.954 -2.279,-4.657l-12.412,0c-0.213,1.703 -0.973,3.351 -2.28,4.657c-3.122,3.122 -8.191,3.122 -11.313,0c-3.122,-3.122 -3.122,-8.192 0,-11.314c3.122,-3.122 8.191,-3.122 11.313,0c1.307,1.307 2.067,2.954 2.28,4.657l12.412,0c0.213,-1.703 0.973,-3.35 2.279,-4.657c2.883,-2.882 7.426,-3.103 10.563,-0.663l4.345,-4.345Zm-13.494,34.707c2.342,-2.342 6.144,-2.342 8.486,0c2.341,2.341 2.341,6.144 0,8.485c-2.342,2.342 -6.144,2.342 -8.486,0c-2.341,-2.341 -2.341,-6.144 0,-8.485Zm-15.556,-15.557c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.123 3.122,8.192 0,11.314c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.191 0,-11.314Zm1.414,1.415c2.342,-2.342 6.144,-2.342 8.485,0c2.342,2.341 2.342,6.143 0,8.485c-2.341,2.342 -6.143,2.342 -8.485,0c-2.341,-2.342 -2.341,-6.144 0,-8.485Zm41.012,-15.557c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.122 3.122,8.192 0,11.314c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.192 0,-11.314Zm1.415,1.415c2.341,-2.342 6.143,-2.342 8.485,0c2.341,2.341 2.341,6.143 0,8.485c-2.342,2.341 -6.144,2.341 -8.485,0c-2.342,-2.342 -2.342,-6.144 0,-8.485Zm-28.285,0c2.342,-2.342 6.144,-2.342 8.486,0c2.341,2.341 2.341,6.143 0,8.485c-2.342,2.341 -6.144,2.341 -8.486,0c-2.341,-2.342 -2.341,-6.144 0,-8.485Zm-28.284,0c2.342,-2.342 6.144,-2.342 8.485,0c2.342,2.341 2.342,6.143 0,8.485c-2.341,2.341 -6.143,2.341 -8.485,0c-2.342,-2.342 -2.342,-6.144 0,-8.485Zm26.207,-19.136c-2.441,-3.137 -2.22,-7.68 0.663,-10.563c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.122 3.122,8.192 0,11.314c-2.883,2.882 -7.426,3.104 -10.563,0.663l-4.345,4.345c1.668,2.343 1.452,5.619 -0.649,7.72c-2.341,2.341 -6.143,2.341 -8.485,0c-2.341,-2.342 -2.341,-6.144 0,-8.486c2.101,-2.1 5.377,-2.316 7.72,-0.648l4.345,-4.345Zm2.077,-9.149c2.342,-2.341 6.144,-2.341 8.486,0c2.341,2.342 2.341,6.144 0,8.486c-2.342,2.341 -6.144,2.341 -8.486,0c-2.341,-2.342 -2.341,-6.144 0,-8.486Z"
+            style="fill:#3f92dd;fill-rule:evenodd;"
+        />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/presenters/templates/pdf_body_template.html b/src/presenters/templates/pdf_body_template.html
deleted file mode 100644
index 888292da2..000000000
--- a/src/presenters/templates/pdf_body_template.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title></title>
-    <link rel="stylesheet" type="text/css" href="/app/templates/css/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="/app/templates/css/custom.css">
-</head>
-<body>
-      <svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="50" viewBox="0 0 435 84" class="logo"
-         style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-        <style>
-             #taranis-logo {
-                   --color-1: #000;
-                   --color-3: #256ec2;
-                   --color-2: #fff;
-             }
-        </style>
-        <g id="taranis-logo" >
-            <path fill="var(--color-1)" d="M355.998,61.705l-32,0l-4,-4l0,-8l8,0l0,4l24,0l0,-8l-28,0l-4,-4l0,-16l4,-4l32,0l4,4l0,8l-8,0l0,-4l-24,0l0,8l28,0l4,4l0,16l-4,4Zm-42,0l-8,0l0,-40l8,0l0,40Zm-92,0l-8,0l0,-40l26,0l14,14l0,26l-8,0l0,-8l-24,0l0,8Zm-60,0l-8,0l0,-8l-24,0l0,8l-8,0l0,-26l14,-14l26,0l0,40Zm106,0l-8,0l0,-40l8,0l24,28l0,-28l8,0l0,40l-8,0l-24,-28l0,28Zm-92,0l-8,0l0,-40l32,0l8,8l0,16l-4,4l4,4l0,8l-8,0l0,-4l-4,-4l-20,0l0,8Zm-54,-32l-16,0l0,32l-8,0l0,-32l-16,0l0,-8l40,0l0,8Zm302.795,-2c1.217,0 2.205,0.988 2.205,2.205l0,23.591c0,1.216 -0.988,2.204 -2.205,2.204l-45.591,0c-1.216,0 -2.204,-0.988 -2.204,-2.204l0,-23.591c0,-1.217 0.988,-2.205 2.204,-2.205l45.591,0Zm-270.795,2l-14,0l-10,10l0,6l24,0l0,-16Zm42,0l-20,0l0,16l20,0l4,-4l0,-8l-4,-4Zm40,0l-14,0l0,16l24,0l0,-6l-10,-10Z"/>
-            <path fill="var(--color-2)" d="M420.998,31.705l2,2l0,4l-4,0l0,-2l-12,0l0,12l12,0l0,-4l-6,0l0,-4l10,0l0,12l-18,0l-2,-2l0,-16l2,-2l16,0Zm-36,20l-4,0l0,-20l4,0l12,14l0,-14l4,0l0,20l-4,0l-12,-14l0,14Z"/>
-            <path fill="var(--color-3)" d="M51.249,31.04c-1.668,-2.343 -1.452,-5.619 0.648,-7.72c2.342,-2.341 6.144,-2.341 8.486,0c2.341,2.342 2.341,6.144 0,8.486c-2.101,2.1 -5.377,2.316 -7.72,0.648l-4.345,4.345c2.238,2.877 2.238,6.935 0,9.812l4.345,4.345c2.343,-1.668 5.619,-1.452 7.72,0.649c2.341,2.341 2.341,6.143 0,8.485c-2.101,2.101 -5.377,2.317 -7.72,0.648l-4.345,4.346c2.441,3.137 2.219,7.68 -0.663,10.562c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.191 0,-11.313c2.883,-2.883 7.426,-3.104 10.563,-0.664l4.345,-4.345c-1.477,-2.074 -1.477,-4.88 0,-6.953l-4.345,-4.346c-3.137,2.441 -7.68,2.22 -10.563,-0.663c-1.306,-1.306 -2.066,-2.954 -2.279,-4.657l-12.412,0c-0.213,1.703 -0.973,3.351 -2.28,4.657c-3.122,3.122 -8.191,3.122 -11.313,0c-3.122,-3.122 -3.122,-8.192 0,-11.314c3.122,-3.122 8.191,-3.122 11.313,0c1.307,1.307 2.067,2.954 2.28,4.657l12.412,0c0.213,-1.703 0.973,-3.35 2.279,-4.657c2.883,-2.882 7.426,-3.103 10.563,-0.663l4.345,-4.345Zm-13.494,34.707c2.342,-2.342 6.144,-2.342 8.486,0c2.341,2.341 2.341,6.144 0,8.485c-2.342,2.342 -6.144,2.342 -8.486,0c-2.341,-2.341 -2.341,-6.144 0,-8.485Zm-15.556,-15.557c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.123 3.122,8.192 0,11.314c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.191 0,-11.314Zm1.414,1.415c2.342,-2.342 6.144,-2.342 8.485,0c2.342,2.341 2.342,6.143 0,8.485c-2.341,2.342 -6.143,2.342 -8.485,0c-2.341,-2.342 -2.341,-6.144 0,-8.485Zm41.012,-15.557c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.122 3.122,8.192 0,11.314c-3.122,3.122 -8.192,3.122 -11.314,0c-3.122,-3.122 -3.122,-8.192 0,-11.314Zm1.415,1.415c2.341,-2.342 6.143,-2.342 8.485,0c2.341,2.341 2.341,6.143 0,8.485c-2.342,2.341 -6.144,2.341 -8.485,0c-2.342,-2.342 -2.342,-6.144 0,-8.485Zm-28.285,0c2.342,-2.342 6.144,-2.342 8.486,0c2.341,2.341 2.341,6.143 0,8.485c-2.342,2.341 -6.144,2.341 -8.486,0c-2.341,-2.342 -2.341,-6.144 0,-8.485Zm-28.284,0c2.342,-2.342 6.144,-2.342 8.485,0c2.342,2.341 2.342,6.143 0,8.485c-2.341,2.341 -6.143,2.341 -8.485,0c-2.342,-2.342 -2.342,-6.144 0,-8.485Zm26.207,-19.136c-2.441,-3.137 -2.22,-7.68 0.663,-10.563c3.122,-3.122 8.192,-3.122 11.314,0c3.122,3.122 3.122,8.192 0,11.314c-2.883,2.882 -7.426,3.104 -10.563,0.663l-4.345,4.345c1.668,2.343 1.452,5.619 -0.649,7.72c-2.341,2.341 -6.143,2.341 -8.485,0c-2.341,-2.342 -2.341,-6.144 0,-8.486c2.101,-2.1 5.377,-2.316 7.72,-0.648l4.345,-4.345Zm2.077,-9.149c2.342,-2.341 6.144,-2.341 8.486,0c2.341,2.342 2.341,6.144 0,8.486c-2.342,2.341 -6.144,2.341 -8.486,0c-2.341,-2.342 -2.341,-6.144 0,-8.486Z"/>
-        </g>
-    </svg>	
-
-    <div style="padding-top: 30pt">
-
-        {% for report_item in data.report_items %}
-        <table class="table table-bordered header_info" style="width: 100%">
-
-            <tr>
-                <th colspan="6" class="th_data" style="color:white; background-color: #256ec2 !important">CONFIDENTIALITY, DISTRIBUTION, SEVERITY</th>
-            </tr>
-            <tr class="table-row">
-		    <td class="w25 py-0">
-                    <div class="mt-2 text_bold">Confidentiality</div>
-                </td>
-                <td class="w15 py-0">
-                    <div class="mt-2">
-                      <label class="checkbox-button">
-                        <input type="checkbox" class="checkbox-button__input" id="low" name="low" {% if report_item.attrs.confidentiality == 'UNRESTRICTED' %}checked{% endif %}>
-                        <span class="checkbox-button__control"></span>
-                        <span class="checkbox-button__label">Unrestricted</span>
-                      </label>
-                    </div>
-                </td>
-                <td class="w15 py-0">
-                    <div class="mt-2">
-                      <label class="checkbox-button">
-                        <input type="checkbox" class="checkbox-button__input" id="middle" name="middle" {% if report_item.attrs.confidentiality == 'CLASSIFIED' %}checked{% endif %}>
-                        <span class="checkbox-button__control"></span>
-                        <span class="checkbox-button__label">Classified</span>
-                      </label>
-                    </div>
-                </td>
-                <td class="w15 py-0">
-                    <div class="mt-2">
-                      <label class="checkbox-button">
-                        <input type="checkbox" class="checkbox-button__input" id="high" name="high" {% if report_item.attrs.confidentiality == 'CONFIDENTIAL' %}checked{% endif %}>
-                        <span class="checkbox-button__control"></span>
-                        <span class="checkbox-button__label">Confidential</span>
-                      </label>
-                    </div>
-                </td>
-                <td class="w15 py-0">
-                    <div class="mt-2">
-                      <label class="checkbox-button">
-                        <input type="checkbox" class="checkbox-button__input" id="critical" name="critical" {% if report_item.attrs.confidentiality == 'SECRET' %}checked{% endif %}>
-                        <span class="checkbox-button__control"></span>
-                        <span class="checkbox-button__label">Secret</span>
-                      </label>
-                    </div>
-                </td>
-                <td class="w15 py-0">
-                    <div class="mt-2">
-                      <label class="checkbox-button">
-                        <input type="checkbox" class="checkbox-button__input" id="critical" name="critical" {% if report_item.attrs.confidentiality == 'TOP SECRET' %}checked{% endif %}>
-                        <span class="checkbox-button__control"></span>
-                        <span class="checkbox-button__label">Top Secret</span>
-                      </label>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-		    <td class="w25 py-0">
-                    <div class="mt-2 text_bold">TLP</div>
-                </td>
-		<td class="mt-2" colspan="5">
-			{% if report_item.attrs.tlp == 'CLEAR' or report_item.attrs.tlp == 'WHITE' %}
-			<span style="padding: 4px; background-color: black !important; color:white; font-weight: 700">TLP:CLEAR</span>
-			{% endif %}
-			{% if report_item.attrs.tlp == 'GREEN' %}
-			<span style="padding: 4px; background-color: black !important; color:#33ff00; font-weight: 700">TLP:GREEN</span>
-			{% endif %}
-			{% if report_item.attrs.tlp == 'AMBER' %}
-			<span style="padding: 4px; background-color: black !important; color:#ffc000; font-weight: 700">TLP:AMBER</span>
-			{% endif %}
-			{% if report_item.attrs.tlp == 'AMBER+STRICT' %}
-			<span style="padding: 4px; background-color: black !important; color:#ffc000; font-weight: 700">TLP:AMBER+STRICT</span>
-			{% endif %}
-			{% if report_item.attrs.tlp == 'RED' %}
-			<span style="padding: 4px; background-color: black !important; color:#ff2b2b; font-weight: 700">TLP:RED</span>
-			{% endif %}
-		</td>
-	    </tr><tr>
-			<td class="w25 py-0">
-			    <div class="mt-2 text_bold">CVSS vector</div>
-		    </td>
-		    <td class="py-0" colspan="5">
-                    <div class="mt-2"><span class="cvss">{{ report_item.attrs.cvss|e }} </span></div>
-	    </td></tr>
-        </table>
-
-        <br>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">DESCRIPTION</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {{ report_item.attrs.description|e }}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">PUBLISHED</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {{ report_item.attrs.exposure_date }}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">UPDATED</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {{ report_item.attrs.update_date }}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">CVE</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {% if report_item.attrs.cve %}
-		    {% for i in report_item.attrs.cve %}
-		    <div>{{ i|e }}</div>
-		    {% endfor %}
-		    {% endif %}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">IMPACT</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {% if report_item.attrs.impact %}
-		    {% for i in report_item.attrs.impact %}
-		    <div>{{ i|e }}</div>
-		    {% endfor %}
-		    {% endif %}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">IOC</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {% if report_item.attrs.ioc %}
-		    {% for i in report_item.attrs.ioc %}
-		    <div>{{ i|e }}</div>
-		    {% endfor %}
-		    {% endif %}
-                </td>
-            </tr>
-        </table>
-
-       <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">AFFECTED SYSTEMS</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {% if report_item.attrs.affected_systems %}
-		    {% for i in report_item.attrs.affected_systems %}
-		    <div>{{ i|e }}</div>
-		    {% endfor %}
-		    {% endif %}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">RECOMMENDATIONS</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    {{ report_item.attrs.recommendations }}
-                </td>
-            </tr>
-        </table>
-
-        <table class="table table-bordered">
-            <tr>
-                <th class="th_data" style="color:white; background-color: #256ec2 !important">LINKS</th>
-            </tr>
-            <tr>
-                <td class="text-justify text_in_tab">
-                    <ul class="list-unstyled">
-			    {% if report_item.attrs.links %}
-			    {% for i in report_item.attrs.links %}
-			    <div>{{ i|e }}</div>
-			    {% endfor %}
-			    {% endif %}
-                    </ul>
-                </td>
-            </tr>
-        </table>
- {% endfor %}
-    </div>
-</body>
-</html>
diff --git a/src/presenters/templates/pdf_footer_template.html b/src/presenters/templates/pdf_footer_template.html
deleted file mode 100644
index b2a8997e5..000000000
--- a/src/presenters/templates/pdf_footer_template.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-   <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="/app/taranis-ng-presenters/templates/css/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="/app/taranis-ng-presenters/templates/css/custom.css">
-</head>
-<body>
-
-    <div>
-        <br>
-        <table class="table table-borderless">
-            <tr class="footer_text footer_color">
-                <td class="w30 py-0 text_bold">Created by Taranis NG</td>
-                <td class="w40 py-0 text-center info">Repo: <a href="https://github.com/SK-CERT/Taranis-NG/">github.com/SK-CERT/Taranis-NG</a></td>
-                <td class="w30 py-0 text-right text_bold">Company name</td>
-            </tr>
-            <tr class="footer_text">
-                <td class="w30 py-0">OSINT analysis tool</td>
-                <td class="w40 py-0 text-center info">E-mail: sk-cert@nbu.gov.sk</td>
-                <td class="w30 py-0 text-right">Company address</td>
-            </tr>
-            <tr class="footer_text">
-                <td class="w30 py-0">for CSIRT community</td>
-                <td class="w40 py-0 text-center info">Web: <a href="https://www.sk-cert.sk">www.sk-cert.sk</a></td>
-                <td class="w30 py-0 text-right">City name</td>
-            </tr>
-        </table>
-    </div>
-
-</body>
-</html>
diff --git a/src/presenters/templates/pdf_header_template.html b/src/presenters/templates/pdf_header_template.html
deleted file mode 100644
index 76c3109bd..000000000
--- a/src/presenters/templates/pdf_header_template.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-   <meta charset="UTF-8">
-    <link rel="stylesheet" type="text/css" href="/app/taranis-ng-presenters/templates/css/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="/app/taranis-ng-presenters/templates/css/custom.css">
-</head>
-<body>
-
-    <div>
-        <table class="table table-borderless">
-            <tr>
-                <td class="w20"><img src="/app/taranis-ng-presenters/templates/images/taranis.png"></td>
-                <td class="w60 text-center align-middle sw_title">VULNERABILITY REPORT</td>
-                <td class="w20 sw_number">No: SW1234-ER/2</td>
-            </tr>
-        </table>
-        <br>
-    </div>
-
-</body>
-</html>
diff --git a/src/presenters/templates/pdf_template.html b/src/presenters/templates/pdf_template.html
new file mode 100644
index 000000000..45d55fd2e
--- /dev/null
+++ b/src/presenters/templates/pdf_template.html
@@ -0,0 +1,267 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link rel="stylesheet" type="text/css" href="/app/templates/css/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="/app/templates/css/custom.css">
+</head>
+
+<body>
+    <div>
+        <table class="table table-borderless">
+            <tr>
+                <td class="w20"><img src="/app/templates/images/taranis.svg"></td>
+                <td class="text-center align-middle sw_title">VULNERABILITY REPORT</td>
+            </tr>
+        </table>
+    </div>
+    <div>
+        {% for report_item in data.report_items %}
+        <table class="table table-bordered header_info" style="width: 100%">
+
+            <tr>
+                <th colspan="6" class="th_data" style="color:white; background-color: #256ec2 !important">
+                    CONFIDENTIALITY, DISTRIBUTION, SEVERITY</th>
+            </tr>
+            <tr class="table-row">
+                <td class="w25 py-0">
+                    <div class="mt-2 text_bold">Confidentiality</div>
+                </td>
+                <td class="w15 py-0">
+                    <div class="mt-2">
+                        <label class="checkbox-button">
+                            <input type="checkbox" class="checkbox-button__input" id="low" name="low" {% if
+                                report_item.attrs.confidentiality=='UNRESTRICTED' %}checked{% endif %}>
+                            <span class="checkbox-button__control"></span>
+                            <span class="checkbox-button__label">Unrestricted</span>
+                        </label>
+                    </div>
+                </td>
+                <td class="w15 py-0">
+                    <div class="mt-2">
+                        <label class="checkbox-button">
+                            <input type="checkbox" class="checkbox-button__input" id="middle" name="middle" {% if
+                                report_item.attrs.confidentiality=='CLASSIFIED' %}checked{% endif %}>
+                            <span class="checkbox-button__control"></span>
+                            <span class="checkbox-button__label">Classified</span>
+                        </label>
+                    </div>
+                </td>
+                <td class="w15 py-0">
+                    <div class="mt-2">
+                        <label class="checkbox-button">
+                            <input type="checkbox" class="checkbox-button__input" id="high" name="high" {% if
+                                report_item.attrs.confidentiality=='CONFIDENTIAL' %}checked{% endif %}>
+                            <span class="checkbox-button__control"></span>
+                            <span class="checkbox-button__label">Confidential</span>
+                        </label>
+                    </div>
+                </td>
+                <td class="w15 py-0">
+                    <div class="mt-2">
+                        <label class="checkbox-button">
+                            <input type="checkbox" class="checkbox-button__input" id="critical" name="critical" {% if
+                                report_item.attrs.confidentiality=='SECRET' %}checked{% endif %}>
+                            <span class="checkbox-button__control"></span>
+                            <span class="checkbox-button__label">Secret</span>
+                        </label>
+                    </div>
+                </td>
+                <td class="w15 py-0">
+                    <div class="mt-2">
+                        <label class="checkbox-button">
+                            <input type="checkbox" class="checkbox-button__input" id="critical" name="critical" {% if
+                                report_item.attrs.confidentiality=='TOP SECRET' %}checked{% endif %}>
+                            <span class="checkbox-button__control"></span>
+                            <span class="checkbox-button__label">Top Secret</span>
+                        </label>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td class="w25 py-0">
+                    <div class="mt-2 text_bold">TLP</div>
+                </td>
+                <td class="mt-2" colspan="5">
+                    {% if report_item.attrs.tlp == 'CLEAR' or report_item.attrs.tlp == 'WHITE' %}
+                    <span
+                        style="padding: 4px; background-color: black !important; color:white; font-weight: 700">TLP:CLEAR</span>
+                    {% endif %}
+                    {% if report_item.attrs.tlp == 'GREEN' %}
+                    <span
+                        style="padding: 4px; background-color: black !important; color:#33ff00; font-weight: 700">TLP:GREEN</span>
+                    {% endif %}
+                    {% if report_item.attrs.tlp == 'AMBER' %}
+                    <span
+                        style="padding: 4px; background-color: black !important; color:#ffc000; font-weight: 700">TLP:AMBER</span>
+                    {% endif %}
+                    {% if report_item.attrs.tlp == 'AMBER+STRICT' %}
+                    <span
+                        style="padding: 4px; background-color: black !important; color:#ffc000; font-weight: 700">TLP:AMBER+STRICT</span>
+                    {% endif %}
+                    {% if report_item.attrs.tlp == 'RED' %}
+                    <span
+                        style="padding: 4px; background-color: black !important; color:#ff2b2b; font-weight: 700">TLP:RED</span>
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td class="w25 py-0">
+                    <div class="mt-2 text_bold">CVSS vector</div>
+                </td>
+                <td class="py-0" colspan="5">
+                    <div class="mt-2"><span class="cvss">{{ report_item.attrs.cvss|e }} </span></div>
+                </td>
+            </tr>
+        </table>
+
+        <br>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">DESCRIPTION</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {{ report_item.attrs.description|e }}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">PUBLISHED</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {{ report_item.attrs.exposure_date }}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">UPDATED</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {{ report_item.attrs.update_date }}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">CVE</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {% if report_item.attrs.cve %}
+                    {% for i in report_item.attrs.cve %}
+                    <div>{{ i|e }}</div>
+                    {% endfor %}
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">IMPACT</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {% if report_item.attrs.impact %}
+                    {% for i in report_item.attrs.impact %}
+                    <div>{{ i|e }}</div>
+                    {% endfor %}
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">IOC</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {% if report_item.attrs.ioc %}
+                    {% for i in report_item.attrs.ioc %}
+                    <div>{{ i|e }}</div>
+                    {% endfor %}
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">AFFECTED SYSTEMS</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {% if report_item.attrs.affected_systems %}
+                    {% for i in report_item.attrs.affected_systems %}
+                    <div>{{ i|e }}</div>
+                    {% endfor %}
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">RECOMMENDATIONS</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    {{ report_item.attrs.recommendations }}
+                </td>
+            </tr>
+        </table>
+
+        <table class="table table-bordered">
+            <tr>
+                <th class="th_data" style="color:white; background-color: #256ec2 !important">LINKS</th>
+            </tr>
+            <tr>
+                <td class="text-justify text_in_tab">
+                    <ul class="list-unstyled">
+                        {% if report_item.attrs.links %}
+                        {% for i in report_item.attrs.links %}
+                        <div>{{ i|e }}</div>
+                        {% endfor %}
+                        {% endif %}
+                    </ul>
+                </td>
+            </tr>
+        </table>
+        {% endfor %}
+    </div>
+    <div>
+        <br>
+        <table class="table table-borderless">
+            <tr class="footer_text footer_color">
+                <td class="w30 py-0 text_bold">Created by Taranis NG</td>
+                <td class="w40 py-0 text-center info">Repo: <a
+                        href="https://github.com/SK-CERT/Taranis-NG/">github.com/SK-CERT/Taranis-NG</a></td>
+                <td class="w30 py-0 text-right text_bold">Company name</td>
+            </tr>
+            <tr class="footer_text">
+                <td class="w30 py-0">OSINT analysis tool</td>
+                <td class="w40 py-0 text-center info">E-mail: sk-cert@nbu.gov.sk</td>
+                <td class="w30 py-0 text-right">Company address</td>
+            </tr>
+            <tr class="footer_text">
+                <td class="w30 py-0">for CSIRT community</td>
+                <td class="w40 py-0 text-center info">Web: <a href="https://www.sk-cert.sk">www.sk-cert.sk</a></td>
+                <td class="w30 py-0 text-right">City name</td>
+            </tr>
+        </table>
+    </div>
+</body>
+
+</html>
diff --git a/src/publishers/managers/auth_manager.py b/src/publishers/managers/auth_manager.py
index c7d94a288..693900e91 100644
--- a/src/publishers/managers/auth_manager.py
+++ b/src/publishers/managers/auth_manager.py
@@ -1,11 +1,16 @@
+"""Authentication manager for the API.
+
+Returns:
+    _type_: _description_
+"""
 from functools import wraps
 from flask import request
 import os
 import ssl
 
-api_key = os.getenv('API_KEY')
+api_key = os.getenv("API_KEY")
 
-if os.getenv('SSL_VERIFICATION') == "False":
+if os.getenv("SSL_VERIFICATION") == "False":
     try:
         _create_unverified_https_context = ssl._create_unverified_context
     except AttributeError:
@@ -15,11 +20,18 @@
 
 
 def api_key_required(fn):
+    """Check if the API key is valid.
+
+    Args:
+        fn (function): _description_
+    Returns:
+        _type_: _description_
+    """
+
     @wraps(fn)
     def wrapper(*args, **kwargs):
-
-        if not request.headers.has_key('Authorization') or request.headers['Authorization'] != ('Bearer ' + api_key):
-            return {'error': 'not authorized'}, 401
+        if "Authorization" not in request.headers or request.headers["Authorization"] != ("Bearer " + api_key):
+            return {"error": "not authorized"}, 401
         else:
             return fn(*args, **kwargs)
 
diff --git a/src/publishers/managers/log_manager.py b/src/publishers/managers/log_manager.py
index f4f965464..b6cbd81ba 100644
--- a/src/publishers/managers/log_manager.py
+++ b/src/publishers/managers/log_manager.py
@@ -83,6 +83,9 @@ def log_critical(message):
         sys_logger = None
         log_debug("Unable to connect to syslog server!")
         log_debug(ex)
+else: 
+    # disable log duplicities on the screen if we have SYSLOG disabled
+    sys_logger = None
 
 def log_system_activity(module, message):
     log_info("[{}] {}".format(module, message))
diff --git a/src/publishers/managers/publishers_manager.py b/src/publishers/managers/publishers_manager.py
index df6a1fd38..133f6c8b2 100644
--- a/src/publishers/managers/publishers_manager.py
+++ b/src/publishers/managers/publishers_manager.py
@@ -1,4 +1,30 @@
+"""
+This module provides functionality for managing publishers in Taranis-NG.
+
+The publishers manager is responsible for registering publishers, retrieving information about registered publishers,
+and publishing data using the appropriate publisher based on the input.
+
+The module defines the following functions:
+- initialize(): Initializes the publishers by registering them.
+- register_publisher(publisher): Registers a publisher.
+- get_registered_publishers_info(): Retrieves information about the registered publishers.
+- publish(publisher_input_json): Publishes the given input using the appropriate publisher.
+
+The module also imports the following classes:
+- FTPPublisher: Represents an FTP publisher.
+- SFTPPublisher: Represents an SFTP publisher.
+- EMAILPublisher: Represents an email publisher.
+- TWITTERPublisher: Represents a Twitter publisher.
+- WORDPRESSPublisher: Represents a WordPress publisher.
+- MISPPublisher: Represents a MISP publisher.
+
+The module imports the following modules:
+- PublisherInputSchema: Provides a schema for validating the input JSON for publishers.
+- log_manager: Provides functionality for logging critical messages.
+"""
+
 from publishers.ftp_publisher import FTPPublisher
+from publishers.sftp_publisher import SFTPPublisher
 from publishers.email_publisher import EMAILPublisher
 from publishers.twitter_publisher import TWITTERPublisher
 from publishers.wordpress_publisher import WORDPRESSPublisher
@@ -10,7 +36,9 @@
 
 
 def initialize():
+    """Initialize the publishers by registering them."""
     register_publisher(FTPPublisher())
+    register_publisher(SFTPPublisher())
     register_publisher(EMAILPublisher())
     register_publisher(TWITTERPublisher())
     register_publisher(WORDPRESSPublisher())
@@ -18,20 +46,40 @@ def initialize():
 
 
 def register_publisher(publisher):
+    """
+    Register a publisher.
+
+    Args:
+        publisher: The publisher object to register.
+    """
     publishers[publisher.type] = publisher
 
 
 def get_registered_publishers_info():
+    """
+    Retrieve information about the registered publishers.
+
+    Returns:
+        A list of dictionaries containing information about each registered publisher.
+    """
     publishers_info = []
     for key in publishers:
         publishers_info.append(publishers[key].get_info())
     log_manager.log_critical(publishers_info)
 
-
     return publishers_info
 
 
 def publish(publisher_input_json):
+    """
+    Publish the given input using the appropriate publisher.
+
+    Args:
+        publisher_input_json: The JSON input for the publisher.
+
+    Raises:
+        ValidationError: If the input JSON is invalid.
+    """
     publisher_input_schema = PublisherInputSchema()
     publisher_input = publisher_input_schema.load(publisher_input_json)
     publishers[publisher_input.type].publish(publisher_input)
diff --git a/src/publishers/publishers/__init__.py b/src/publishers/publishers/__init__.py
index ea4b86df6..79bd71b72 100644
--- a/src/publishers/publishers/__init__.py
+++ b/src/publishers/publishers/__init__.py
@@ -1 +1,15 @@
-__all__ = ['base_publisher', 'ftp_publisher', 'email_publisher', 'twitter_publisher', 'wordpress_publisher']
+"""
+This module contains the publishers package.
+
+The publishers package provides various classes for publishing data to different platforms, including FTP, SFTP, email,
+Twitter, and WordPress.
+
+Classes:
+- base_publisher: The base class for all publishers.
+- ftp_publisher: A publisher for FTP.
+- sftp_publisher: A publisher for SFTP.
+- email_publisher: A publisher for email.
+- twitter_publisher: A publisher for Twitter.
+- wordpress_publisher: A publisher for WordPress.
+"""
+__all__ = ["base_publisher", "ftp_publisher", "sftp_publisher", "email_publisher", "twitter_publisher", "wordpress_publisher"]
diff --git a/src/publishers/publishers/ftp_publisher.py b/src/publishers/publishers/ftp_publisher.py
index f87bec1c0..2be397f25 100644
--- a/src/publishers/publishers/ftp_publisher.py
+++ b/src/publishers/publishers/ftp_publisher.py
@@ -1,15 +1,31 @@
+"""Publisher for publishing to FTP and SFTP server.
+
+Raises:
+    Exception: _description_
+"""
 import datetime
 import ftplib
 import os
 from base64 import b64decode
 from urllib.parse import urlsplit
 import paramiko
+import mimetypes
+
 
 from .base_publisher import BasePublisher
 from shared.schema.parameter import Parameter, ParameterType
 
 
 class FTPPublisher(BasePublisher):
+    """FTP Publisher class.
+
+    Arguments:
+        BasePublisher -- Publisher base class
+
+    Raises:
+        Exception: _description_
+    """
+
     type = "FTP_PUBLISHER"
     name = "FTP Publisher"
     description = "Publisher for publishing to FTP server"
@@ -19,27 +35,23 @@ class FTPPublisher(BasePublisher):
     parameters.extend(BasePublisher.parameters)
 
     def publish(self, publisher_input):
+        """Publish to FTP or SFTP server.
 
-        try:
-            ftp_url = publisher_input.parameter_values_map['FTP_URL']
+        Arguments:
+            publisher_input -- intput data for publisher
 
+        Raises:
+            Exception: _description_
+        """
+        try:
+            ftp_url = publisher_input.parameter_values_map["FTP_URL"]
             mime_type = publisher_input.mime_type[:]
-
-            filename = ''
-            if mime_type[:] == 'application/pdf':
-                filename = 'file_' + datetime.datetime.now().strftime("%d-%m-%Y_%H:%M") + '.pdf'
-            elif mime_type[:] == 'text/plain':
-                filename = 'file_' + datetime.datetime.now().strftime("%d-%m-%Y_%H:%M") + '.txt'
-            elif mime_type[:] == 'application/json':
-                filename = 'file_' + datetime.datetime.now().strftime("%d-%m-%Y_%H:%M") + '.json'
-            elif mime_type[:] == 'text/html':
-                filename = 'file_' + datetime.datetime.now().strftime("%d-%m-%Y_%H:%M") + '.html'
-
+            file_extension = mimetypes.guess_extension(mime_type)
+            filename = f"file_{datetime.datetime.now().strftime('%d-%m-%Y_%H:%M')}{file_extension}"
             data = publisher_input.data[:]
-
             bytes_data = b64decode(data, validate=True)
 
-            f = open(filename, 'wb')
+            f = open(filename, "wb")
             f.write(bytes_data)
             f.close()
 
@@ -51,7 +63,7 @@ def publish(self, publisher_input):
 
             remote_path = ftp_data.path + filename
 
-            if ftp_data.scheme == 'sftp':
+            if ftp_data.scheme == "sftp":
                 ssh_port = ftp_data.port if ftp_data.port else 22
                 ssh = paramiko.SSHClient()
                 ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@@ -59,15 +71,15 @@ def publish(self, publisher_input):
                 sftp = ssh.open_sftp()
                 sftp.put(filename, remote_path)
                 sftp.close()
-            elif ftp_data.scheme == 'ftp':
+            elif ftp_data.scheme == "ftp":
                 ftp_port = ftp_data.port if ftp_data.port else 21
                 ftp = ftplib.FTP()
                 ftp.connect(host=ftp_hostname, port=ftp_port)
                 ftp.login(ftp_username, ftp_password)
-                ftp.storbinary('STOR ' + remote_path, open(filename, 'rb'))
+                ftp.storbinary("STOR " + remote_path, open(filename, "rb"))
                 ftp.quit()
             else:
-              raise Exception("Schema '{}' not supported, choose 'ftp' or 'sftp'".format(ftp_data.scheme))
+                raise Exception("Schema '{}' not supported, choose 'ftp' or 'sftp'".format(ftp_data.scheme))
         except Exception as error:
             BasePublisher.print_exception(self, error)
         finally:
diff --git a/src/publishers/publishers/sftp_publisher.py b/src/publishers/publishers/sftp_publisher.py
new file mode 100644
index 000000000..b789e85a4
--- /dev/null
+++ b/src/publishers/publishers/sftp_publisher.py
@@ -0,0 +1,154 @@
+"""Publisher for SFTP server."""
+from datetime import datetime
+from base64 import b64decode
+import paramiko
+import mimetypes
+from io import BytesIO
+import os
+
+from managers import log_manager
+from .base_publisher import BasePublisher
+from shared.schema.parameter import Parameter, ParameterType
+
+
+class SFTPPublisher(BasePublisher):
+    """SFTP Publisher class.
+
+    This class represents a publisher that publishes data to an SFTP server.
+
+    Attributes:
+        type (str): The type of the publisher.
+        name (str): The name of the publisher.
+        description (str): The description of the publisher.
+        parameters (list): The list of parameters required for the publisher.
+
+    Methods:
+        publish(publisher_input): Publishes data to the SFTP server.
+
+    """
+
+    type = "SFTP_PUBLISHER"
+    name = "SFTP Publisher"
+    description = "Publisher for publishing to SFTP server"
+
+    parameters = [
+        Parameter(0, "SFTP_URL", "SFTP URL", "SFTP server URL", ParameterType.STRING),
+        Parameter(0, "PORT", "SSH port", "Port remote machine is using for SSH (default 22)", ParameterType.STRING),
+        Parameter(0, "SSH_KEY", "SSH key", "Private key which should be used for SSH connection", ParameterType.STRING),
+        Parameter(0, "SSH_KEY_PASSWORD", "SSH key password", "Password for the SSH private key", ParameterType.STRING),
+        Parameter(0, "USERNAME", "Username", "Username for SFTP", ParameterType.STRING),
+        Parameter(0, "PASSWORD", "Password", "Password for SFTP", ParameterType.STRING),
+        Parameter(
+            0,
+            "PATH",
+            "Remote path",
+            "Either absolute or relative path where the file should be saved on the remote machine",
+            ParameterType.STRING,
+        ),
+        Parameter(
+            0,
+            "FILENAME",
+            "Filename",
+            "Custom mame of the transported file without extension (default file_%d-%m-%Y_%H:%M)",
+            ParameterType.STRING,
+        ),
+        Parameter(0, "COMMAND", "Command", "Command to be executed on the remote machine", ParameterType.STRING),
+    ]
+    parameters.extend(BasePublisher.parameters)
+
+    def publish(self, publisher_input):
+        """Publish to SFTP server.
+
+        This method publishes the data to the SFTP server based on the provided input.
+
+        Args:
+            publisher_input (PublisherInput): The input data for the publisher.
+
+        Raises:
+            Exception: If there is an error during the publishing process.
+
+        """
+        url = publisher_input.parameter_values_map["SFTP_URL"]
+        port = publisher_input.parameter_values_map["PORT"]
+        username = publisher_input.parameter_values_map["USERNAME"]
+        password = publisher_input.parameter_values_map["PASSWORD"]
+        path = publisher_input.parameter_values_map["PATH"]
+        filename = publisher_input.parameter_values_map["FILENAME"]
+        command = publisher_input.parameter_values_map["COMMAND"]
+        ssh_key = publisher_input.parameter_values_map["SSH_KEY"]
+        ssh_key_password = publisher_input.parameter_values_map["SSH_KEY_PASSWORD"]
+
+        now = datetime.now().strftime("%Y%m%d%H%M%S")
+
+        def _get_key(key_path, ssh_key_password=None):
+            try:
+                ssh_key = paramiko.RSAKey(filename=key_path, password=ssh_key_password)
+                return ssh_key
+            except paramiko.ssh_exception.SSHException:
+                pass
+            try:
+                ssh_key = paramiko.Ed25519Key(filename=key_path, password=ssh_key_password)
+                return ssh_key
+            except paramiko.ssh_exception.SSHException:
+                pass
+            try:
+                ssh_key = paramiko.ECDSAKey(filename=key_path, password=ssh_key_password)
+                return ssh_key
+            except paramiko.ssh_exception.SSHException:
+                pass
+            try:
+                ssh_key = paramiko.DSSKey(filename=key_path, password=ssh_key_password)
+                return ssh_key
+            except paramiko.ssh_exception.SSHException as error:
+                log_manager.log_critical(f"Issue with SSH key {key_path}")
+                log_manager.log_debug(f"Error: {error}")
+                return None
+
+        try:
+            # decide filename and extension
+            mime_type = publisher_input.mime_type[:]
+            file_extension = mimetypes.guess_extension(mime_type)
+            if filename:
+                filename = f"{filename}{file_extension}"
+            else:
+                filename = f"file_{now}{file_extension}"
+            full_path = os.path.join(path, filename)
+
+            # fill file with data
+            data = publisher_input.data[:]
+            bytes_data = b64decode(data, validate=True)
+            file_object = BytesIO(bytes_data)
+
+            # decide SFTP port
+            port = port if port else 22
+
+            # determine SSH key type
+            if ssh_key:
+                ssh_key = _get_key(ssh_key, ssh_key_password)
+            else:
+                ssh_key = None
+
+            ssh = paramiko.SSHClient()
+            ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+            if ssh_key:
+                ssh.connect(hostname=url, port=port, username=username, pkey=ssh_key)
+            else:
+                ssh.connect(hostname=url, port=port, username=username, password=password)
+            sftp = ssh.open_sftp()
+            log_manager.log_info(f"Successfully connected to {url} on port {port}")
+            try:
+                sftp.putfo(file_object, f"{full_path}", confirm=True)
+                log_manager.log_info(f"Successfully saved data to {full_path} on remote machine")
+            except Exception as error:
+                log_manager.log_critical(f"Failed to save data to {full_path} on remote machine")
+                log_manager.log_debug(f"Error: {error}")
+            if command:
+                try:
+                    ssh.exec_command(command)
+                    log_manager.log_info(f"Executed command {command} on remote machine")
+                except Exception as error:
+                    log_manager.log_critical(f"Failed to execute command {command} on remote machine")
+                    log_manager.log_debug(f"Error: {error}")
+            sftp.close()
+        except Exception as error:
+            BasePublisher.print_exception(self, error)
diff --git a/src/publishers/requirements.txt b/src/publishers/requirements.txt
index 74fbb9ec9..a2b70805e 100644
--- a/src/publishers/requirements.txt
+++ b/src/publishers/requirements.txt
@@ -1,29 +1,15 @@
-certifi==2023.5.7
 envelope==2.0.2
-Flask==1.1.4
-Flask-Cors==3.0.10
-Flask-RESTful==0.3.7
-gevent==21.8.0
-greenlet==1.1.1
-gunicorn==20.0.4
-httplib2==0.22.0
-idna==2.9
-marshmallow==3.18.0
+Flask==3.0.0
+Flask-Cors==4.0.0
+Flask-RESTful==0.3.10
+gevent==23.9.1
+gunicorn==21.2.0
+marshmallow==3.20.1
 marshmallow-enum==1.5.1
 oauth2client==4.1.3
-Jinja2==2.11.3
-M2Crypto==0.38.0
-MarkupSafe==1.1.0
-paramiko==3.2.0
-python-dateutil==2.8.1
-python-dotenv==0.10.3
-pytz==2019.3
-requests==2.26.0
-schedule==0.6.0
-six==1.13.0
-tweepy==3.10.0
-urllib3==1.26.7
-Werkzeug==0.16.0
-zope.event==4.4
-zope.interface==5.1.0
-pymisp==2.4.128
\ No newline at end of file
+paramiko==3.3.1
+python-dotenv==1.0.0
+requests==2.31.0
+tweepy==4.14.0
+urllib3==2.0.6
+pymisp==2.4.128
diff --git a/src/shared/shared/schema/apikey.py b/src/shared/shared/schema/apikey.py
index 63ee27298..edf56335f 100644
--- a/src/shared/shared/schema/apikey.py
+++ b/src/shared/shared/schema/apikey.py
@@ -17,7 +17,7 @@ class Meta:
 
 
 class ApiKeySchema(ApiKeyBaseSchema):
-    user = fields.Nested(UserSchemaBase)
+    user = fields.Nested(UserSchemaBase, exclude=("password",))
 
     @post_load
     def make(self, data, **kwargs):
diff --git a/src/shared/shared/schema/presenter.py b/src/shared/shared/schema/presenter.py
index 2727de543..6f205f900 100644
--- a/src/shared/shared/schema/presenter.py
+++ b/src/shared/shared/schema/presenter.py
@@ -43,6 +43,7 @@ class PresenterInputProductSchema(Schema):
     product_type = fields.Str()
     product_type_description = fields.Str()
     user = fields.Nested(UserSchemaBase, exclude=("password",))
+    id = fields.Str()
 
     @post_load
     def make(self, data, **kwargs):
@@ -91,7 +92,7 @@ def make(self, data, **kwargs):
 class PresenterInputProduct:
     """Real data holding object presented by PresenterInputProductSchema."""
 
-    def __init__(self, title, description, product_type, product_type_description, user):
+    def __init__(self, title, description, product_type, product_type_description, user, id):
         """Initialize the "presenter input product".
 
         Args:
@@ -106,6 +107,7 @@ def __init__(self, title, description, product_type, product_type_description, u
         self.product_type = product_type
         self.product_type_description = product_type_description
         self.user = user
+        self.id = id
 
     @classmethod
     def make_from_product(cls, product):
@@ -118,7 +120,7 @@ def make_from_product(cls, product):
             _type_: PresenterInputProduct object.
         """
         return PresenterInputProduct(
-            product.title, product.description, product.product_type.title, product.product_type.description, product.user
+            product.title, product.description, product.product_type.title, product.product_type.description, product.user, product.id
         )
 
 
diff --git a/src/shared/shared/schema/report_item.py b/src/shared/shared/schema/report_item.py
index fdfb35c7c..fb6723b47 100644
--- a/src/shared/shared/schema/report_item.py
+++ b/src/shared/shared/schema/report_item.py
@@ -24,7 +24,7 @@ class ReportItemAttributeSchema(ReportItemAttributeBaseSchema):
     last_updated = fields.DateTime("%d.%m.%Y - %H:%M")
     version = fields.Int()
     current = fields.Bool()
-    user = fields.Nested(UserSchemaBase)
+    user = fields.Nested(UserSchemaBase, exclude=("password",))
 
     @post_load
     def make(self, data, **kwargs):