diff --git a/.docker/Dockerfile b/.docker/Dockerfile
deleted file mode 100644
index 155d50b6b2..0000000000
--- a/.docker/Dockerfile
+++ /dev/null
@@ -1,128 +0,0 @@
-# Build stage
-FROM --platform=$TARGETPLATFORM php:8.3-fpm-alpine AS builder
-
-# Add QEMU for cross-platform builds
-COPY --from=tonistiigi/binfmt:latest /usr/bin/qemu-* /usr/bin/
-
-# Install build dependencies
-RUN apk add --no-cache --virtual .build-deps \
-    $PHPIZE_DEPS \
-    gcc \
-    g++ \
-    openssl-dev \
-    make \
-    libxml2-dev \
-    oniguruma-dev \
-    openldap-dev \
-    zstd-dev \
-    libzip-dev \
-    freetype-dev \
-    libpng-dev \
-    libjpeg-turbo-dev
-
-# Set cross-compilation flags if needed
-ARG TARGETPLATFORM
-RUN case "${TARGETPLATFORM}" in \
-        linux/arm64*) export CFLAGS='-march=armv8-a' CXXFLAGS='-march=armv8-a' ;; \
-    esac
-
-# Install and configure PHP extensions
-RUN set -ex; \
-    # Configure extensions
-    docker-php-ext-configure gd --with-freetype --with-jpeg; \
-    # Install extensions one by one to prevent memory issues
-    docker-php-ext-install mysqli && \
-    docker-php-ext-install pdo_mysql && \
-    docker-php-ext-install bcmath && \
-    docker-php-ext-install mbstring && \
-    docker-php-ext-install exif && \
-    docker-php-ext-install pcntl && \
-    docker-php-ext-install opcache && \
-    docker-php-ext-install ldap && \
-    docker-php-ext-install zip && \
-    pecl install redis && docker-php-ext-enable redis && \
-    docker-php-ext-install gd && \
-    rm -rf /tmp/* /var/cache/apk/*
-
-
-
-# Production stage
-FROM --platform=$TARGETPLATFORM php:8.3-fpm-alpine
-
-# Add production dependencies
-RUN apk add --no-cache \
-    tini \
-    nginx \
-    mysql-client \
-    openssl \
-    supervisor \
-    freetype \
-    libpng \
-    zstd-libs \
-    libjpeg-turbo \
-    libzip \
-    openldap \
-    icu-libs && \
-    rm -rf /var/cache/apk/* /tmp/*
-
-# Copy built extensions from builder
-COPY --from=builder /usr/local/lib/php/extensions/ /usr/local/lib/php/extensions/
-COPY --from=builder /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-
-# Add non-root user
-ARG PUID=1000
-ARG PGID=1000
-
-# Set working directory
-WORKDIR /var/www/html
-
-# Install Leantime
-ARG LEAN_VERSION
-RUN set -ex; \
-    curl -fsSL --retry 3 https://github.com/Leantime/leantime/releases/download/v${LEAN_VERSION}/Leantime-v${LEAN_VERSION}.tar.gz -o leantime.tar.gz && \
-    tar xzf leantime.tar.gz --strip-components 1 && \
-    rm leantime.tar.gz && \
-    chown -R www-data:www-data .
-
-# Set Permissions
-RUN set -ex; \
-    # Modify existing www-data user/group
-    deluser www-data; \
-    addgroup -g ${PGID} www-data; \
-    adduser -u ${PUID} -G www-data -h /home/www-data -s /bin/sh -D www-data; \
-    # Create required directories
-    mkdir -p /var/www/html/userfiles \
-            /var/www/html/public/userfiles \
-            /var/www/html/bootstrap/cache \
-            /var/www/html/storage/logs \
-            /var/www/html/storage/framework/cache \
-            /var/www/html/storage/framework/sessions \
-            /var/www/html/storage/framework/views \
-            /var/www/html/app/Plugins \
-            /run /var/log/nginx /var/lib/nginx; \
-    chown -R www-data:www-data /var/www/html /run /var/log/nginx /var/lib/nginx && \
-    chmod 775 /var/www/html/userfiles \
-               /var/www/html/public/userfiles \
-               /var/www/html/bootstrap/cache \
-               /var/www/html/storage/logs \
-               /var/www/html/storage/framework/cache \
-               /var/www/html/storage/framework/sessions \
-               /var/www/html/storage/framework/views \
-               /var/www/html/app/Plugins;
-
-# Copy configuration files
-COPY config/custom.ini /usr/local/etc/php/conf.d/
-COPY config/nginx.conf /etc/nginx/nginx.conf
-COPY config/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
-COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY --chmod=0755 start.sh /start.sh
-
-# Switch to non-root user
-USER www-data
-
-# Add healthcheck
-HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
-    CMD curl -f http://localhost:8080 || exit 1
-
-EXPOSE 8080
-ENTRYPOINT ["/sbin/tini", "--", "/start.sh"]
diff --git a/.docker/config/custom.ini b/.docker/config/custom.ini
deleted file mode 100644
index b6eaf95020..0000000000
--- a/.docker/config/custom.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-memory_limit = 1G
-max_execution_time = 300
-opcache.enable = 1
-opcache.jit=1255
-opcache.jit_buffer_size=128M
-
-; Optimized opcache settings
-opcache.memory_consumption=128
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=4000
-opcache.revalidate_freq=60
-opcache.fast_shutdown=1
-
-; Upload settings
-upload_max_filesize = 100M
-post_max_size = 100M
-
-; Session handling
-session.gc_maxlifetime = 28800
-
-; Error Handline
-display_errors = off
-log_errors = on
\ No newline at end of file
diff --git a/.docker/config/nginx.conf b/.docker/config/nginx.conf
deleted file mode 100644
index 20d3d6a4c2..0000000000
--- a/.docker/config/nginx.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-user www-data www-data;
-worker_processes auto;
-pid /run/nginx.pid;
-error_log /dev/stderr info;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    access_log  /dev/stdout;
-
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    types_hash_max_size 2048;
-    client_max_body_size 100M;
-
-    # SSL
-    ssl_protocols TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers on;
-    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-
-    # Security headers
-    add_header X-Frame-Options "DENY" always;
-    add_header X-XSS-Protection "1; mode=block; report=/xss-report" always;
-    add_header X-Content-Type-Options "nosniff" always;
-    add_header Referrer-Policy "no-referrer-when-downgrade" always;
-    add_header Content-Security-Policy "default-src 'self' http: https: data: blob: 'unsafe-inline'" always;
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-
-    server {
-        listen 8080;
-        server_name _;
-        root /var/www/html/public;
-        index index.php;
-
-        location / {
-            try_files $uri $uri/ /index.php?$query_string;
-        }
-
-        location ~ \.php$ {
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass 127.0.0.1:9000;
-            fastcgi_index index.php;
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param PATH_INFO $fastcgi_path_info;
-            fastcgi_read_timeout 300;
-        }
-
-        location ~ /\.ht {
-            deny all;
-        }
-
-        # additional config
-        # favicon.ico
-        location = /favicon.ico {
-            log_not_found off;
-            access_log off;
-        }
-
-        # robots.txt
-        location = /robots.txt {
-            log_not_found off;
-            access_log off;
-        }
-
-        location ^~ /dist/ {
-           expires 7d;
-           access_log off;
-       }
-
-        # Enable gzip compression
-        gzip on;
-        gzip_vary on;
-        gzip_min_length 1024;
-        gzip_proxied expired no-cache no-store private auth;
-        gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/javascript;
-        gzip_disable "MSIE [1-6]\.";
-    }
-}
diff --git a/.docker/config/php-fpm.conf b/.docker/config/php-fpm.conf
deleted file mode 100644
index 47b307edb0..0000000000
--- a/.docker/config/php-fpm.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[global]
-error_log = /proc/self/fd/2
-daemonize = no
-
-[www]
-user = www-data
-group = www-data
-
-listen = 127.0.0.1:9000
-listen.owner = www-data
-listen.group = www-data
-listen.mode = 0660
-
-pm = dynamic
-pm.max_children = 50
-pm.start_servers = 5
-pm.min_spare_servers = 5
-pm.max_spare_servers = 35
-pm.max_requests = 500
-
-clear_env = no
-
-catch_workers_output = yes
-decorate_workers_output = no
-
-chdir = /var/www/html
-php_admin_value[error_log] = /proc/self/fd/2
-php_admin_flag[log_errors] = on
diff --git a/.docker/config/supervisord.conf b/.docker/config/supervisord.conf
deleted file mode 100644
index ec289dfb21..0000000000
--- a/.docker/config/supervisord.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/dev/stdout
-loglevel=info
-logfile_maxbytes=0
-pidfile=/run/supervisord.pid
-
-[program:php-fpm]
-command=php-fpm -F
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autostart=true
-autorestart=true
-priority=5
-startretries=10
-
-[program:nginx]
-command=nginx -g 'daemon off;'
-autostart=true
-autorestart=true
-priority=10
-
-[program:scheduler]
-command=php /var/www/html/bin/leantime schedule:work
-autostart=true
-autorestart=true
-user=www-data
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
deleted file mode 100644
index e597c18f8f..0000000000
--- a/.docker/docker-compose.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-version: '3.3'
-
-services:
-  leantime_db:
-    image: mysql:8.4
-    container_name: mysql_leantime
-    volumes:
-      - db_data:/var/lib/mysql
-    restart: unless-stopped
-    env_file: ./.env                                        # Environment file with settings
-    networks:
-      - leantime-net
-    command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-
-  leantime:
-    image: leantime/leantime:3.4.12
-    restart: unless-stopped
-    env_file: ./.env                                        # Environment file with settings
-    # Add security options
-    security_opt:
-      - no-new-privileges:true
-    # Add capabilities
-    cap_add:
-      # - CAP_NET_BIND_SERVICE
-      - CAP_CHOWN
-      - CAP_SETGID
-      - CAP_SETUID
-    ports:
-      - "${LEAN_PORT:-8080}:8080"
-    networks:
-      - leantime-net
-    volumes:
-      - public_userfiles:/var/www/html/public/userfiles     # Volume to store public files, logo etc
-      - userfiles:/var/www/html/userfiles                   # Original volume name for compatibility
-      - plugins:/var/www/html/app/Plugins                   # Plugin storage
-      - logs:/var/www/html/storage/logs                     # Log storage
-    depends_on:
-      leantime_db:
-        condition: service_healthy
-
-  # Add a helper container for volume permissions
-  # Run via docker compose --profile mysql_helper up -d
-  mysql_helper:
-    image: mysql:8.4
-    command: chown -R mysql:mysql /var/lib/mysql
-    volumes:
-      - db_data:/var/lib/mysql
-    user: root
-    profiles: [ "helper" ]
-
-volumes:
-  db_data:
-  userfiles:                                               # New volume for public files
-  public_userfiles:
-  plugins:
-  logs:
-
-networks:
-  leantime-net:
diff --git a/.docker/start.sh b/.docker/start.sh
deleted file mode 100644
index a1a63d38ac..0000000000
--- a/.docker/start.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-if [[  -n "${LEAN_DB_PASSWORD_FILE}" ]]; then
-  LEAN_DB_PASSWORD=$(cat "${LEAN_DB_PASSWORD_FILE}")
-  export LEAN_DB_PASSWORD
-fi
-
-if [[  -n "${LEAN_EMAIL_SMTP_PASSWORD_FILE}" ]]; then
-  LEAN_EMAIL_SMTP_PASSWORD=$(cat "${LEAN_EMAIL_SMTP_PASSWORD_FILE}")
-  export LEAN_EMAIL_SMTP_PASSWORD
-fi
-
-if [[  -n "${LEAN_S3_SECRET_FILE}" ]]; then
-  LEAN_S3_SECRET=$(cat "${LEAN_S3_SECRET_FILE}")
-  export LEAN_S3_SECRET
-fi
-
-if [[  -n "${LEAN_SESSION_PASSWORD_FILE}" ]]; then
-  LEAN_SESSION_PASSWORD=$(cat "${LEAN_SESSION_PASSWORD_FILE}")
-  export LEAN_SESSION_PASSWORD
-fi
-
-if [[  -n "${LEAN_REDIS_PASSWORD_FILE}" ]]; then
-  LEAN_REDIS_PASSWORD=$(cat "${LEAN_REDIS_PASSWORD_FILE}")
-  export LEAN_REDIS_PASSWORD
-fi
-
-if [[  -n "${LEAN_DB_HOST_FILE}" ]]; then
-  LEAN_DB_HOST=$(cat "${LEAN_DB_HOST_FILE}")
-  export LEAN_DB_HOST
-fi
-
-if [[  -n "${LEAN_DB_DATABASE_FILE}" ]]; then
-  LEAN_DB_DATABASE=$(cat "${LEAN_DB_DATABASE_FILE}")
-  export LEAN_DB_DATABASE
-fi
-
-if [[  -n "${LEAN_DB_USER_FILE}" ]]; then
-  LEAN_DB_USER=$(cat "${LEAN_DB_USER_FILE}")
-  export LEAN_DB_USER
-fi
-
-if [[  -n "${LEAN_EMAIL_SMTP_USERNAME_FILE}" ]]; then
-  LEAN_EMAIL_SMTP_USERNAME=$(cat "${LEAN_EMAIL_SMTP_USERNAME_FILE}")
-  export LEAN_EMAIL_SMTP_USERNAME
-fi
-
-# Ensure supervisord can write its pid file
-mkdir -p /run
-
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..ddd46c988c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,93 @@
+*.md
+CHANGELOG.md
+README.md
+SECURITY.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+DEPLOYMENT-SETUP.md
+CLAUDE.md
+LICENSE
+
+makefile
+codeception.yml
+crowdin.yml
+
+phpcs.xml
+phpdoc.xml
+phpdoc-api.xml
+phpstan.neon
+web.config.sample
+nginx.example.conf
+nginx-subfolder.example.conf
+
+node_modules/
+vendor/
+
+logs/
+storage/logs/*
+storage/framework/cache/*
+storage/framework/sessions/*
+storage/framework/views/*
+storage/framework/composerPaths.php
+storage/framework/viewPaths.php
+!storage/logs/.gitkeep
+!storage/framework/cache/.gitkeep
+!storage/framework/sessions/.gitkeep
+!storage/framework/views/.gitkeep
+
+userfiles/*
+public/userfiles/*
+!userfiles/.gitkeep
+!public/userfiles/.gitkeep
+
+classmap.json
+blocklist.json
+
+tests/
+codeception.yml
+
+helm/
+
+.git/
+.gitignore
+.gitattributes
+.github/
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+Thumbs.db
+.editorconfig
+
+.env
+.env.*
+config/.env
+!config/sample.env
+
+docker-compose*.yml
+Dockerfile*
+.dockerignore
+docker.env
+docker.env.example
+
+.github/
+*.yml
+
+*.log
+*.cache
+tmp/
+temp/
+*.tmp
+
+*.bak
+*.backup
+backupdb/
+
+treeoutput*.txt
+
+bootstrap/cache/*
+!bootstrap/cache/.gitkeep
+public/dist/
+public/mix-manifest.json
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index fec7879c1b..0000000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,225 +0,0 @@
-name: Deploy Leantime
-
-on:
-  push:
-    branches:
-      - develop
-      - master
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    name: Deploy to Server
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Setup SSH
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          SSH_HOST: ${{ secrets.SSH_HOST }}
-        run: |
-          mkdir -p ~/.ssh
-          echo "$SSH_PRIVATE_KEY" > ~/.ssh/deploy_key
-          chmod 600 ~/.ssh/deploy_key
-          ssh-keyscan -H $SSH_HOST >> ~/.ssh/known_hosts
-          chmod 644 ~/.ssh/known_hosts
-
-      - name: Deploy to Staging
-        if: github.ref == 'refs/heads/develop'
-        env:
-          SSH_HOST: ${{ secrets.SSH_HOST }}
-          SSH_USER: ${{ secrets.SSH_USER }}
-          STAGING_PATH: ${{ secrets.STAGING_PATH }}
-          STAGING_ENV_FILE: ${{ secrets.STAGING_ENV_FILE }}
-        run: |
-          echo "Deploying to STAGING"
-
-          # Deploy using git pull
-          ssh -i ~/.ssh/deploy_key -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST << ENDSSH
-            set -e  # Exit on error
-
-            echo "Changing to deployment directory..."
-            cd $STAGING_PATH
-
-            echo "Fetching latest changes..."
-            git fetch origin develop
-
-            echo "Creating backup tag..."
-            BACKUP_TAG="backup-staging-$(date +%Y%m%d_%H%M%S)"
-            git tag -f $BACKUP_TAG HEAD
-            echo "Backup tag created: $BACKUP_TAG"
-
-            echo "Pulling latest code from develop branch..."
-            git pull origin develop
-
-            echo "Installing Composer dependencies..."
-            composer install --no-dev --optimize-autoloader --no-interaction
-
-            echo "Installing NPM dependencies..."
-            npm ci
-
-            echo "Building frontend assets..."
-            npx mix --production
-
-            echo "Generating blocklist..."
-            node generateBlocklist.mjs
-
-            echo "Clearing cache..."
-            # Clear cache files
-            sudo find bootstrap/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/sessions -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/views -type f ! -name '.gitignore' -delete 2>/dev/null || true
-
-            echo "Setting proper file permissions..."
-            # Set ownership for application files
-            sudo chown -R www-data:www-data $STAGING_PATH
-
-            # Secure .env file permissions
-            sudo chmod 600 config/.env 2>/dev/null || true
-
-            # Make writable directories
-            sudo chmod -R 775 storage bootstrap/cache userfiles public/userfiles 2>/dev/null || true
-
-            echo "Reloading services..."
-            # Reload PHP-FPM to clear opcache
-            sudo systemctl reload php8.2-fpm
-
-            # Reload nginx
-            sudo systemctl reload nginx
-
-            echo "Staging deployment completed successfully!"
-            echo "Commit: $(git rev-parse --short HEAD)"
-            echo "Rollback available: git reset --hard $BACKUP_TAG"
-          ENDSSH
-
-      - name: Health Check Staging
-        if: github.ref == 'refs/heads/develop'
-        env:
-          STAGING_URL: ${{ secrets.STAGING_URL }}
-        run: |
-          echo " Running staging health check..."
-          sleep 3
-
-          response=$(curl -s -o /dev/null -w "%{http_code}" $STAGING_URL/healthCheck.php 2>/dev/null || echo "000")
-
-          if [ "$response" = "200" ]; then
-            echo " Staging health check passed! (HTTP $response)"
-          else
-            echo " Warning: Health check returned HTTP $response"
-            echo "Please verify the staging deployment manually at $STAGING_URL"
-          fi
-
-      - name: Deploy to Production
-        if: github.ref == 'refs/heads/master'
-        env:
-          SSH_HOST: ${{ secrets.SSH_HOST }}
-          SSH_USER: ${{ secrets.SSH_USER }}
-          PRODUCTION_PATH: ${{ secrets.PRODUCTION_PATH }}
-        run: |
-          echo "Deploying to PRODUCTION using Git Pull..."
-
-          # Deploy using git pull on server
-          ssh -i ~/.ssh/deploy_key -o StrictHostKeyChecking=no $SSH_USER@$SSH_HOST << ENDSSH
-            set -e  # Exit on error
-
-            echo "Changing to deployment directory..."
-            cd $PRODUCTION_PATH
-
-            echo "Fetching latest changes..."
-            git fetch -v origin master
-
-            echo "Creating backup tag..."
-            BACKUP_TAG="backup-production-$(date +%Y%m%d_%H%M%S)"
-            git tag -f $BACKUP_TAG HEAD
-            echo "Backup tag created: $BACKUP_TAG"
-
-            echo "Pulling latest code from master branch..."
-            git pull origin master
-
-            echo "Installing Composer dependencies..."
-            composer install --no-dev --optimize-autoloader --no-interaction
-
-            echo "Installing NPM dependencies..."
-            npm ci
-
-            echo "Building frontend assets..."
-            npx mix --production
-
-            echo "Generating blocklist..."
-            node generateBlocklist.mjs
-
-            echo "Clearing cache..."
-            # Clear cache files
-            sudo find bootstrap/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/sessions -type f ! -name '.gitignore' -delete 2>/dev/null || true
-            sudo find storage/framework/views -type f ! -name '.gitignore' -delete 2>/dev/null || true
-
-            echo "Setting proper file permissions..."
-            # Set ownership for application files
-            sudo chown -R www-data:www-data $PRODUCTION_PATH
-
-            # Secure .env file permissions
-            sudo chmod 600 config/.env 2>/dev/null || true
-
-            # Make writable directories
-            sudo chmod -R 775 storage bootstrap/cache userfiles public/userfiles 2>/dev/null || true
-
-            echo "Reloading services..."
-            # Reload PHP-FPM to clear opcache
-            sudo systemctl reload php8.2-fpm
-
-            # Reload nginx
-            sudo systemctl reload nginx
-
-            echo "Production deployment completed successfully!"
-            echo "Commit: $(git rev-parse --short HEAD)"
-            echo "Rollback available: git reset --hard $BACKUP_TAG"
-          ENDSSH
-
-      - name: Health Check Production
-        if: github.ref == 'refs/heads/master'
-        env:
-          PRODUCTION_URL: ${{ secrets.PRODUCTION_URL }}
-        run: |
-          echo " Running production health check..."
-          sleep 5
-
-          response=$(curl -s -o /dev/null -w "%{http_code}" $PRODUCTION_URL/healthCheck.php 2>/dev/null || echo "000")
-
-          if [ "$response" = "200" ]; then
-            echo " Production health check passed! (HTTP $response)"
-          else
-            echo " ERROR: Production health check failed! (HTTP $response)"
-            echo " Please verify the deployment manually at $PRODUCTION_URL"
-            exit 1
-          fi
-
-      - name: Deployment Summary
-        if: always()
-        run: |
-          echo ""
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          if [ "${{ github.ref }}" = "refs/heads/develop" ]; then
-            echo " STAGING Deployment Summary"
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Branch:      develop"
-            echo "Environment: Staging"
-            echo "Server:      ${{ secrets.SSH_HOST }}"
-            echo "Path:        ${{ secrets.STAGING_PATH }}"
-            echo "URL:         ${{ secrets.STAGING_URL }}"
-          else
-            echo " PRODUCTION Deployment Summary"
-            echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-            echo "Branch:      master"
-            echo "Environment: Production"
-            echo "Server:      ${{ secrets.SSH_HOST }}"
-            echo "Path:        ${{ secrets.PRODUCTION_PATH }}"
-            echo "URL:         ${{ secrets.PRODUCTION_URL }}"
-          fi
-          echo "Commit:      ${{ github.sha }}"
-          echo "Actor:       ${{ github.actor }}"
-          echo "Status:      ${{ job.status }}"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-
diff --git a/.github/workflows/docker-production-deployment.yml b/.github/workflows/docker-production-deployment.yml
new file mode 100644
index 0000000000..36e3e52f52
--- /dev/null
+++ b/.github/workflows/docker-production-deployment.yml
@@ -0,0 +1,305 @@
+name: Deploy Leantime to Production
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: leantime-prod
+  IMAGE_TAG: prod-${{ github.sha }}
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          load: true
+          platforms: linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+
+      - name: Install docker-pussh plugin
+        run: |
+          mkdir -p ~/.docker/cli-plugins
+          curl -sSL https://raw.githubusercontent.com/psviderski/unregistry/main/docker-pussh \
+            -o ~/.docker/cli-plugins/docker-pussh
+          chmod +x ~/.docker/cli-plugins/docker-pussh
+          echo "Plugin installed"
+
+      - name: Setup SSH key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/production_key
+          chmod 600 ~/.ssh/production_key
+          ssh-keyscan -p ${{ secrets.SERVER_SSH_PORT || 22 }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Push image to server
+        run: |
+          echo "Pushing image to server..."
+          docker pussh ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} \
+            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.SERVER_SSH_PORT || 22 }} \
+            -i ~/.ssh/production_key
+          echo "Image pushed successfully!"
+
+      - name: Prepare server directory
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \
+              "sudo chown -R \$USER:\$USER ${{ secrets.DOCKER_APP_PROD_PATH }} && \
+              sudo chmod -R 755 ${{ secrets.DOCKER_APP_PROD_PATH }}"
+
+      - name: Upload docker-compose.production.yml to server
+        run: |
+          scp -P ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              docker-compose.production.yml \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DOCKER_APP_PROD_PATH }}
+
+      - name: Deploy to Production
+        id: deploy
+        continue-on-error: true
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          NEW_IMAGE_TAG="${{ env.IMAGE_TAG }}"
+          APP_DIR="${{ secrets.DOCKER_APP_PROD_PATH }}"
+          CONTAINER_NAME="leantime_app_prod"
+          TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+          
+          echo "======================================"
+          echo "[INFO] Starting deployment to production..."
+          echo "Directory: ${APP_DIR}"
+          echo "Image: ${IMAGE_NAME}:${NEW_IMAGE_TAG}"
+          echo "======================================"
+          
+          cd "${APP_DIR}"
+          
+          if [ ! -f ".env" ]; then
+            echo "[ERROR] .env file not found! Cannot deploy."
+            exit 1
+          fi
+          
+          CURRENT_IMAGE_TAG=$(docker inspect ${CONTAINER_NAME} --format '{{.Config.Image}}' 2>/dev/null | cut -d':' -f2)
+          echo "${CURRENT_IMAGE_TAG}" > "${APP_DIR}/.previous_image_tag.txt"
+          
+          if [ -f "docker-compose.production.yml" ]; then
+            cp docker-compose.production.yml "docker-compose.production.yml.backup.${TIMESTAMP}"
+            echo "[INFO] Backed up docker-compose.production.yml"
+          fi
+          
+          if [ -f ".env" ]; then
+            cp .env ".env.backup.${TIMESTAMP}"
+            echo "[INFO] Backed up .env"
+          fi
+          
+          echo "[INFO] Removing app container..."
+          docker compose -f docker-compose.production.yml rm -f -s leantime || true
+          
+          echo "[DEBUG] Updating image to: ${IMAGE_NAME}:${NEW_IMAGE_TAG}"
+          sed -i "s|image: ${IMAGE_NAME}:.*|image: ${IMAGE_NAME}:${NEW_IMAGE_TAG}|" docker-compose.production.yml
+          echo "[DEBUG] Updated docker-compose.production.yml"
+
+          echo "[INFO] Deploying new version..."
+          docker compose -f docker-compose.production.yml up -d leantime
+          
+          echo "[INFO] Waiting for application to become healthy..."
+          HEALTH_PASSED=false
+          for i in {1..30}; do
+            # Check if container is running first
+            if ! docker ps | grep -q "${CONTAINER_NAME}"; then
+              echo "[ERROR] Container ${CONTAINER_NAME} is not running!"
+              docker compose -f docker-compose.production.yml logs --tail=50 leantime
+              exit 1
+            fi
+            
+            if docker exec "${CONTAINER_NAME}" curl -f http://localhost:8080 >/dev/null 2>&1; then
+              echo "[SUCCESS] Application is healthy! (attempt $i)"
+              HEALTH_PASSED=true
+              break
+            fi
+            
+            echo "[INFO] Waiting for application to become healthy... (attempt $i/30)"
+            sleep 2
+          done
+          
+          if [ "${HEALTH_PASSED}" = false ]; then
+            echo "[ERROR] Application failed to start within 60 seconds"
+            docker compose -f docker-compose.production.yml logs --tail=50 leantime
+            exit 1
+          fi
+          
+          echo "${IMAGE_NAME}:${NEW_IMAGE_TAG}" > .current_image_tag
+          
+          echo "======================================"
+          echo "[SUCCESS] Deployment successful!"
+          echo "======================================"
+          docker compose -f docker-compose.production.yml ps
+          ENDSSH
+
+      - name: Rollback on Failure
+        if: steps.deploy.outcome == 'failure'
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          APP_DIR="${{ secrets.DOCKER_APP_PROD_PATH }}"
+          CONTAINER_NAME="leantime_app_prod"
+
+          echo "[ERROR] Deployment failed! Initiating rollback..."
+          cd "${APP_DIR}"
+          
+          PREVIOUS_IMAGE_TAG=$(cat "${APP_DIR}/.previous_image_tag.txt" 2>/dev/null || echo "")
+          
+          if [ -z "${PREVIOUS_IMAGE_TAG}" ] || [ "${PREVIOUS_IMAGE_TAG}" = "none" ]; then
+            echo "[WARN] No previous image to rollback to"
+            docker compose -f docker-compose.production.yml stop leantime
+            exit 1
+          fi
+          
+          echo "[INFO] Rolling back to: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}"
+          
+          LATEST_ENV_BACKUP=$(ls -t .env.backup.* 2>/dev/null | head -n 1)
+          if [ -n "${LATEST_ENV_BACKUP}" ]; then
+            cp "${LATEST_ENV_BACKUP}" .env
+            echo "[INFO] Restored .env from backup"
+          fi
+          
+          echo "[INFO] Updating image to: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}"
+          sed -i "s|image: ${IMAGE_NAME}:.*|image: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}|" docker-compose.production.yml
+          echo "[INFO] Updated docker-compose.production.yml to previous version"
+          
+          echo "[INFO] Removing failed container..."
+          docker compose -f docker-compose.production.yml rm -f -s leantime
+
+          echo "[INFO] Starting previous version..."
+          docker compose -f docker-compose.production.yml up -d leantime
+
+          echo "[INFO] Waiting for rollback to complete..."
+          ROLLBACK_SUCCESS=false
+          for i in {1..30}; do
+            if docker ps | grep -q "${CONTAINER_NAME}"; then
+              if docker exec "${CONTAINER_NAME}" curl -f http://localhost:8080 >/dev/null 2>&1; then
+                echo "[INFO] Application is healthy after rollback (attempt $i)"
+                ROLLBACK_SUCCESS=true
+                break
+              fi
+            fi
+            echo "[INFO] Waiting for rollback... (attempt $i/30)"
+            sleep 2
+          done
+          
+          if [ "${ROLLBACK_SUCCESS}" = false ]; then
+            echo "[ERROR] Rollback failed! Manual intervention required."
+            docker compose -f docker-compose.production.yml logs --tail=50 leantime
+            exit 1
+          fi
+          
+          echo "[SUCCESS] Rollback successful!"
+          docker compose -f docker-compose.production.yml ps
+          ENDSSH
+
+      - name: Post-Rollback Cleanup
+        if: steps.deploy.outcome == 'failure'
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          
+          echo "[INFO] Cleaning up failed deployment image..."
+          docker rmi -f ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} 2>/dev/null || true
+          docker image prune -f
+          ENDSSH
+
+      - name: Final Verification
+        if: success()
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          APP_DIR="${{ secrets.DOCKER_APP_PROD_PATH }}"
+          CONTAINER_NAME="leantime_app_prod"
+
+          cd "${APP_DIR}"
+          sync 
+          sleep 2
+          if [ ! -r "docker-compose.production.yml" ]; then
+          echo "[ERROR] docker-compose.production.yml not readable!"
+          exit 1
+          fi
+          
+          echo "[INFO] Final deployment verification..."
+          docker compose -f docker-compose.production.yml ps
+          
+          echo ""
+          echo "[INFO] Container status:"
+          docker ps | grep "${CONTAINER_NAME}" || echo "Container not found"
+          
+          echo ""
+          echo "[INFO] Testing endpoint..."
+          curl -I https://pearlog-prod.pearshadow.com || echo "Endpoint test failed"
+          
+          echo ""
+          echo "[SUCCESS] Verification complete!"
+          ENDSSH
+
+      - name: Cleanup Old Images
+        if: success()
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/production_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          APP_DIR="${{ secrets.DOCKER_APP_PROD_PATH }}"
+          
+          echo "[INFO] Cleaning up old Docker images..."
+          cd "${APP_DIR}"
+          
+          docker images "${IMAGE_NAME}" --format "{{.Repository}}:{{.Tag}} {{.ID}}" | \
+            grep "prod-" | \
+            tail -n +4 | \
+            awk '{print $2}' | \
+            xargs -r docker rmi -f 2>/dev/null || true
+          
+          docker image prune -f
+          
+          echo "[INFO] Cleaning up old backups..."
+          find "${APP_DIR}" -name "*.backup.*" -type f -mtime +7 -delete
+          echo "[INFO] Backups older than 7 days removed"
+          
+          echo "[INFO] Cleanup complete!"
+          docker images "${IMAGE_NAME}"
+          ENDSSH
+
+      - name: Notify on Failure
+        if: failure()
+        run: |
+          echo "======================================"
+          echo "Deployment to production failed!"
+          echo "Check logs for details."
+          echo "If rollback occurred, the previous version should still be running."
+          echo "======================================"
\ No newline at end of file
diff --git a/.github/workflows/docker-staging-deployment.yml b/.github/workflows/docker-staging-deployment.yml
new file mode 100644
index 0000000000..932f6c4569
--- /dev/null
+++ b/.github/workflows/docker-staging-deployment.yml
@@ -0,0 +1,305 @@
+name: Deploy Leantime to Staging
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: leantime-staging
+  IMAGE_TAG: staging-${{ github.sha }}
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          load: true
+          platforms: linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+
+      - name: Install docker-pussh plugin
+        run: |
+          mkdir -p ~/.docker/cli-plugins
+          curl -sSL https://raw.githubusercontent.com/psviderski/unregistry/main/docker-pussh \
+            -o ~/.docker/cli-plugins/docker-pussh
+          chmod +x ~/.docker/cli-plugins/docker-pussh
+          echo "Plugin installed"
+
+      - name: Setup SSH key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/staging_key
+          chmod 600 ~/.ssh/staging_key
+          ssh-keyscan -p ${{ secrets.SERVER_SSH_PORT || 22 }} ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+
+      - name: Push image to server
+        run: |
+          echo "Pushing image to server..."
+          docker pussh ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} \
+            ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.SERVER_SSH_PORT || 22 }} \
+            -i ~/.ssh/staging_key
+          echo "Image pushed successfully!"
+
+      - name: Prepare server directory
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \
+              "sudo chown -R \$USER:\$USER ${{ secrets.DOCKER_APP_STAGING_PATH }} && \
+              sudo chmod -R 755 ${{ secrets.DOCKER_APP_STAGING_PATH }}"
+
+      - name: Upload docker-compose.staging.yml to server
+        run: |
+          scp -P ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              docker-compose.staging.yml \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DOCKER_APP_STAGING_PATH }}
+
+      - name: Deploy to Staging
+        id: deploy
+        continue-on-error: true
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          NEW_IMAGE_TAG="${{ env.IMAGE_TAG }}"
+          APP_DIR="${{ secrets.DOCKER_APP_STAGING_PATH }}"
+          CONTAINER_NAME="leantime_app_local"
+          TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+          
+          echo "======================================"
+          echo "[INFO] Starting deployment to staging..."
+          echo "Directory: ${APP_DIR}"
+          echo "Image: ${IMAGE_NAME}:${NEW_IMAGE_TAG}"
+          echo "======================================"
+          
+          cd "${APP_DIR}"
+          
+          if [ ! -f ".env" ]; then
+            echo "[ERROR] .env file not found! Cannot deploy."
+            exit 1
+          fi
+          
+          CURRENT_IMAGE_TAG=$(docker inspect ${CONTAINER_NAME} --format '{{.Config.Image}}' 2>/dev/null | cut -d':' -f2)
+          echo "${CURRENT_IMAGE_TAG}" > "${APP_DIR}/.previous_image_tag.txt"
+          
+          if [ -f "docker-compose.staging.yml" ]; then
+            cp docker-compose.staging.yml "docker-compose.staging.yml.backup.${TIMESTAMP}"
+            echo "[INFO] Backed up docker-compose.staging.yml"
+          fi
+          
+          if [ -f ".env" ]; then
+            cp .env ".env.backup.${TIMESTAMP}"
+            echo "[INFO] Backed up .env"
+          fi
+          
+          echo "[INFO] Removing app container..."
+          docker compose -f docker-compose.staging.yml rm -f -s leantime || true
+          
+          echo "[DEBUG] Updating image to: ${IMAGE_NAME}:${NEW_IMAGE_TAG}"
+          sed -i "s|image: leantime-staging:.*|image: ${IMAGE_NAME}:${NEW_IMAGE_TAG}|" docker-compose.staging.yml
+          echo "[DEBUG] Updated docker-compose.staging.yml"
+          
+          echo "[INFO] Deploying new version..."
+          docker compose -f docker-compose.staging.yml up -d leantime 
+          
+          echo "[INFO] Waiting for application to become healthy..."
+          HEALTH_PASSED=false
+          for i in {1..30}; do
+            # Check if container is running first
+            if ! docker ps | grep -q "${CONTAINER_NAME}"; then
+              echo "[ERROR] Container ${CONTAINER_NAME} is not running!"
+              docker compose -f docker-compose.staging.yml logs --tail=50 leantime
+              exit 1
+            fi
+            
+            if docker exec "${CONTAINER_NAME}" curl -f http://localhost:8080 >/dev/null 2>&1; then
+              echo "[SUCCESS] Application is healthy! (attempt $i)"
+              HEALTH_PASSED=true
+              break
+            fi
+            
+            echo "[INFO] Waiting for application to become healthy... (attempt $i/30)"
+            sleep 2
+          done
+          
+          if [ "${HEALTH_PASSED}" = false ]; then
+            echo "[ERROR] Application failed to start within 60 seconds" 
+            docker compose -f docker-compose.staging.yml logs --tail=50 leantime
+            exit 1
+          fi
+          
+          echo "${IMAGE_NAME}:${NEW_IMAGE_TAG}" > .current_image_tag
+          
+          echo "======================================"
+          echo "[SUCCESS] Deployment successful!"
+          echo "======================================"
+          docker compose -f docker-compose.staging.yml ps
+          ENDSSH
+
+      - name: Rollback on Failure
+        if: steps.deploy.outcome == 'failure'
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          APP_DIR="${{ secrets.DOCKER_APP_STAGING_PATH }}"
+          CONTAINER_NAME="leantime_app_local"
+
+          echo "[ERROR] Deployment failed! Initiating rollback..."
+          cd "${APP_DIR}"
+          
+          PREVIOUS_IMAGE_TAG=$(cat "${APP_DIR}/.previous_image_tag.txt" 2>/dev/null || echo "")
+          
+          if [ -z "${PREVIOUS_IMAGE_TAG}" ] || [ "${PREVIOUS_IMAGE_TAG}" = "none" ]; then
+            echo "[WARN] No previous image to rollback to"
+            docker compose -f docker-compose.staging.yml stop leantime
+            exit 1
+          fi
+          
+          echo "[INFO] Rolling back to: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}"
+          
+          LATEST_ENV_BACKUP=$(ls -t .env.backup.* 2>/dev/null | head -n 1)
+          if [ -n "${LATEST_ENV_BACKUP}" ]; then
+            cp "${LATEST_ENV_BACKUP}" .env
+            echo "[INFO] Restored .env from backup"
+          fi
+          
+          echo "[INFO] Updating image to: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}"
+          sed -i "s|image: leantime-staging:.*|image: ${IMAGE_NAME}:${PREVIOUS_IMAGE_TAG}|" docker-compose.staging.yml
+          echo "[INFO] Updated docker-compose.staging.yml to previous version"
+          
+          echo "[INFO] Removing failed container..."
+          docker compose -f docker-compose.staging.yml rm -f -s leantime
+
+          echo "[INFO] Starting previous version..."
+          docker compose -f docker-compose.staging.yml up -d leantime
+
+          echo "[INFO] Waiting for rollback to complete..."
+          ROLLBACK_SUCCESS=false
+          for i in {1..30}; do
+            if docker ps | grep -q "${CONTAINER_NAME}"; then
+              if docker exec "${CONTAINER_NAME}" curl -f http://localhost:8080 >/dev/null 2>&1; then
+                echo "[INFO] Application is healthy after rollback (attempt $i)"
+                ROLLBACK_SUCCESS=true
+                break
+              fi
+            fi
+            echo "[INFO] Waiting for rollback... (attempt $i/30)"
+            sleep 2
+          done
+          
+          if [ "${ROLLBACK_SUCCESS}" = false ]; then
+            echo "[ERROR] Rollback failed! Manual intervention required."
+            docker compose -f docker-compose.staging.yml logs --tail=50 leantime
+            exit 1
+          fi
+          
+          echo "[SUCCESS] Rollback successful!"
+          docker compose -f docker-compose.staging.yml ps
+          ENDSSH
+
+      - name: Post-Rollback Cleanup
+        if: steps.deploy.outcome == 'failure'
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          
+          echo "[INFO] Cleaning up failed deployment image..."
+          docker rmi -f ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} 2>/dev/null || true
+          docker image prune -f
+          ENDSSH
+
+      - name: Final Verification
+        if: success()
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          APP_DIR="${{ secrets.DOCKER_APP_STAGING_PATH }}"
+          CONTAINER_NAME="leantime_app_local"
+          
+          cd "${APP_DIR}"
+          sync 
+          sleep 2,
+          if [ ! -r "docker-compose.staging.yml" ]; then
+          echo "[ERROR] docker-compose.staging.yml not readable!"
+          exit 1
+          fi
+          
+          echo "[INFO] Final deployment verification..."
+          docker compose -f docker-compose.staging.yml ps
+          
+          echo ""
+          echo "[INFO] Container status:"
+          docker ps | grep "${CONTAINER_NAME}" || echo "Container not found"
+          
+          echo ""
+          echo "[INFO] Testing endpoint..."
+          curl -I https://staging-pearlog.pearshadow.com || echo "Endpoint test failed"
+          
+          echo ""
+          echo "[SUCCESS] Verification complete!"
+          ENDSSH
+
+      - name: Cleanup Old Images
+        if: success()
+        run: |
+          ssh -p ${{ secrets.SERVER_SSH_PORT || 22 }} \
+              -i ~/.ssh/staging_key \
+              ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} bash << 'ENDSSH'
+          set -e
+          
+          IMAGE_NAME="${{ env.IMAGE_NAME }}"
+          APP_DIR="${{ secrets.DOCKER_APP_STAGING_PATH }}"
+          
+          echo "[INFO] Cleaning up old Docker images..."
+          cd "${APP_DIR}"
+          
+          docker images "${IMAGE_NAME}" --format "{{.Repository}}:{{.Tag}} {{.ID}}" | \
+            grep "staging-" | \
+            tail -n +4 | \
+            awk '{print $2}' | \
+            xargs -r docker rmi -f 2>/dev/null || true
+          
+          docker image prune -f
+          
+          echo "[INFO] Cleaning up old backups..."
+          find "${APP_DIR}" -name "*.backup.*" -type f -mtime +7 -delete
+          echo "[INFO] Backups older than 7 days removed"
+          
+          echo "[INFO] Cleanup complete!"
+          docker images "${IMAGE_NAME}"
+          ENDSSH
+
+      - name: Notify on Failure
+        if: failure()
+        run: |
+          echo "======================================"
+          echo "Deployment to staging failed!"
+          echo "Check logs for details."
+          echo "If rollback occurred, the previous version should still be running."
+          echo "======================================"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8c39c258ee..a9fc388eac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ backupdb/*
 public/js/*.min.js
 public/js/*.map
 public/css/*.css
+public/dist/*
+.docker/
 
 # PHPStorm specific git ignore to be able to share inspection configs and run tools
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..f818cf71aa
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,431 @@
+FROM php:8.2-fpm-alpine AS composer-builder
+
+WORKDIR /build
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+RUN apk add --no-cache \
+    freetype \
+    libjpeg-turbo \
+    libpng \
+    libwebp \
+    libzip \
+    openldap \
+    && apk add --no-cache --virtual .build-deps \
+    freetype-dev \
+    libjpeg-turbo-dev \
+    libpng-dev \
+    libwebp-dev \
+    libzip-dev \
+    openldap-dev \
+    && docker-php-ext-configure gd \
+    --with-freetype \
+    --with-jpeg \
+    --with-webp \
+    && docker-php-ext-install -j$(nproc) \
+    gd \
+    bcmath \
+    pdo_mysql \
+    mysqli \
+    zip \
+    ldap \
+    pcntl \
+    && apk del .build-deps
+
+COPY composer.json composer.lock ./
+
+RUN composer install \
+    --no-dev \
+    --optimize-autoloader \
+    --no-interaction \
+    --no-progress \
+    --prefer-dist
+
+FROM node:18-alpine AS frontend
+
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+
+RUN npm ci
+
+COPY webpack.mix.js .babelrc ./
+COPY tailwind.config.js ./ 
+
+COPY app ./app
+COPY public ./public
+
+COPY generateBlocklist.mjs ./
+
+RUN mkdir -p ./storage/framework/cache ./bootstrap/cache && \
+    rm -rf ./bootstrap/cache/*.php || true
+
+RUN npx mix --production
+
+RUN if [ -f "generateBlocklist.mjs" ]; then \
+        node generateBlocklist.mjs; \
+    else \
+        echo '{}' > blocklist.json; \
+    fi
+
+RUN echo "=== Frontend Build Verification ===" && \
+    echo "=== Contents of public/dist/ ===" && \
+    ls -lah public/dist/ && \
+    echo "" && \
+    echo "=== JavaScript files ===" && \
+    ls -lah public/dist/js/ && \
+    echo "" && \
+    echo "=== CSS files ===" && \
+    ls -lah public/dist/css/ && \
+    echo "" && \
+    echo "=== mix-manifest.json ===" && \
+    cat public/dist/mix-manifest.json && \
+    echo "" && \
+    if [ ! -d "public/dist/js" ]; then \
+        echo "ERROR: Frontend build failed - public/dist/js not found!"; \
+        exit 1; \
+    fi && \
+    if [ ! -d "public/dist/css" ]; then \
+        echo "ERROR: Frontend build failed - public/dist/css not found!"; \
+        exit 1; \
+    fi && \
+    echo "✓ Frontend assets built successfully"
+
+
+FROM php:8.2-fpm-alpine
+
+RUN apk add --no-cache \
+    nginx \
+    supervisor \
+    mysql-client \
+    freetype \
+    libjpeg-turbo \
+    libpng \
+    libwebp \
+    libzip \
+    icu-libs \
+    libxml2 \
+    oniguruma \
+    openldap \
+    font-noto-emoji \
+    && apk add --no-cache --virtual .build-deps \
+    freetype-dev \
+    libjpeg-turbo-dev \
+    libpng-dev \
+    libwebp-dev \
+    libzip-dev \
+    icu-dev \
+    libxml2-dev \
+    oniguruma-dev \
+    openldap-dev \
+    && docker-php-ext-configure gd \
+    --with-freetype \
+    --with-jpeg \
+    --with-webp \
+    && docker-php-ext-install -j$(nproc) \
+    gd \
+    pdo_mysql \
+    mysqli \
+    zip \
+    intl \
+    opcache \
+    bcmath \
+    exif \
+    mbstring \
+    xml \
+    ldap \
+    pcntl \
+    && apk del .build-deps \
+    && rm -rf /var/cache/apk/*
+
+COPY --chown=www-data:www-data <<EOF /usr/local/etc/php/conf.d/leantime.ini
+memory_limit = 256M
+upload_max_filesize = 100M
+post_max_size = 100M
+max_execution_time = 300
+date.timezone = UTC
+
+opcache.enable = 1
+opcache.memory_consumption = 128
+opcache.interned_strings_buffer = 16
+opcache.max_accelerated_files = 10000
+opcache.revalidate_freq = 2
+opcache.fast_shutdown = 1
+EOF
+
+COPY --chown=root:root <<'EOF' /etc/nginx/nginx.conf
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+error_log /var/log/nginx/error.log warn;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log /var/log/nginx/access.log main;
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    client_max_body_size 100M;
+
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_types text/plain text/css text/xml text/javascript application/json application/javascript application/xml+rss application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml;
+
+    include /etc/nginx/conf.d/*.conf;
+}
+EOF
+
+COPY --chown=root:root <<'EOF' /etc/nginx/conf.d/default.conf
+server {
+    listen 8080;
+    server_name _;
+    root /var/www/html/public;
+    index index.php index.html;
+
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+
+    access_log /var/log/nginx/leantime-access.log;
+    error_log /var/log/nginx/leantime-error.log;
+
+    client_body_timeout 300s;
+    client_header_timeout 300s;
+    send_timeout 300s;
+    proxy_connect_timeout 300s;
+    proxy_send_timeout 300s;
+    proxy_read_timeout 300s;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_buffering off;
+        fastcgi_read_timeout 300;
+    }
+
+    location ~ /\. {
+        deny all;
+    }
+
+    location ~* \.(jpg|jpeg|png|gif|ico|css|js|svg|woff|woff2|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public, immutable";
+    }
+}
+EOF
+
+COPY --chown=root:root <<'EOF' /etc/supervisor/conf.d/supervisord.conf
+[supervisord]
+nodaemon=true
+user=root
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+
+[program:php-fpm]
+command=php-fpm -F
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+EOF
+
+WORKDIR /var/www/html
+
+COPY --chown=www-data:www-data . .
+
+COPY --from=composer-builder --chown=www-data:www-data /build/vendor ./vendor
+
+RUN rm -rf public/dist
+
+COPY --from=frontend --chown=www-data:www-data /app/public/dist ./public/dist
+
+COPY --from=frontend --chown=www-data:www-data /app/blocklist.json ./blocklist.json
+
+RUN echo "=== FINAL Asset Verification ===" && \
+    echo "Contents of public/:" && \
+    ls -lah public/ && \
+    echo "" && \
+    echo "Contents of public/dist/:" && \
+    ls -lah public/dist/ && \
+    echo "" && \
+    echo "Contents of public/dist/js/:" && \
+    ls -lah public/dist/js/ && \
+    echo "" && \
+    echo "Contents of public/dist/css/:" && \
+    ls -lah public/dist/css/ && \
+    echo "" && \
+    echo "mix-manifest.json contents:" && \
+    cat public/dist/mix-manifest.json && \
+    echo "" && \
+    APP_SIZE=$(stat -c%s "public/dist/js/compiled-app.3.5.12.min.js" 2>/dev/null || echo "0") && \
+    echo "✓ compiled-app.js size: $APP_SIZE bytes" && \
+    CSS_COUNT=$(find public/dist/css -name "*.css" 2>/dev/null | wc -l) && \
+    echo "✓ CSS files found: $CSS_COUNT" && \
+    if [ "$APP_SIZE" -lt "100000" ]; then \
+        echo "ERROR: compiled-app.js is too small ($APP_SIZE bytes)!"; \
+        exit 1; \
+    fi && \
+    if [ "$CSS_COUNT" -eq "0" ]; then \
+        echo "ERROR: No CSS files found!"; \
+        exit 1; \
+    fi && \
+    echo "✓ All assets verified successfully!"
+
+RUN mkdir -p \
+    storage/framework/cache \
+    storage/framework/sessions \
+    storage/framework/views \
+    storage/logs \
+    bootstrap/cache \
+    userfiles \
+    public/userfiles \
+    && chown -R www-data:www-data \
+    storage \
+    bootstrap/cache \
+    userfiles \
+    public/userfiles \
+    && chmod -R 775 \
+    storage \
+    bootstrap/cache \
+    userfiles \
+    public/userfiles
+
+COPY --chown=root:root <<'EOF' /entrypoint.sh
+#!/bin/sh
+set -e
+
+mkdir -p /var/lib/nginx/tmp/client_body
+chown -R www-data:www-data /var/lib/nginx
+chmod -R 755 /var/lib/nginx
+
+chown -R www-data:www-data /var/www/html/userfiles /var/www/html/public/userfiles
+chmod -R 775 /var/www/html/userfiles /var/www/html/public/userfiles
+
+echo "Starting Leantime container..."
+
+if [ -n "$LEAN_DB_HOST" ]; then
+    echo "Waiting for database at $LEAN_DB_HOST:${LEAN_DB_PORT:-3306}..."
+    timeout=60
+    while ! nc -z "$LEAN_DB_HOST" "${LEAN_DB_PORT:-3306}" 2>/dev/null; do
+        timeout=$((timeout - 1))
+        if [ $timeout -le 0 ]; then
+            echo "ERROR: Database connection timeout"
+            exit 1
+        fi
+        echo "Waiting for database... ($timeout seconds remaining)"
+        sleep 1
+    done
+    echo "Database is ready!"
+fi
+
+if [ ! -f /var/www/html/config/.env ]; then
+    echo "Creating config/.env file..."
+    
+    cat > /var/www/html/config/.env <<ENVEOF
+LEAN_APP_URL="${LEAN_APP_URL:-http://localhost:8080}"
+LEAN_APP_DIR="${LEAN_APP_DIR:-}"
+LEAN_DEBUG=${LEAN_DEBUG:-0}
+
+LEAN_DB_HOST="${LEAN_DB_HOST:-leantime_db}"
+LEAN_DB_USER="${LEAN_DB_USER:-leantime}"
+LEAN_DB_PASSWORD="${LEAN_DB_PASSWORD:-leantime}"
+LEAN_DB_DATABASE="${LEAN_DB_DATABASE:-leantime}"
+LEAN_DB_PORT=${LEAN_DB_PORT:-3306}
+
+LEAN_SESSION_PASSWORD="${LEAN_SESSION_PASSWORD:-$(openssl rand -base64 32)}"
+LEAN_SESSION_EXPIRATION=${LEAN_SESSION_EXPIRATION:-28800}
+LEAN_SESSION_SECURE=${LEAN_SESSION_SECURE:-false}
+
+LEAN_SITENAME="${LEAN_SITENAME:-Leantime}"
+LEAN_LANGUAGE="${LEAN_LANGUAGE:-en-US}"
+LEAN_DEFAULT_TIMEZONE="${LEAN_DEFAULT_TIMEZONE:-UTC}"
+LEAN_LOG_PATH="${LEAN_LOG_PATH:-}"
+
+LEAN_USER_FILE_PATH="${LEAN_USER_FILE_PATH:-userfiles/}"
+LEAN_DB_BACKUP_PATH="${LEAN_DB_BACKUP_PATH:-backupdb/}"
+
+LEAN_EMAIL_RETURN="${LEAN_EMAIL_RETURN:-}"
+LEAN_EMAIL_USE_SMTP=${LEAN_EMAIL_USE_SMTP:-false}
+
+LEAN_USE_REDIS=${LEAN_USE_REDIS:-false}
+ENVEOF
+
+    chown www-data:www-data /var/www/html/config/.env
+    chmod 600 /var/www/html/config/.env
+    echo "config/.env created successfully"
+else
+    echo "config/.env already exists, skipping creation"
+fi
+
+echo "Clearing cache..."
+rm -rf /var/www/html/bootstrap/cache/*.php || true
+rm -rf /var/www/html/storage/framework/composerPaths.php || true
+rm -rf /var/www/html/storage/framework/viewPaths.php || true
+
+find /var/www/html/storage/framework/cache -type f ! -name '.gitignore' -delete 2>/dev/null || true
+find /var/www/html/storage/framework/cache -type d -empty -delete 2>/dev/null || true
+
+find /var/www/html/storage/framework/sessions -type f ! -name '.gitignore' -delete 2>/dev/null || true
+find /var/www/html/storage/framework/sessions -type d -empty -delete 2>/dev/null || true
+
+find /var/www/html/storage/framework/views -type f ! -name '.gitignore' -delete 2>/dev/null || true
+find /var/www/html/storage/framework/views -type d -empty -delete 2>/dev/null || true
+
+echo "Cache cleared successfully!"
+
+echo "=== Pre-startup Asset Check ==="
+ls -lah /var/www/html/public/dist/js/compiled-app.*.min.js || echo "WARNING: compiled-app.js not found!"
+ls -lah /var/www/html/public/dist/css/ || echo "WARNING: CSS directory not found!"
+echo "================================"
+
+echo "Leantime initialization complete!"
+echo "Starting services..."
+
+exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+EOF
+
+RUN sed -i 's/\r$//' /entrypoint.sh && \
+    chmod +x /entrypoint.sh
+
+RUN mkdir -p /var/log/supervisor
+
+EXPOSE 8080
+
+HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+    CMD wget --no-verbose --tries=1 --spider http://localhost:8080/healthCheck.php || exit 1
+
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/app/Domain/Api/Controllers/Notifications.php b/app/Domain/Api/Controllers/Notifications.php
index c6b6903f22..64430492b3 100644
--- a/app/Domain/Api/Controllers/Notifications.php
+++ b/app/Domain/Api/Controllers/Notifications.php
@@ -45,7 +45,8 @@ public function post(array $params): Response
     public function patch(array $params): Response
     {
         if (isset($params['action']) && $params['action'] == 'read') {
-            $this->notificationService->markNotificationRead($params['id'], session('userdata.id'));
+            $type = $params['type'] ?? null;
+            $this->notificationService->markNotificationRead($params['id'], session('userdata.id'), $type);
         }
 
         return new Response;
diff --git a/app/Domain/Menu/Templates/headMenu.blade.php b/app/Domain/Menu/Templates/headMenu.blade.php
index 442781fd9c..266940181d 100644
--- a/app/Domain/Menu/Templates/headMenu.blade.php
+++ b/app/Domain/Menu/Templates/headMenu.blade.php
@@ -63,31 +63,16 @@ class="dropdown-toggle profileHandler notificationHandler"
             data-tippy-content='{{ __('popover.notifications') }}'
         >
             <span class="fa-solid fa-bell"></span>
-            @if($newNotificationCount>0)
-                <span class='notificationCounter'>{{ $newNotificationCount }}</span>
+            @if($totalNewNotifications>0)
+                <span class='notificationCounter'>{{ $totalNewNotifications }}</span>
             @endif
         </a>
 
         <div class='dropdown-menu' id='notificationsDropdown'>
 
-            <div class='dropdownTabs'>
-                <a
-                    href='javascript:void(0);'
-                    class='notifcationTabs active'
-                    id="notificationsListLink"
-                    onclick="toggleNotificationTabs('notifications')"
-                >Notification ({{ $totalNewNotifications }})</a>
-                <a
-                    href='javascript:void(0);'
-                    class='notifcationTabs'
-                    id="mentionsListLink"
-                    onclick="toggleNotificationTabs('mentions')"
-                >Mentions ({{ $totalNewMentions }})</a>
-            </div>
-
             <div class="scroll-wrapper">
 
-                <ul id='notificationsList' class='notifcationViewLists'>
+                <ul id='notificationsList' class='notificationViewLists'>
                     @if ($totalNotificationCount === 0)
                         <p style='padding: 10px'>{{ __('text.no_notifications') }}</p>
                     @endif
@@ -118,7 +103,29 @@ class='new'
                     @endforeach
                 </ul>
 
-                <ul id='mentionsList' style='display:none;' class='notificationViewLists'>
+            </div>
+        </div>
+
+    </li>
+
+    <li class="notificationDropdown">
+        <a
+            href='javascript:void(0);'
+            class="dropdown-toggle profileHandler mentionHandler"
+            data-toggle='dropdown'
+            data-tippy-content='Mentions'
+        >
+            <span class="fa-solid fa-at"></span>
+            @if($totalNewMentions > 0)
+                <span class='notificationCounter'>{{ $totalNewMentions }}</span>
+            @endif
+        </a>
+
+        <div class='dropdown-menu' id='mentionsDropdown'>
+
+            <div class="scroll-wrapper">
+
+                <ul id='mentionsList' class='notificationViewLists'>
                     @if ($totalMentionCount === 0)
                         <p style="padding: 10px">{{ __('text.no_notifications') }}</p>
                     @endif
@@ -259,13 +266,6 @@ class="active"
 @once
     @push('scripts')
         <script>
-            function toggleNotificationTabs(active) {
-                jQuery(".notifcationTabs").removeClass("active");
-                jQuery('#' + active + 'ListLink').addClass("active");
-                jQuery('.notifcationViewLists').hide();
-                jQuery('#' + active + 'List').show();
-            }
-
             jQuery(document).ready(function () {
                 jQuery('.notificationHandler').on('click', function () {
                     jQuery.ajax(
@@ -278,8 +278,25 @@ function toggleNotificationTabs(active) {
                             }
                         }
                     ).done(function () {
-                        jQuery(".notifcationViewLists li.new").removeClass("new");
-                        jQuery(".notificationCounter").fadeOut();
+                        jQuery("#notificationsDropdown .notificationViewLists li.new").removeClass("new");
+                        jQuery("#notificationsDropdown .notificationCounter").fadeOut();
+                    })
+                });
+
+                jQuery('.mentionHandler').on('click', function () {
+                    jQuery.ajax(
+                        {
+                            type: 'PATCH',
+                            url: leantime.appUrl + '/api/notifications',
+                            data: {
+                                id: 'all',
+                                action: 'read',
+                                type: 'mention'
+                            }
+                        }
+                    ).done(function () {
+                        jQuery("#mentionsDropdown .notificationViewLists li.new").removeClass("new");
+                        jQuery("#mentionsDropdown .notificationCounter").fadeOut();
                     })
                 });
 
@@ -287,7 +304,7 @@ function toggleNotificationTabs(active) {
                     e.stopPropagation();
                 });
 
-                jQuery('notificationsDropdown li').click(function () {
+                jQuery('#notificationsDropdown li, #mentionsDropdown li').click(function () {
                     const url = jQuery(this).data('url');
                     const id = jQuery(this).data('id');
 
diff --git a/app/Domain/Notifications/Repositories/Notifications.php b/app/Domain/Notifications/Repositories/Notifications.php
index f55a8f006a..d2aeb182dc 100644
--- a/app/Domain/Notifications/Repositories/Notifications.php
+++ b/app/Domain/Notifications/Repositories/Notifications.php
@@ -146,15 +146,23 @@ public function markNotificationRead($id): bool
         return $results;
     }
 
-    public function markAllNotificationRead($userId): bool
+    public function markAllNotificationRead($userId, ?string $type = null): bool
     {
 
         $sql = 'UPDATE zp_notifications SET `read` = 1 WHERE userId = :id';
 
+        if ($type !== null) {
+            $sql .= ' AND type = :type';
+        }
+
         $stmn = $this->db->database->prepare($sql);
 
         $stmn->bindValue(':id', $userId, PDO::PARAM_INT);
 
+        if ($type !== null) {
+            $stmn->bindValue(':type', $type, PDO::PARAM_STR);
+        }
+
         $results = $stmn->execute();
 
         $stmn->closeCursor();
diff --git a/app/Domain/Notifications/Services/Notifications.php b/app/Domain/Notifications/Services/Notifications.php
index 4647439e98..cba2e25f8a 100644
--- a/app/Domain/Notifications/Services/Notifications.php
+++ b/app/Domain/Notifications/Services/Notifications.php
@@ -68,11 +68,11 @@ public function addNotifications(array $notifications): ?bool
     /**
      * @api
      */
-    public function markNotificationRead($id, $userId): bool
+    public function markNotificationRead($id, $userId, ?string $type = null): bool
     {
 
         if ($id == 'all') {
-            return $this->notificationsRepo->markAllNotificationRead($userId);
+            return $this->notificationsRepo->markAllNotificationRead($userId, $type);
         } else {
             return $this->notificationsRepo->markNotificationRead($id);
         }
diff --git a/app/Domain/Tickets/Templates/showKanban.tpl.php b/app/Domain/Tickets/Templates/showKanban.tpl.php
index 8c8fded707..e1179e54b5 100644
--- a/app/Domain/Tickets/Templates/showKanban.tpl.php
+++ b/app/Domain/Tickets/Templates/showKanban.tpl.php
@@ -225,7 +225,7 @@
 
                             <?php foreach ($tpl->get('allKanbanColumns') as $key => $statusRow) { ?>
                             <div class="column">
-                                <div class="contentInner <?php echo 'status_'.$key; ?>" >
+                                <div class="contentInner <?php echo 'status_'.$key; ?>" style="min-width: 190px;">
                                     <?php foreach ($allTickets as $row) { ?>
                                         <?php if ($row['status'] == $key) {?>
                                         <?php
@@ -298,9 +298,9 @@ class="ticketBox moveable container priority-border-<?= $row['priority']?>"
 
                                             <div class="timerContainer " id="timerContainer-<?php echo $row['id']; ?>" >
 
-                                                    <div class="dropdown ticketDropdown milestoneDropdown colorized show firstDropdown" >
-                                                        <a style="background-color:<?= $tpl->escape($row['milestoneColor'])?>" class="dropdown-toggle f-left  label-default milestone" href="javascript:void(0);" role="button" id="milestoneDropdownMenuLink<?= $row['id']?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                                            <span class="text"><?php
+                                                    <div class="dropdown ticketDropdown milestoneDropdown colorized show firstDropdown" style="max-width: 100%;">
+                                                        <a style="background-color:<?= $tpl->escape($row['milestoneColor'])?>;max-width: 100%;display: inline-block;" class="dropdown-toggle f-left label-default milestone" href="javascript:void(0);" role="button" id="milestoneDropdownMenuLink<?= $row['id']?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                            <span class="text" style="display: inline-block; max-width: 80%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: middle;"><?php
                                                             if ($row['milestoneid'] != '' && $row['milestoneid'] != 0) {
                                                                 $tpl->e($row['milestoneHeadline']);
                                                             } else {
@@ -309,7 +309,7 @@ class="ticketBox moveable container priority-border-<?= $row['priority']?>"
                                                             </span>
                                                             &nbsp;<i class="fa fa-caret-down" aria-hidden="true"></i>
                                                         </a>
-                                                        <ul class="dropdown-menu" aria-labelledby="milestoneDropdownMenuLink<?= $row['id']?>">
+                                                        <ul class="dropdown-menu" aria-labelledby="milestoneDropdownMenuLink<?= $row['id']?>" style="position: absolute; z-index: 9999;">
                                                             <li class="nav-header border"><?= $tpl->__('dropdown.choose_milestone')?></li>
                                                             <li class='dropdown-item'><a style='background-color:#b0b0b0' href='javascript:void(0);' data-label="<?= $tpl->__('label.no_milestone')?>" data-value='<?= $row['id'].'_0_#b0b0b0'?>'> <?= $tpl->__('label.no_milestone')?> </a></li>
 
diff --git a/app/Domain/Timesheets/Controllers/ShowMyMonthlyTimesheet.php b/app/Domain/Timesheets/Controllers/ShowMyMonthlyTimesheet.php
index de894d1d4f..8d95b5cbf5 100644
--- a/app/Domain/Timesheets/Controllers/ShowMyMonthlyTimesheet.php
+++ b/app/Domain/Timesheets/Controllers/ShowMyMonthlyTimesheet.php
@@ -60,7 +60,7 @@ public function run(): Response
         }
 
         $fromDateDb = $fromDate->copy()->setToDbTimezone();
-        $myTimesheets = $this->timesheetService->getWeeklyTimesheets(-1, $fromDateDb, session('userdata.id'));
+        $myTimesheets = $this->timesheetService->getMonthlyTimesheets(-1, $fromDateDb, session('userdata.id'));
         $existingTicketIds = array_map(fn($item) => $item['ticketId'], $myTimesheets);
 
         $this->tpl->assign('existingTicketIds', $existingTicketIds);
diff --git a/app/Domain/Timesheets/Repositories/Timesheets.php b/app/Domain/Timesheets/Repositories/Timesheets.php
index fd78bee542..77719bc168 100644
--- a/app/Domain/Timesheets/Repositories/Timesheets.php
+++ b/app/Domain/Timesheets/Repositories/Timesheets.php
@@ -354,6 +354,70 @@ public function getWeeklyTimesheets(int $projectId, CarbonInterface $fromDate, i
         return $call->fetchAll();
     }
 
+    /* getMonthlyTimesheets - get timesheet entries for a full month (for monthly view) */
+    public function getMonthlyTimesheets(int $projectId, CarbonInterface $fromDate, int $userId = 0, int $daysInMonth = 31): array
+    {
+        $query = 'SELECT
+            zp_timesheets.id,
+            zp_timesheets.userId,
+            zp_timesheets.ticketId,
+            zp_timesheets.workDate as workDate,
+            zp_timesheets.hours,
+            zp_timesheets.description,
+            zp_timesheets.kind,
+            zp_timesheets.invoicedEmpl,
+            zp_timesheets.invoicedComp,
+            zp_timesheets.invoicedEmplDate,
+            zp_timesheets.invoicedCompDate,
+            zp_timesheets.paid,
+            zp_timesheets.paidDate,
+            zp_timesheets.kind,
+            zp_timesheets.modified,
+            zp_tickets.headline,
+            zp_tickets.planHours,
+            zp_projects.name,
+            zp_projects.id AS projectId,
+            zp_projects.projectKey AS projectKey,
+            zp_projects.clientId AS clientId,
+            zp_clients.name AS clientName
+        FROM
+            zp_timesheets
+        LEFT JOIN zp_tickets ON zp_tickets.id = zp_timesheets.ticketId
+        LEFT JOIN zp_projects ON zp_tickets.projectId = zp_projects.id
+        LEFT JOIN zp_clients ON zp_clients.id = zp_projects.clientId
+        WHERE
+            (zp_timesheets.workDate >= :dateStart1 AND zp_timesheets.workDate < :dateEnd)
+            AND (zp_timesheets.userId = :userId)
+            AND hours > 0
+        ';
+
+        if ($projectId > 0) {
+            $query .= ' AND zp_tickets.projectId = :projectId';
+        }
+
+        $query .= ' ORDER BY zp_timesheets.ticketId, zp_timesheets.kind, zp_timesheets.workDate DESC';
+
+        $call = $this->dbcall(func_get_args());
+
+        $call->prepare($query);
+
+        if (! $fromDate->isUtc()) {
+            $fromDate->setTimezone('UTC');
+        }
+
+        $call->bindValue(':dateStart1', $fromDate);
+
+        $endDate = $fromDate->copy()->addDays($daysInMonth);
+        $call->bindValue(':dateEnd', $endDate);
+        $call->bindValue(':userId', $userId, PDO::PARAM_INT);
+
+        if ($projectId > 0) {
+            $call->bindValue(':projectId', $projectId, PDO::PARAM_INT);
+        }
+
+        return $call->fetchAll();
+    }
+
     /**
      * getUsersTicketHours - get the total hours
      *
diff --git a/app/Domain/Timesheets/Services/SlackMonthlyReportService.php b/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
index 3c18f3d912..43ebc333b5 100644
--- a/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
+++ b/app/Domain/Timesheets/Services/SlackMonthlyReportService.php
@@ -323,6 +323,9 @@ private function generateCsvString(array $filters, array $columnState = []): str
         $filters['paidCheck'],
         $filters['clientId']
     );
+    usort($allTimesheets, function($a, $b) {
+        return strtotime($a['workDate']) <=> strtotime($b['workDate']);
+    });
 
     $userId = $filters['userId'] ?? session('userdata.id');
     $hoursFormat = 'decimal';
@@ -393,7 +396,8 @@ private function generateCsvString(array $filters, array $columnState = []): str
         $filteredRow = array_intersect_key($rowData, $activeColumns);
         fputcsv($output, array_values($filteredRow));
     }
-        $totalsRowData = [
+    
+    $totalsRowData = [
         'id' => '',
         'tickId' => '',
         'date' => '',
diff --git a/app/Domain/Timesheets/Services/Timesheets.php b/app/Domain/Timesheets/Services/Timesheets.php
index a2b246f31b..36fd9196ce 100644
--- a/app/Domain/Timesheets/Services/Timesheets.php
+++ b/app/Domain/Timesheets/Services/Timesheets.php
@@ -507,6 +507,84 @@ public function getWeeklyTimesheets(int $projectId, CarbonInterface $fromDate, i
         return $timesheetGroups;
     }
 
+    /* getMonthlyTimesheets - get timesheets grouped by day for the full month (for monthly view) */
+    public function getMonthlyTimesheets(int $projectId, CarbonInterface $fromDate, int $userId = 0): array
+    {
+        $daysInMonth = $fromDate->daysInMonth();
+
+        $allTimesheets = $this->timesheetsRepo->getMonthlyTimesheets(
+            projectId: $projectId,
+            fromDate: $fromDate,
+            userId: $userId,
+            daysInMonth: $daysInMonth
+        );
+
+        $timesheetGroups = [];
+        foreach ($allTimesheets as $timesheet) {
+            try {
+                $currentWorkDate = dtHelper()->parseDbDateTime($timesheet['workDate']);
+            } catch (\Exception $e) {
+                Log::warning($e);
+
+                continue;
+            }
+
+            $workdateOffsetStart = (int) ($currentWorkDate->setToUserTimezone()->secondsSinceMidnight() / 60 / 60);
+            $timezonedTime = $currentWorkDate->format('H:i:s');
+            $groupKey = $timesheet['ticketId'].'-'.$timesheet['kind'].'-'.$timezonedTime;
+
+            if (! isset($timesheetGroups[$groupKey])) {
+                $group = [
+                    'kind' => $timesheet['kind'],
+                    'clientName' => $timesheet['clientName'],
+                    'name' => $timesheet['name'],
+                    'headline' => $timesheet['headline'],
+                    'ticketId' => $timesheet['ticketId'],
+                    'projectId' => $timesheet['projectId'],
+                    'projectKey' => $timesheet['projectKey'],
+                    'hasTimesheetOffset' => $workdateOffsetStart !== 0,
+                    'rowSum' => 0,
+                ];
+
+                for ($d = 0; $d < $daysInMonth; $d++) {
+                    $dayNum = $d + 1;
+                    $dayStart = $fromDate->copy()->addDays($d);
+                    $dayEnd = $fromDate->copy()->addDays($d)->addHours(23)->addMinutes(59);
+                    $group['day'.$dayNum] = [
+                        'start' => $dayStart,
+                        'end' => $dayEnd,
+                        'actualWorkDate' => $workdateOffsetStart === 0
+                            ? $fromDate->copy()->addDays($d)->setTime($currentWorkDate->hour, $currentWorkDate->minute, $currentWorkDate->second)
+                            : '',
+                        'hours' => 0,
+                        'description' => '',
+                        'id' => null,
+                    ];
+                }
+
+                $timesheetGroups[$groupKey] = $group;
+            }
+
+            for ($d = 1; $d <= $daysInMonth; $d++) {
+                $dayKey = 'day'.$d;
+                $start = $timesheetGroups[$groupKey][$dayKey]['start'];
+                $end = $timesheetGroups[$groupKey][$dayKey]['end'];
+
+                if ($currentWorkDate->gte($start) && $currentWorkDate->lt($end)) {
+                    $timesheetGroups[$groupKey][$dayKey]['hours'] += $timesheet['hours'];
+                    $timesheetGroups[$groupKey][$dayKey]['actualWorkDate'] = $currentWorkDate;
+                    $timesheetGroups[$groupKey][$dayKey]['description'] = $timesheet['description'];
+                    $timesheetGroups[$groupKey][$dayKey]['id'] = $timesheet['id'];
+                    break;
+                }
+            }
+
+            $timesheetGroups[$groupKey]['rowSum'] += $timesheet['hours'];
+        }
+
+        return $timesheetGroups;
+    }
+
     /**
      * @api
      */
diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php
index 14aae45568..e83ec42234 100644
--- a/app/Domain/Timesheets/Templates/showMy.tpl.php
+++ b/app/Domain/Timesheets/Templates/showMy.tpl.php
@@ -215,7 +215,7 @@
 <!-- page header -->
 
 <div class="maincontent">
-    <div class="maincontentinner" style ="width:1200px;">
+    <div class="maincontentinner">
         <?php
         echo $tpl->displayNotification();
 
diff --git a/app/Domain/Timesheets/Templates/showMyMonthlyTimesheet.tpl.php b/app/Domain/Timesheets/Templates/showMyMonthlyTimesheet.tpl.php
index 22dab22321..0947068b59 100644
--- a/app/Domain/Timesheets/Templates/showMyMonthlyTimesheet.tpl.php
+++ b/app/Domain/Timesheets/Templates/showMyMonthlyTimesheet.tpl.php
@@ -433,4 +433,4 @@ class="hourCell"
             <div class="clearall"></div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
new file mode 100644
index 0000000000..d2a2983ac6
--- /dev/null
+++ b/docker-compose.local.yml
@@ -0,0 +1,90 @@
+services:
+  leantime_db:
+    image: mysql:8.0.44
+    container_name: leantime_db_local
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-rootpassword}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-leantime}
+      MYSQL_USER: ${MYSQL_USER:-leantime}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-leantime}
+    volumes:
+      - db_data:/var/lib/mysql
+    networks:
+      - leantime-net
+    command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-rootpassword}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    ports:
+      - "3307:3306"  
+
+  leantime:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: leantime:local
+    container_name: leantime_app_local
+    restart: unless-stopped
+    env_file:
+      - .env
+    environment:
+      LEAN_DB_HOST: leantime_db
+      LEAN_DB_PORT: 3306
+      LEAN_DB_DATABASE: ${MYSQL_DATABASE:-leantime}
+      LEAN_DB_USER: ${MYSQL_USER:-leantime}
+      LEAN_DB_PASSWORD: ${MYSQL_PASSWORD:-leantime}
+      
+      LEAN_APP_URL: ${LEAN_APP_URL:-http://localhost:8080}
+      LEAN_DEBUG: ${LEAN_DEBUG:-1}
+      LEAN_SESSION_SECURE: "false"
+      
+      LEAN_SESSION_PASSWORD: ${LEAN_SESSION_PASSWORD:-}
+      
+      LEAN_SITENAME: ${LEAN_SITENAME:-Leantime-Local}
+      LEAN_LANGUAGE: ${LEAN_LANGUAGE:-en-US}
+      LEAN_DEFAULT_TIMEZONE: ${LEAN_DEFAULT_TIMEZONE:-UTC}
+    ports:
+      - "${LEAN_PORT:-8080}:8080"
+    networks:
+      - leantime-net
+    volumes:
+      - userfiles:/var/www/html/userfiles
+      - public_userfiles:/var/www/html/public/userfiles
+      - logs:/var/www/html/storage/logs
+      - sessions:/var/www/html/storage/framework/sessions
+      - cache:/var/www/html/storage/framework/cache
+      - views:/var/www/html/storage/framework/views
+    depends_on:
+      leantime_db:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/healthCheck.php"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
+
+volumes:
+  db_data:
+    name: leantime_db_data_local
+  userfiles:
+    name: leantime_userfiles_local
+  public_userfiles:
+    name: leantime_public_userfiles_local
+  logs:
+    name: leantime_logs_local
+  sessions:
+    name: leantime_sessions_local
+  cache:
+    name: leantime_cache_local
+  views:
+    name: leantime_views_local
+
+networks:
+  leantime-net:
+    name: leantime-network-local
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
new file mode 100644
index 0000000000..e958e6db49
--- /dev/null
+++ b/docker-compose.production.yml
@@ -0,0 +1,81 @@
+services:
+  leantime_db:
+    image: mysql:8.0.44
+    container_name: leantime_prod_db
+    env_file:
+      - .env
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - db_data:/var/lib/mysql
+    networks:
+      - leantime-net
+    command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
+  leantime:
+    image: leantime-prod:prod
+    container_name: leantime_app_prod
+    restart: unless-stopped
+    env_file:
+      - .env
+    environment:
+      LEAN_DB_HOST: leantime_db
+      LEAN_DB_PORT: 3306
+      LEAN_APP_URL: ${LEAN_APP_URL}
+      LEAN_DEBUG: 0
+      LEAN_SESSION_SECURE: "true"
+      LEAN_SESSION_PASSWORD: ${LEAN_SESSION_PASSWORD}
+      LEAN_SITENAME: ${LEAN_SITENAME}
+      LEAN_LANGUAGE: ${LEAN_LANGUAGE}
+      LEAN_DEFAULT_TIMEZONE: ${LEAN_DEFAULT_TIMEZONE}
+    ports:
+      - "${LEAN_PORT:-8100}:8080"
+    networks:
+      - leantime-net
+    volumes:
+      - userfiles:/var/www/html/userfiles
+      - public_userfiles:/var/www/html/public/userfiles
+      - logs:/var/www/html/storage/logs
+      - sessions:/var/www/html/storage/framework/sessions
+      - cache:/var/www/html/storage/framework/cache
+      - views:/var/www/html/storage/framework/views
+    depends_on:
+      leantime_db:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080 || exit 1"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 60s
+
+volumes:
+  db_data:
+    name: leantime_db_data_prod
+  userfiles:
+    name: leantime_userfiles_prod
+  public_userfiles:
+    name: leantime_public_userfiles_prod
+  logs:
+    name: leantime_logs_prod
+  sessions:
+    name: leantime_sessions_prod
+  cache:
+    name: leantime_cache_prod
+  views:
+    name: leantime_views_prod
+
+networks:
+  leantime-net:
+    name: leantime-network-prod
+    driver: bridge
\ No newline at end of file
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
new file mode 100644
index 0000000000..7660cca0d6
--- /dev/null
+++ b/docker-compose.staging.yml
@@ -0,0 +1,83 @@
+services:
+  leantime_db:
+    image: mysql:8.0.44
+    container_name: leantime_staging_db
+    env_file:
+      - .env
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - db_data:/var/lib/mysql
+    networks:
+      - leantime-net
+    command: --character-set-server=UTF8MB4 --collation-server=UTF8MB4_unicode_ci
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    ports:
+      - "3307:3306"
+
+  leantime:
+    image: leantime-staging:staging
+    container_name: leantime_app_local
+    restart: unless-stopped
+    env_file:
+      - .env
+    environment:
+      LEAN_DB_HOST: leantime_db
+      LEAN_DB_PORT: 3306
+      LEAN_APP_URL: ${LEAN_APP_URL}
+      LEAN_DEBUG: ${LEAN_DEBUG}
+      LEAN_SESSION_SECURE: "false"
+      LEAN_SESSION_PASSWORD: ${LEAN_SESSION_PASSWORD}
+      LEAN_SITENAME: ${LEAN_SITENAME}
+      LEAN_LANGUAGE: ${LEAN_LANGUAGE}
+      LEAN_DEFAULT_TIMEZONE: ${LEAN_DEFAULT_TIMEZONE}
+    ports:
+      - "${LEAN_PORT:-8080}:8080"
+    networks:
+      - leantime-net
+    volumes:
+      - userfiles:/var/www/html/userfiles
+      - public_userfiles:/var/www/html/public/userfiles
+      - logs:/var/www/html/storage/logs
+      - sessions:/var/www/html/storage/framework/sessions
+      - cache:/var/www/html/storage/framework/cache
+      - views:/var/www/html/storage/framework/views
+    depends_on:
+      leantime_db:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080 || exit 1"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 60s
+
+volumes:
+  db_data:
+    name: leantime_db_data_local
+  userfiles:
+    name: leantime_userfiles_local
+  public_userfiles:
+    name: leantime_public_userfiles_local
+  logs:
+    name: leantime_logs_local
+  sessions:
+    name: leantime_sessions_local
+  cache:
+    name: leantime_cache_local
+  views:
+    name: leantime_views_local
+
+networks:
+  leantime-net:
+    name: leantime-network-local
+    driver: bridge
\ No newline at end of file
diff --git a/public/assets/css/components/kanban.css b/public/assets/css/components/kanban.css
index 753b9a3ebe..1afaa7d592 100644
--- a/public/assets/css/components/kanban.css
+++ b/public/assets/css/components/kanban.css
@@ -19,7 +19,7 @@
     height:auto;
     padding:0px 5px;
     flex:1;
-    min-width:150px;
+    min-width:200px;
 }
 
 .column:first-child {
diff --git a/public/dist/.gitignore b/public/dist/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/public/dist/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/public/dist/mix-manifest.json b/public/dist/mix-manifest.json
deleted file mode 100644
index bc00d7f6ce..0000000000
--- a/public/dist/mix-manifest.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-    "/js/compiled-htmx.3.5.12.min.js": "/js/compiled-htmx.3.5.12.min.js",
-    "/js/compiled-htmx-extensions.3.5.12.min.js": "/js/compiled-htmx-extensions.3.5.12.min.js",
-    "/js/compiled-lottieplayer.3.5.12.min.js": "/js/compiled-lottieplayer.3.5.12.min.js",
-    "/css/main.3.5.12.min.css": "/css/main.3.5.12.min.css",
-    "/css/editor.3.5.12.min.css": "/css/editor.3.5.12.min.css",
-    "/css/app.3.5.12.min.css": "/css/app.3.5.12.min.css",
-    "/js/compiled-footer.3.5.12.min.js": "/js/compiled-footer.3.5.12.min.js",
-    "/js/compiled-app.3.5.12.min.js": "/js/compiled-app.3.5.12.min.js",
-    "/js/compiled-frameworks.3.5.12.min.js": "/js/compiled-frameworks.3.5.12.min.js",
-    "/js/compiled-framework-plugins.3.5.12.min.js": "/js/compiled-framework-plugins.3.5.12.min.js",
-    "/js/compiled-global-component.3.5.12.min.js": "/js/compiled-global-component.3.5.12.min.js",
-    "/js/compiled-calendar-component.3.5.12.min.js": "/js/compiled-calendar-component.3.5.12.min.js",
-    "/js/compiled-table-component.3.5.12.min.js": "/js/compiled-table-component.3.5.12.min.js",
-    "/js/compiled-editor-component.3.5.12.min.js": "/js/compiled-editor-component.3.5.12.min.js",
-    "/js/compiled-gantt-component.3.5.12.min.js": "/js/compiled-gantt-component.3.5.12.min.js",
-    "/js/compiled-chart-component.3.5.12.min.js": "/js/compiled-chart-component.3.5.12.min.js",
-    "/images/03-1.png": "/images/03-1.png",
-    "/images/32px.png": "/images/32px.png",
-    "/images/40px.png": "/images/40px.png",
-    "/images/Screenshots/calendar.png": "/images/Screenshots/calendar.png",
-    "/images/Screenshots/dark.png": "/images/Screenshots/dark.png",
-    "/images/Screenshots/docs.png": "/images/Screenshots/docs.png",
-    "/images/Screenshots/goals.png": "/images/Screenshots/goals.png",
-    "/images/Screenshots/kanban.png": "/images/Screenshots/kanban.png",
-    "/images/Screenshots/mywork-v3.5.png": "/images/Screenshots/mywork-v3.5.png",
-    "/images/Screenshots/projectDashboard.png": "/images/Screenshots/projectDashboard.png",
-    "/images/Screenshots/table.png": "/images/Screenshots/table.png",
-    "/images/Screenshots/timeline.png": "/images/Screenshots/timeline.png",
-    "/images/Screenshots/timesheet.png": "/images/Screenshots/timesheet.png",
-    "/images/apple-touch-icon.png": "/images/apple-touch-icon.png",
-    "/images/background-default.png": "/images/background-default.png",
-    "/images/background-minimal.png": "/images/background-minimal.png",
-    "/images/backgrounds/bg0.png": "/images/backgrounds/bg0.png",
-    "/images/backgrounds/bg1.png": "/images/backgrounds/bg1.png",
-    "/images/backgrounds/bg2.png": "/images/backgrounds/bg2.png",
-    "/images/backgrounds/bg3.png": "/images/backgrounds/bg3.png",
-    "/images/backgrounds/bg4.png": "/images/backgrounds/bg4.png",
-    "/images/backgrounds/bg5.png": "/images/backgrounds/bg5.png",
-    "/images/backgrounds/bg6.png": "/images/backgrounds/bg6.png",
-    "/images/backgrounds/bg7.png": "/images/backgrounds/bg7.png",
-    "/images/calarrow.png": "/images/calarrow.png",
-    "/images/chosen-sprite-light.png": "/images/chosen-sprite-light.png",
-    "/images/chosen-sprite-light@2x.png": "/images/chosen-sprite-light@2x.png",
-    "/images/chosen-sprite.png": "/images/chosen-sprite.png",
-    "/images/close.png": "/images/close.png",
-    "/images/discord-logo.png": "/images/discord-logo.png",
-    "/images/doc.png": "/images/doc.png",
-    "/images/favicon.png": "/images/favicon.png",
-    "/images/gloria.png": "/images/gloria.png",
-    "/images/icon-192.png": "/images/icon-192.png",
-    "/images/icon-512.png": "/images/icon-512.png",
-    "/images/index.html": "/images/index.html",
-    "/images/intentionsGraphics.png": "/images/intentionsGraphics.png",
-    "/images/leoDino.png": "/images/leoDino.png",
-    "/images/leoHead.png": "/images/leoHead.png",
-    "/images/loading-animation.svg": "/images/loading-animation.svg",
-    "/images/logo-powered-by-leantime.png": "/images/logo-powered-by-leantime.png",
-    "/images/logo.png": "/images/logo.png",
-    "/images/logo.svg": "/images/logo.svg",
-    "/images/logo_blue.png": "/images/logo_blue.png",
-    "/images/logo_blue.svg": "/images/logo_blue.svg",
-    "/images/marcel.png": "/images/marcel.png",
-    "/images/mattermost-logoHorizontal.png": "/images/mattermost-logoHorizontal.png",
-    "/images/openid-icon.png": "/images/openid-icon.png",
-    "/images/spotlightBg.png": "/images/spotlightBg.png",
-    "/images/svg/apps-grid-icon.svg": "/images/svg/apps-grid-icon.svg",
-    "/images/svg/csv-icon.svg": "/images/svg/csv-icon.svg",
-    "/images/svg/loading-animation.svg": "/images/svg/loading-animation.svg",
-    "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
-    "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
-    "/images/svg/undraw_adjustments_p22m.svg": "/images/svg/undraw_adjustments_p22m.svg",
-    "/images/svg/undraw_adventure_map_hnin.svg": "/images/svg/undraw_adventure_map_hnin.svg",
-    "/images/svg/undraw_air_support_re_nybl.svg": "/images/svg/undraw_air_support_re_nybl.svg",
-    "/images/svg/undraw_attached_file_re_0n9b.svg": "/images/svg/undraw_attached_file_re_0n9b.svg",
-    "/images/svg/undraw_blooming_re_2kc4.svg": "/images/svg/undraw_blooming_re_2kc4.svg",
-    "/images/svg/undraw_book_reading_re_fu2c.svg": "/images/svg/undraw_book_reading_re_fu2c.svg",
-    "/images/svg/undraw_business_decisions_re_84ag.svg": "/images/svg/undraw_business_decisions_re_84ag.svg",
-    "/images/svg/undraw_character_drawing_re_s2lj.svg": "/images/svg/undraw_character_drawing_re_s2lj.svg",
-    "/images/svg/undraw_chat_bot_re_e2gj.svg": "/images/svg/undraw_chat_bot_re_e2gj.svg",
-    "/images/svg/undraw_children_re_c37f.svg": "/images/svg/undraw_children_re_c37f.svg",
-    "/images/svg/undraw_complete_task_u2c3.svg": "/images/svg/undraw_complete_task_u2c3.svg",
-    "/images/svg/undraw_dark_mode_2xam.svg": "/images/svg/undraw_dark_mode_2xam.svg",
-    "/images/svg/undraw_design_data_khdb.svg": "/images/svg/undraw_design_data_khdb.svg",
-    "/images/svg/undraw_events_2p66.svg": "/images/svg/undraw_events_2p66.svg",
-    "/images/svg/undraw_events_re_98ue.svg": "/images/svg/undraw_events_re_98ue.svg",
-    "/images/svg/undraw_explore_re_8l4v.svg": "/images/svg/undraw_explore_re_8l4v.svg",
-    "/images/svg/undraw_fans_re_cri3.svg": "/images/svg/undraw_fans_re_cri3.svg",
-    "/images/svg/undraw_football-with-dad_w7m1.svg": "/images/svg/undraw_football-with-dad_w7m1.svg",
-    "/images/svg/undraw_game_day_ucx9.svg": "/images/svg/undraw_game_day_ucx9.svg",
-    "/images/svg/undraw_goals_re_lu76.svg": "/images/svg/undraw_goals_re_lu76.svg",
-    "/images/svg/undraw_happy_music_g6wc.svg": "/images/svg/undraw_happy_music_g6wc.svg",
-    "/images/svg/undraw_happy_news_re_tsbd.svg": "/images/svg/undraw_happy_news_re_tsbd.svg",
-    "/images/svg/undraw_hello_ccwj.svg": "/images/svg/undraw_hello_ccwj.svg",
-    "/images/svg/undraw_image__folder_re_hgp7.svg": "/images/svg/undraw_image__folder_re_hgp7.svg",
-    "/images/svg/undraw_instant_support_re_s7un.svg": "/images/svg/undraw_instant_support_re_s7un.svg",
-    "/images/svg/undraw_join_re_w1lh.svg": "/images/svg/undraw_join_re_w1lh.svg",
-    "/images/svg/undraw_joyride_re_968t.svg": "/images/svg/undraw_joyride_re_968t.svg",
-    "/images/svg/undraw_meditation_re_gll0.svg": "/images/svg/undraw_meditation_re_gll0.svg",
-    "/images/svg/undraw_mind_map_re_nlb6.svg": "/images/svg/undraw_mind_map_re_nlb6.svg",
-    "/images/svg/undraw_neighbors_ciwb.svg": "/images/svg/undraw_neighbors_ciwb.svg",
-    "/images/svg/undraw_new_ideas_jdea.svg": "/images/svg/undraw_new_ideas_jdea.svg",
-    "/images/svg/undraw_no_data_re_kwbl.svg": "/images/svg/undraw_no_data_re_kwbl.svg",
-    "/images/svg/undraw_online_connection_6778.svg": "/images/svg/undraw_online_connection_6778.svg",
-    "/images/svg/undraw_online_party_re_7t6g.svg": "/images/svg/undraw_online_party_re_7t6g.svg",
-    "/images/svg/undraw_party_re_nmwj.svg": "/images/svg/undraw_party_re_nmwj.svg",
-    "/images/svg/undraw_partying_re_at7f.svg": "/images/svg/undraw_partying_re_at7f.svg",
-    "/images/svg/undraw_photos_re_pvh3.svg": "/images/svg/undraw_photos_re_pvh3.svg",
-    "/images/svg/undraw_powerful_re_frhr.svg": "/images/svg/undraw_powerful_re_frhr.svg",
-    "/images/svg/undraw_progressive_app_m-9-ms.svg": "/images/svg/undraw_progressive_app_m-9-ms.svg",
-    "/images/svg/undraw_real_time_collaboration_c62i.svg": "/images/svg/undraw_real_time_collaboration_c62i.svg",
-    "/images/svg/undraw_schedule_pnbk.svg": "/images/svg/undraw_schedule_pnbk.svg",
-    "/images/svg/undraw_schedule_re_2vro.svg": "/images/svg/undraw_schedule_re_2vro.svg",
-    "/images/svg/undraw_scrum-board_uqku.svg": "/images/svg/undraw_scrum-board_uqku.svg",
-    "/images/svg/undraw_scrum_board_cesn.svg": "/images/svg/undraw_scrum_board_cesn.svg",
-    "/images/svg/undraw_search_app_oso2.svg": "/images/svg/undraw_search_app_oso2.svg",
-    "/images/svg/undraw_security_on_re_e491.svg": "/images/svg/undraw_security_on_re_e491.svg",
-    "/images/svg/undraw_setup_wizard_re_nday.svg": "/images/svg/undraw_setup_wizard_re_nday.svg",
-    "/images/svg/undraw_shared_goals_re_jvqd.svg": "/images/svg/undraw_shared_goals_re_jvqd.svg",
-    "/images/svg/undraw_showing-support_ixfc.svg": "/images/svg/undraw_showing-support_ixfc.svg",
-    "/images/svg/undraw_smiley_face_re_9uid.svg": "/images/svg/undraw_smiley_face_re_9uid.svg",
-    "/images/svg/undraw_social_serenity_vhix.svg": "/images/svg/undraw_social_serenity_vhix.svg",
-    "/images/svg/undraw_solution_mindset_re_57bf.svg": "/images/svg/undraw_solution_mindset_re_57bf.svg",
-    "/images/svg/undraw_spreadsheets_re_alt0.svg": "/images/svg/undraw_spreadsheets_re_alt0.svg",
-    "/images/svg/undraw_taking_notes_re_bnaf.svg": "/images/svg/undraw_taking_notes_re_bnaf.svg",
-    "/images/svg/undraw_task_31wc.svg": "/images/svg/undraw_task_31wc.svg",
-    "/images/svg/undraw_team_spirit_hrr4.svg": "/images/svg/undraw_team_spirit_hrr4.svg",
-    "/images/svg/undraw_thought_process_re_om58.svg": "/images/svg/undraw_thought_process_re_om58.svg",
-    "/images/svg/undraw_time_management_30iu.svg": "/images/svg/undraw_time_management_30iu.svg",
-    "/images/svg/undraw_time_management_re_tk5w.svg": "/images/svg/undraw_time_management_re_tk5w.svg",
-    "/images/svg/undraw_unexpected-friends_42mc.svg": "/images/svg/undraw_unexpected-friends_42mc.svg",
-    "/images/svg/undraw_welcome_re_h3d9.svg": "/images/svg/undraw_welcome_re_h3d9.svg",
-    "/images/svg/undraw_welcoming_re_x0qo.svg": "/images/svg/undraw_welcoming_re_x0qo.svg",
-    "/images/svg/undraw_wishes_icyp.svg": "/images/svg/undraw_wishes_icyp.svg",
-    "/images/throbber.gif": "/images/throbber.gif",
-    "/images/undraw_progressive_app_m9ms.png": "/images/undraw_progressive_app_m9ms.png",
-    "/images/zulip-org-logo.png": "/images/zulip-org-logo.png",
-    "/fonts/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
-    "/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
-    "/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
-    "/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
-    "/fonts/Roboto-Italic.woff2": "/fonts/Roboto-Italic.woff2",
-    "/fonts/Roboto-Light.ttf": "/fonts/Roboto-Light.ttf",
-    "/fonts/Roboto-Light.woff2": "/fonts/Roboto-Light.woff2",
-    "/fonts/Roboto-LightItalic.ttf": "/fonts/Roboto-LightItalic.ttf",
-    "/fonts/Roboto-LightItalic.woff2": "/fonts/Roboto-LightItalic.woff2",
-    "/fonts/Roboto-Medium.ttf": "/fonts/Roboto-Medium.ttf",
-    "/fonts/Roboto-Medium.woff2": "/fonts/Roboto-Medium.woff2",
-    "/fonts/Roboto-MediumItalic.ttf": "/fonts/Roboto-MediumItalic.ttf",
-    "/fonts/Roboto-MediumItalic.woff2": "/fonts/Roboto-MediumItalic.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold.woff2": "/fonts/Shantell_Sans-Informal_Bold.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular.woff2": "/fonts/Shantell_Sans-Informal_Regular.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2",
-    "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf",
-    "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Font-License-2020-1104.pdf": "/fonts/atkinson/Atkinson-Hyperlegible-Font-License-2020-1104.pdf",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102.ttf",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf",
-    "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2",
-    "/fonts/fa-brands-400.ttf": "/fonts/fa-brands-400.ttf",
-    "/fonts/fa-brands-400.woff2": "/fonts/fa-brands-400.woff2",
-    "/fonts/fa-regular-400.ttf": "/fonts/fa-regular-400.ttf",
-    "/fonts/fa-regular-400.woff2": "/fonts/fa-regular-400.woff2",
-    "/fonts/fa-solid-900.ttf": "/fonts/fa-solid-900.ttf",
-    "/fonts/fa-solid-900.woff2": "/fonts/fa-solid-900.woff2",
-    "/fonts/fa-v4compatibility.ttf": "/fonts/fa-v4compatibility.ttf",
-    "/fonts/fa-v4compatibility.woff2": "/fonts/fa-v4compatibility.woff2",
-    "/fonts/roboto/Google Android License.txt": "/fonts/roboto/Google Android License.txt",
-    "/fonts/roboto/LICENSE.txt": "/fonts/roboto/LICENSE.txt",
-    "/fonts/roboto/Roboto-Black.ttf": "/fonts/roboto/Roboto-Black.ttf",
-    "/fonts/roboto/Roboto-Black.woff2": "/fonts/roboto/Roboto-Black.woff2",
-    "/fonts/roboto/Roboto-BlackItalic.ttf": "/fonts/roboto/Roboto-BlackItalic.ttf",
-    "/fonts/roboto/Roboto-BlackItalic.woff2": "/fonts/roboto/Roboto-BlackItalic.woff2",
-    "/fonts/roboto/Roboto-Bold.ttf": "/fonts/roboto/Roboto-Bold.ttf",
-    "/fonts/roboto/Roboto-Bold.woff2": "/fonts/roboto/Roboto-Bold.woff2",
-    "/fonts/roboto/Roboto-BoldItalic.ttf": "/fonts/roboto/Roboto-BoldItalic.ttf",
-    "/fonts/roboto/Roboto-BoldItalic.woff2": "/fonts/roboto/Roboto-BoldItalic.woff2",
-    "/fonts/roboto/Roboto-Italic.ttf": "/fonts/roboto/Roboto-Italic.ttf",
-    "/fonts/roboto/Roboto-Italic.woff2": "/fonts/roboto/Roboto-Italic.woff2",
-    "/fonts/roboto/Roboto-Light.ttf": "/fonts/roboto/Roboto-Light.ttf",
-    "/fonts/roboto/Roboto-Light.woff2": "/fonts/roboto/Roboto-Light.woff2",
-    "/fonts/roboto/Roboto-LightItalic.ttf": "/fonts/roboto/Roboto-LightItalic.ttf",
-    "/fonts/roboto/Roboto-LightItalic.woff2": "/fonts/roboto/Roboto-LightItalic.woff2",
-    "/fonts/roboto/Roboto-Medium.ttf": "/fonts/roboto/Roboto-Medium.ttf",
-    "/fonts/roboto/Roboto-Medium.woff2": "/fonts/roboto/Roboto-Medium.woff2",
-    "/fonts/roboto/Roboto-MediumItalic.ttf": "/fonts/roboto/Roboto-MediumItalic.ttf",
-    "/fonts/roboto/Roboto-MediumItalic.woff2": "/fonts/roboto/Roboto-MediumItalic.woff2",
-    "/fonts/roboto/Roboto-Regular.ttf": "/fonts/roboto/Roboto-Regular.ttf",
-    "/fonts/roboto/Roboto-Regular.woff2": "/fonts/roboto/Roboto-Regular.woff2",
-    "/fonts/roboto/Roboto-Thin.ttf": "/fonts/roboto/Roboto-Thin.ttf",
-    "/fonts/roboto/Roboto-Thin.woff2": "/fonts/roboto/Roboto-Thin.woff2",
-    "/fonts/roboto/Roboto-ThinItalic.ttf": "/fonts/roboto/Roboto-ThinItalic.ttf",
-    "/fonts/roboto/Roboto-ThinItalic.woff2": "/fonts/roboto/Roboto-ThinItalic.woff2",
-    "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2",
-    "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2",
-    "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2",
-    "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2",
-    "/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
-    "/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
-    "/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
-    "/lottie/leo/Mermaid.json": "/lottie/leo/Mermaid.json",
-    "/lottie/leo/Narhwal.json": "/lottie/leo/Narhwal.json",
-    "/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
-    "/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
-    "/lottie/leo/announcement.json": "/lottie/leo/announcement.json",
-    "/lottie/leo/celebration-robot.json": "/lottie/leo/celebration-robot.json",
-    "/lottie/leo/exclamation.json": "/lottie/leo/exclamation.json",
-    "/lottie/leo/happy.json": "/lottie/leo/happy.json",
-    "/lottie/leo/heart.json": "/lottie/leo/heart.json",
-    "/lottie/leo/in-robo.json": "/lottie/leo/in-robo.json",
-    "/lottie/leo/king_arthur.json": "/lottie/leo/king_arthur.json",
-    "/lottie/leo/motivational_speaker.json": "/lottie/leo/motivational_speaker.json",
-    "/lottie/leo/peaking.json": "/lottie/leo/peaking.json",
-    "/lottie/leo/pirate.json": "/lottie/leo/pirate.json",
-    "/lottie/leo/robot-transform-loading.json": "/lottie/leo/robot-transform-loading.json",
-    "/lottie/leo/rolling_leo.json": "/lottie/leo/rolling_leo.json",
-    "/lottie/leo/sleep.json": "/lottie/leo/sleep.json",
-    "/lottie/leo/smoking.json": "/lottie/leo/smoking.json",
-    "/lottie/leo/still.json": "/lottie/leo/still.json",
-    "/css/libs/tinymceSkin/oxide/content.css": "/css/libs/tinymceSkin/oxide/content.css",
-    "/css/libs/tinymceSkin/oxide/content.inline.css": "/css/libs/tinymceSkin/oxide/content.inline.css",
-    "/css/libs/tinymceSkin/oxide/content.inline.min.css": "/css/libs/tinymceSkin/oxide/content.inline.min.css",
-    "/css/libs/tinymceSkin/oxide/content.min.css": "/css/libs/tinymceSkin/oxide/content.min.css",
-    "/css/libs/tinymceSkin/oxide/content.mobile.css": "/css/libs/tinymceSkin/oxide/content.mobile.css",
-    "/css/libs/tinymceSkin/oxide/content.mobile.min.css": "/css/libs/tinymceSkin/oxide/content.mobile.min.css",
-    "/css/libs/tinymceSkin/oxide/fonts/tinymce-mobile.woff": "/css/libs/tinymceSkin/oxide/fonts/tinymce-mobile.woff",
-    "/css/libs/tinymceSkin/oxide/skin.css": "/css/libs/tinymceSkin/oxide/skin.css",
-    "/css/libs/tinymceSkin/oxide/skin.min.css": "/css/libs/tinymceSkin/oxide/skin.min.css",
-    "/css/libs/tinymceSkin/oxide/skin.mobile.css": "/css/libs/tinymceSkin/oxide/skin.mobile.css",
-    "/css/libs/tinymceSkin/oxide/skin.mobile.min.css": "/css/libs/tinymceSkin/oxide/skin.mobile.min.css"
-}
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1db4279d18..2ff8499166 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -179,4 +179,4 @@
     "/dist/fonts/roboto/Roboto-Thin.woff2": "/dist/fonts/roboto/Roboto-Thin.woff2",
     "/dist/fonts/roboto/Roboto-ThinItalic.ttf": "/dist/fonts/roboto/Roboto-ThinItalic.ttf",
     "/dist/fonts/roboto/Roboto-ThinItalic.woff2": "/dist/fonts/roboto/Roboto-ThinItalic.woff2"
-}
+}
\ No newline at end of file