diff --git a/.gitignore b/.gitignore
index 69f2338..0cd120b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@
 **/.env.test.local
 **/.env.production.local
 **/.env.production
+**/.env.development
 
 # Other potential ignores (depending on your setup)
 **/*.log
@@ -68,4 +69,19 @@
 
 # Credentials
 **/EventManangementSystem_GoogleCreds.json
-**/*-service/generated
\ No newline at end of file
+**/*-service/generated
+
+# Python
+**/.venv
+**/__pycache__
+**/*.pyc
+**/*.pyo
+**/*.pyd
+**/*.pyw
+**/*.pyz
+**/*.pywz
+**/*.pyzz
+**/*.pywzz
+**/*.pyzzz
+**/*.pywzzz
+**/*.pyzzzz
\ No newline at end of file
diff --git a/ENV_SETUP.md b/ENV_SETUP.md
new file mode 100644
index 0000000..1ee339b
--- /dev/null
+++ b/ENV_SETUP.md
@@ -0,0 +1,219 @@
+# Environment Variables Setup Guide
+
+This document explains how environment variables are dynamically loaded based on which Docker Compose file you use.
+
+## Environment File Strategy
+
+- **Development**: Uses `.env.development` files when running `docker-compose.dev.yaml`
+- **Production**: Uses `.env.production` files when running `docker-compose.yaml`
+
+## Environment Files
+
+The `.env.development` files are already created in the project. This section documents their structure and contents:
+
+### 1. Client: `ems-client/.env.development`
+
+```bash
+# API Configuration
+# For browser requests, use localhost to access the gateway
+NEXT_PUBLIC_API_BASE_URL=http://localhost/api
+
+# Environment
+NODE_ENV=development
+NEXT_TELEMETRY_DISABLED=1
+```
+
+### 2. Auth Service: `ems-services/auth-service/.env.development`
+
+```bash
+# Database Configuration
+DATABASE_URL=postgresql://admin:password@auth-service-db:5432/auth_db
+
+# JWT Configuration
+JWT_SECRET=your-jwt-secret-key-change-in-production
+JWT_EXPIRES_IN=24h
+
+# RabbitMQ Configuration
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+### 3. Event Service: `ems-services/event-service/.env.development`
+
+```bash
+# Database Configuration
+DATABASE_URL=postgresql://admin:password@event-service-db:5432/event_db
+
+# JWT Configuration
+JWT_SECRET=your-jwt-secret-key-change-in-production
+JWT_EXPIRES_IN=24h
+
+# RabbitMQ Configuration
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+### 4. Booking Service: `ems-services/booking-service/.env.development`
+
+```bash
+# Database Configuration
+DATABASE_URL=postgresql://admin:password@booking-service-db:5432/booking_db
+
+# JWT Configuration
+JWT_SECRET=your-jwt-secret-key-change-in-production
+JWT_EXPIRES_IN=24h
+
+# RabbitMQ Configuration
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+### 5. Feedback Service: `ems-services/feedback-service/.env.development`
+
+```bash
+# Database Configuration
+DATABASE_URL=postgresql://admin:password@feedback-service-db:5432/feedback_db
+
+# JWT Configuration
+JWT_SECRET=your-jwt-secret-key-change-in-production
+JWT_EXPIRES_IN=24h
+
+# RabbitMQ Configuration (optional)
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+### 6. Notification Service: `ems-services/notification-service/.env.development`
+
+```bash
+# RabbitMQ Configuration
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+### 7. Speaker Service: `ems-services/speaker-service/.env.development`
+
+```bash
+# Database Configuration
+DATABASE_URL=postgresql://admin:password@speaker-service-db:5432/speaker_db
+
+# JWT Configuration
+JWT_SECRET=your-jwt-secret-key-change-in-production
+JWT_EXPIRES_IN=24h
+
+# RabbitMQ Configuration
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+
+# Server Configuration
+PORT=3000
+NODE_ENV=development
+
+# Gateway URL for inter-service communication
+GATEWAY_URL=http://ems-gateway
+```
+
+## Modifying Environment Variables
+
+To modify environment variables for development:
+
+1. Edit the corresponding `.env.development` file in each service directory
+2. Restart the service: `docker-compose -f docker-compose.dev.yaml restart <service-name>`
+
+For production, edit the `.env.production` files instead.
+
+## Key Differences: Development vs Production
+
+### Development (`.env.development`)
+- Uses Docker service names for inter-service communication (e.g., `http://ems-gateway`)
+- Client uses `http://localhost/api` for browser requests
+- Database URLs use Docker container names (e.g., `auth-service-db`)
+- RabbitMQ URL uses Docker service name (`rabbitmq`)
+- `NODE_ENV=development`
+
+### Production (`.env.production`)
+- May use external URLs or load balancer endpoints
+- Client API URL points to production domain
+- Database URLs use production database hosts
+- RabbitMQ URL uses production RabbitMQ host
+- `NODE_ENV=production`
+
+## Important Notes
+
+1. **File Priority**: Docker Compose `env_file` loads variables first, then `environment` section overrides them. In our setup:
+   - `env_file` loads from `.env.development` or `.env.production`
+   - `environment` section only sets `NODE_ENV` and file watching options
+
+2. **JWT_SECRET**: **Must be changed** in production! Use a strong, random secret.
+
+3. **Database URLs**: Development uses Docker container names. Production should use actual database server addresses.
+
+4. **Client API URL**:
+   - Development: `http://localhost/api` (browser access via host)
+   - Production: Your production API URL (e.g., `https://api.yourdomain.com/api`)
+
+5. **Service-to-Service Communication**: All services use `GATEWAY_URL=http://ems-gateway` to communicate via the gateway in Docker network.
+
+## Verification
+
+To verify all `.env.development` files exist:
+
+```bash
+find . -name ".env.development" -type f
+```
+
+You should see 7 files:
+- `ems-client/.env.development`
+- `ems-services/auth-service/.env.development`
+- `ems-services/event-service/.env.development`
+- `ems-services/booking-service/.env.development`
+- `ems-services/feedback-service/.env.development`
+- `ems-services/notification-service/.env.development`
+- `ems-services/speaker-service/.env.development`
+
+## Troubleshooting
+
+### Environment variables not loading
+1. Check file name: Must be exactly `.env.development` (not `.env.development.local` or similar)
+2. Check file location: Must be in the service's root directory
+3. Verify Docker Compose is reading the file: Check logs for environment variable values
+
+### API calls going to wrong URL
+1. Verify `NEXT_PUBLIC_API_BASE_URL` in `ems-client/.env.development`
+2. Restart the client container after changing `.env.development`
+3. Clear Next.js cache if needed: `docker-compose -f docker-compose.dev.yaml restart ems-client`
+
+### Services can't connect to each other
+1. Verify `GATEWAY_URL=http://ems-gateway` in all service `.env.development` files
+2. Check that services are on the same Docker network (`event-net`)
+3. Verify RabbitMQ URL uses Docker service name: `amqp://guest:guest@rabbitmq:5672`
+
diff --git a/README-DEV-DOCKER.md b/README-DEV-DOCKER.md
new file mode 100644
index 0000000..c871049
--- /dev/null
+++ b/README-DEV-DOCKER.md
@@ -0,0 +1,171 @@
+# Development Docker Setup with Hot-Reload
+
+This document explains how to use the development Docker configuration that enables hot-reload for all services.
+
+## Overview
+
+The development Docker setup (`docker-compose.dev.yaml`) is configured to:
+- Mount source code as volumes for immediate file change detection
+- Run services in development mode with automatic reloading
+- Use nodemon for backend services (TypeScript with hot-reload)
+- Use Next.js dev mode for the client (with built-in hot-reload)
+
+## Prerequisites
+
+- Docker and Docker Compose installed
+- All `.env.development` files are already created and configured for each service
+
+The `.env.development` files are already present in the project and contain all necessary environment variables for development mode. They are automatically loaded when using `docker-compose.dev.yaml`.
+
+If you need to modify any environment variables, edit the corresponding `.env.development` file in each service directory. See [ENV_SETUP.md](./ENV_SETUP.md) for details on what each variable does.
+
+## Usage
+
+### Starting All Services in Development Mode
+
+```bash
+docker-compose -f docker-compose.dev.yaml up
+```
+
+### Starting Services in Background
+
+```bash
+docker-compose -f docker-compose.dev.yaml up -d
+```
+
+### Stopping Services
+
+```bash
+docker-compose -f docker-compose.dev.yaml down
+```
+
+### Rebuilding Images (if Dockerfiles change)
+
+```bash
+docker-compose -f docker-compose.dev.yaml build
+docker-compose -f docker-compose.dev.yaml up
+```
+
+### Viewing Logs
+
+```bash
+# All services
+docker-compose -f docker-compose.dev.yaml logs -f
+
+# Specific service
+docker-compose -f docker-compose.dev.yaml logs -f auth-service-dev
+```
+
+## Service Ports
+
+Services are exposed on the following ports (for direct access, bypassing gateway):
+
+- **Client**: `http://localhost:3001`
+- **Auth Service**: `http://localhost:3002`
+- **Event Service**: `http://localhost:3003`
+- **Booking Service**: `http://localhost:3004`
+- **Feedback Service**: `http://localhost:3005`
+- **Notification Service**: `http://localhost:3006`
+- **Speaker Service**: `http://localhost:3007`
+- **Gateway**: `http://localhost:80`
+- **RabbitMQ Management**: `http://localhost:15672` (guest/guest)
+
+## Hot-Reload Behavior
+
+### Backend Services (Node.js/TypeScript)
+- Uses **nodemon** to watch for file changes
+- Automatically restarts when TypeScript files in `src/` are modified
+- Prisma client is regenerated on container start
+- File watching uses polling mode (compatible with macOS/Windows)
+
+### Frontend (Next.js)
+- Uses **Next.js dev mode** with built-in hot-reload
+- Fast Refresh for React components
+- Automatic compilation on file changes
+- File watching uses polling mode
+
+## Volume Mounts
+
+The following directories are mounted as volumes (changes reflect immediately):
+- Source code directories (`src/`, `app/`, etc.)
+- Configuration files
+- Prisma schemas
+
+The following are excluded from mounts (use container's node_modules):
+- `node_modules/` - Uses container's installed dependencies
+- `dist/` - Build output (for backend services)
+- `.next/` - Next.js build output (for client)
+
+## Development vs Production
+
+- **Development** (`docker-compose.dev.yaml`): Hot-reload enabled, all dependencies including dev deps
+- **Production** (`docker-compose.yaml`): Optimized builds, production dependencies only
+
+## Troubleshooting
+
+### File Changes Not Detected
+
+If file changes aren't being detected:
+1. Ensure you're using `docker-compose.dev.yaml` (not the production file)
+2. Check that volumes are properly mounted: `docker-compose -f docker-compose.dev.yaml ps`
+3. On macOS/Windows, file watching uses polling - there may be a slight delay (1-2 seconds)
+
+### Services Not Starting
+
+1. Check logs: `docker-compose -f docker-compose.dev.yaml logs <service-name>`
+2. Ensure databases are healthy: `docker-compose -f docker-compose.dev.yaml ps`
+3. Verify `.env.production` files exist for all services
+
+### Port Conflicts
+
+If ports are already in use:
+- Stop other services using those ports
+- Or modify port mappings in `docker-compose.dev.yaml`
+
+### Prisma Issues
+
+If Prisma client generation fails:
+- Ensure DATABASE_URL is set correctly
+- Check that database containers are running and healthy
+- Manually regenerate: `docker-compose -f docker-compose.dev.yaml exec auth-service-dev npx prisma generate`
+
+## Environment Variables
+
+The `docker-compose.dev.yaml` uses `.env.development` files for all environment variables. These files are automatically loaded based on which Docker Compose file you run:
+
+- **Development**: `docker-compose.dev.yaml` → Uses `.env.development` files
+- **Production**: `docker-compose.yaml` → Uses `.env.production` files
+
+### Required Environment Variables
+
+All environment variables should be defined in each service's `.env.development` file. See [ENV_SETUP.md](./ENV_SETUP.md) for complete documentation.
+
+**Key Variables for Development:**
+
+#### All Backend Services
+- `DATABASE_URL` - Database connection URL (uses Docker service names)
+- `RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672` - RabbitMQ connection
+- `GATEWAY_URL=http://ems-gateway` - Gateway URL for inter-service communication
+- `JWT_SECRET` - JWT signing secret (**must be set**)
+- `PORT=3000` - Service port
+- `NODE_ENV=development` - Development mode
+
+#### Client
+- `NEXT_PUBLIC_API_BASE_URL=http://localhost/api` - API base URL for browser requests
+- `NODE_ENV=development` - Development mode
+
+#### Docker Compose Overrides
+The `docker-compose.dev.yaml` only sets:
+- `NODE_ENV=development` - Overrides .env file
+- `CHOKIDAR_USEPOLLING=true` - File watching (macOS/Windows compatibility)
+- `WATCHPACK_POLLING=true` - Next.js file watching
+
+All other variables come from `.env.development` files.
+
+## Notes
+
+- The first startup may take longer as dependencies are installed
+- Database migrations are not automatically run in dev mode - run manually if needed
+- Development volumes are separate from production volumes (suffixed with `-dev`)
+- Service-to-service communication uses Docker service names (e.g., `http://ems-gateway`)
+- Client browser requests use `http://localhost/api` (routed through the gateway)
diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
new file mode 100644
index 0000000..21c30d4
--- /dev/null
+++ b/docker-compose.dev.yaml
@@ -0,0 +1,329 @@
+# Development Docker Compose Configuration
+# This file enables hot-reload for all services
+# Usage: docker-compose -f docker-compose.dev.yaml up
+
+# This section defines all the containers (services) that make up your application.
+services:
+  #########################################
+  #   APPLICATION SERVICES
+  #########################################
+  ems-client:
+    build:
+      context: ./ems-client
+      dockerfile: Dockerfile.dev
+    container_name: ems-client-dev
+    env_file:
+      - ./ems-client/.env.development
+    environment:
+      - NODE_ENV=development
+      - WATCHPACK_POLLING=true
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-client:/app
+      - /app/node_modules
+      - /app/.next
+    networks:
+      - event-net
+    ports:
+      - "3001:3000"
+    command: npm run dev
+
+  ems-gateway:
+    build:
+      context: ./ems-gateway
+      dockerfile: Dockerfile
+    container_name: ems-gateway-dev
+    ports:
+      - "80:80"
+    volumes:
+      - ./ems-gateway/nginx.conf:/etc/nginx/nginx.conf
+    networks:
+      - event-net
+    depends_on:
+      - ems-client
+      - auth-service
+      - event-service
+      - booking-service
+      - speaker-service
+      - feedback-service
+      - notification-service
+
+  #########################################
+  #   BACKEND MICROSERVICES
+  #########################################
+  auth-service: &base-service-dev
+    build:
+      context: ./ems-services/auth-service
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://admin:password@auth-service-db:5432/auth_db
+    container_name: auth-service-dev
+    restart: unless-stopped
+    env_file:
+      - ./ems-services/auth-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/auth-service:/app
+      - /app/node_modules
+      - /app/dist
+      - /app/prisma
+    networks:
+      - event-net
+    ports:
+      - "3002:3000"
+    command: sh -c "npx prisma generate && npm run dev"
+    depends_on:
+      auth-service-db:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
+
+  event-service:
+    <<: *base-service-dev
+    build:
+      context: ./ems-services/event-service
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://admin:password@event-service-db:5432/event_db
+    container_name: event-service-dev
+    env_file:
+      - ./ems-services/event-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/event-service:/app
+      - /app/node_modules
+      - /app/dist
+      - /app/prisma
+    ports:
+      - "3003:3000"
+    command: sh -c "npx prisma generate && npm run dev"
+    networks:
+      - event-net
+    depends_on:
+      event-service-db:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
+      auth-service:
+        condition: service_started
+
+  booking-service:
+    <<: *base-service-dev
+    build:
+      context: ./ems-services/booking-service
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://admin:password@booking-service-db:5432/booking_db
+    container_name: booking-service-dev
+    env_file:
+      - ./ems-services/booking-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/booking-service:/app
+      - /app/node_modules
+      - /app/dist
+      - /app/prisma
+    ports:
+      - "3004:3000"
+    command: sh -c "npx prisma generate && npm run dev"
+    networks:
+      - event-net
+    depends_on:
+      booking-service-db:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
+
+  feedback-service:
+    <<: *base-service-dev
+    build:
+      context: ./ems-services/feedback-service
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://admin:password@feedback-service-db:5432/feedback_db
+    container_name: feedback-service-dev
+    env_file:
+      - ./ems-services/feedback-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/feedback-service:/app
+      - /app/node_modules
+      - /app/dist
+      - /app/prisma
+    ports:
+      - "3005:3000"
+    command: sh -c "npx prisma generate && npm run dev"
+    networks:
+      - event-net
+    depends_on:
+      feedback-service-db:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
+
+  notification-service:
+    build:
+      context: ./ems-services/notification-service
+      dockerfile: Dockerfile.dev
+    container_name: notification-service-dev
+    env_file:
+      - ./ems-services/notification-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/notification-service:/app
+      - /app/node_modules
+      - /app/dist
+    ports:
+      - "3006:3000"
+    command: npm run dev
+    networks:
+      - event-net
+    depends_on:
+      rabbitmq:
+        condition: service_started
+
+  speaker-service:
+    <<: *base-service-dev
+    build:
+      context: ./ems-services/speaker-service
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://admin:password@speaker-service-db:5432/speaker_db
+    container_name: speaker-service-dev
+    env_file:
+      - ./ems-services/speaker-service/.env.development
+    environment:
+      - NODE_ENV=development
+      - CHOKIDAR_USEPOLLING=true
+      - CHOKIDAR_INTERVAL=1000
+    volumes:
+      - ./ems-services/speaker-service:/app
+      - /app/node_modules
+      - /app/dist
+      - /app/prisma
+    ports:
+      - "3007:3000"
+    command: sh -c "npx prisma generate && npm run dev"
+    networks:
+      - event-net
+    depends_on:
+      speaker-service-db:
+        condition: service_healthy
+      rabbitmq:
+        condition: service_started
+
+  #########################################
+  #   DATABASES FOR MICROSERVICES
+  #########################################
+
+  auth-service-db: &base-service-db
+    image: postgres:14-alpine
+    container_name: auth-service-db-dev
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=auth_db
+    volumes:
+      - auth-service-data-dev:/var/lib/postgresql/data
+    networks:
+      - event-net
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U admin" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  event-service-db:
+    <<: *base-service-db
+    container_name: event-service-db-dev
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=event_db
+    volumes:
+      - event-service-data-dev:/var/lib/postgresql/data
+
+  booking-service-db:
+    <<: *base-service-db
+    container_name: booking-service-db-dev
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=booking_db
+    volumes:
+      - booking-service-data-dev:/var/lib/postgresql/data
+
+  feedback-service-db:
+    <<: *base-service-db
+    container_name: feedback-service-db-dev
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=feedback_db
+    volumes:
+      - feedback-service-data-dev:/var/lib/postgresql/data
+
+  speaker-service-db:
+    <<: *base-service-db
+    container_name: speaker-service-db-dev
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=speaker_db
+    volumes:
+      - speaker-service-data-dev:/var/lib/postgresql/data
+
+  #########################################
+  #   INFRASTRUCTURE SERVICES
+  #########################################
+  rabbitmq:
+    image: rabbitmq:3.9-management-alpine
+    container_name: rabbitmq-dev
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+    environment:
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    volumes:
+      - rabbitmq_data-dev:/var/lib/rabbitmq/ # Persistent storage for RabbitMQ data
+      - rabbitmq_log-dev:/var/log/rabbitmq/  # Persistent storage for RabbitMQ
+    networks:
+      - event-net
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 5s
+      timeout: 10s
+      retries: 5
+      start_period: 20s # Give RabbitMQ time to start up before checking
+
+# This section defines the custom network for our services to communicate.
+networks:
+  event-net:
+    driver: bridge
+
+# This section defines a volume for persisting data.
+volumes:
+  auth-service-data-dev:
+  event-service-data-dev:
+  booking-service-data-dev:
+  feedback-service-data-dev:
+  speaker-service-data-dev:
+  rabbitmq_data-dev:
+  rabbitmq_log-dev:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 592ac18..81ce444 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -61,8 +61,6 @@ services:
       args:
         - DATABASE_URL=postgresql://admin:password@event-service-db:5432/event_db
     container_name: event-service
-    environment:
-      - TZ=America/Chicago
     env_file:
       ./ems-services/event-service/.env.production
     networks:
@@ -134,11 +132,6 @@ services:
     container_name: speaker-service
     env_file:
       ./ems-services/speaker-service/.env.production
-    environment:
-      - RABBITMQ_URL=amqp://rabbitmq:5672
-      - UPLOAD_DIR=/app/uploads
-    volumes:
-      - speaker-uploads:/app/uploads  # Persistent storage for uploaded materials
     networks:
       - event-net
     depends_on:
@@ -244,6 +237,5 @@ volumes:
   booking-service-data:
   feedback-service-data:
   speaker-service-data:
-  speaker-uploads:  # Persistent storage for speaker uploaded materials
   rabbitmq_data:
   rabbitmq_log:
diff --git a/docs/er-diagram/postgres@ems.png b/docs/er-diagram/postgres@ems.png
new file mode 100644
index 0000000..c7091c8
Binary files /dev/null and b/docs/er-diagram/postgres@ems.png differ
diff --git a/ems-client/Dockerfile.dev b/ems-client/Dockerfile.dev
new file mode 100644
index 0000000..cb90fec
--- /dev/null
+++ b/ems-client/Dockerfile.dev
@@ -0,0 +1,24 @@
+# Development Dockerfile for Next.js Client
+FROM alpine:latest
+RUN apk update && apk add nodejs npm && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use next dev
+CMD ["npm", "run", "dev"]
diff --git a/ems-client/app/dashboard/admin/events/[id]/page.tsx b/ems-client/app/dashboard/admin/events/[id]/page.tsx
index bd032bb..a7a82df 100644
--- a/ems-client/app/dashboard/admin/events/[id]/page.tsx
+++ b/ems-client/app/dashboard/admin/events/[id]/page.tsx
@@ -1,17 +1,349 @@
 'use client';
 
-import { EventDetailsPage } from "@/components/events/EventDetailsPage";
+import { useAuth } from "@/lib/auth-context";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import {
+  ArrowLeft,
+  Calendar,
+  MapPin,
+  Clock,
+  Users,
+  AlertCircle,
+  Edit,
+  CheckCircle,
+  XCircle,
+  Ban
+} from "lucide-react";
+import { useRouter, useParams } from "next/navigation";
+import { useEffect, useState } from "react";
+import { useLogger } from "@/lib/logger/LoggerProvider";
+import { eventAPI } from "@/lib/api/event.api";
+import { EventResponse, EventStatus } from "@/lib/api/types/event.types";
 import { withAdminAuth } from "@/components/hoc/withAuth";
+import { RejectionModal } from "@/components/admin/RejectionModal";
+
+const LOGGER_COMPONENT_NAME = 'AdminEventDetailsPage';
+
+const statusColors = {
+  [EventStatus.DRAFT]: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200',
+  [EventStatus.PENDING_APPROVAL]: 'bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-200',
+  [EventStatus.PUBLISHED]: 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200',
+  [EventStatus.REJECTED]: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200',
+  [EventStatus.CANCELLED]: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200',
+  [EventStatus.COMPLETED]: 'bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200'
+};
+
+function AdminEventDetailsPage() {
+  const { user } = useAuth();
+  const router = useRouter();
+  const params = useParams();
+  const logger = useLogger();
+  const eventId = params.id as string;
+
+  const [event, setEvent] = useState<EventResponse | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [actionLoading, setActionLoading] = useState(false);
+  const [isRejectionModalOpen, setIsRejectionModalOpen] = useState(false);
+
+  useEffect(() => {
+    if (eventId) {
+      loadEvent();
+    }
+  }, [eventId]);
+
+  const loadEvent = async () => {
+    try {
+      setIsLoading(true);
+      logger.debug(LOGGER_COMPONENT_NAME, 'Loading event details', { eventId });
+      
+      const response = await eventAPI.getEventById(eventId);
+      
+      if (response.success) {
+        setEvent(response.data);
+        logger.debug(LOGGER_COMPONENT_NAME, 'Event loaded successfully');
+      } else {
+        throw new Error('Failed to load event');
+      }
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : 'Failed to load event';
+      setError(errorMessage);
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to load event', err instanceof Error ? err : new Error(String(err)));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleApprove = async () => {
+    if (!event) return;
+    
+    try {
+      setActionLoading(true);
+      logger.info(LOGGER_COMPONENT_NAME, 'Approving event', { eventId: event.id });
+      
+      await eventAPI.approveEvent(event.id);
+      
+      // Reload event to show updated status
+      await loadEvent();
+    } catch (err) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to approve event', err as Error);
+      setError('Failed to approve event');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const handleRejectConfirm = async (rejectionReason: string) => {
+    if (!event) return;
+
+    try {
+      setActionLoading(true);
+      logger.info(LOGGER_COMPONENT_NAME, 'Rejecting event', { eventId: event.id });
+
+      await eventAPI.rejectEvent(event.id, { rejectionReason });
+      
+      setIsRejectionModalOpen(false);
+      await loadEvent();
+    } catch (err) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to reject event', err as Error);
+      setError('Failed to reject event');
+      throw err;
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const handleCancel = async () => {
+    if (!event) return;
+    
+    try {
+      setActionLoading(true);
+      logger.info(LOGGER_COMPONENT_NAME, 'Cancelling event', { eventId: event.id });
+      
+      await eventAPI.cancelEvent(event.id);
+      
+      await loadEvent();
+    } catch (err) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to cancel event', err as Error);
+      setError('Failed to cancel event');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+      </div>
+    );
+  }
+
+  if (error || !event) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <Card className="max-w-md">
+          <CardContent className="text-center py-8">
+            <AlertCircle className="h-12 w-12 text-red-500 mx-auto mb-4" />
+            <h3 className="text-lg font-semibold mb-2">Error Loading Event</h3>
+            <p className="text-slate-600 mb-4">{error}</p>
+            <Button onClick={() => router.push('/dashboard/admin/events')}>
+              Back to Events
+            </Button>
+          </CardContent>
+        </Card>
+      </div>
+    );
+  }
 
-const AdminEventDetailsPage = () => {
   return (
-    <EventDetailsPage 
-      userRole="ADMIN"
-      showJoinInterface={true}
-      showAdminControls={true}
-      showSpeakerControls={false}
-    />
+    <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-indigo-50 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900">
+      <header className="bg-white/80 dark:bg-slate-800/80 backdrop-blur-sm border-b border-slate-200 dark:border-slate-700">
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+          <div className="flex justify-between items-center h-16">
+            <div className="flex items-center space-x-4">
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={() => router.push('/dashboard/admin/events')}
+              >
+                <ArrowLeft className="h-4 w-4 mr-2" />
+                Back to Events
+              </Button>
+              <h1 className="text-2xl font-bold bg-gradient-to-r from-blue-600 to-indigo-600 bg-clip-text text-transparent">
+                Event Details
+              </h1>
+            </div>
+          </div>
+        </div>
+      </header>
+
+      <main className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+        <Card>
+          <CardHeader>
+            <div className="flex items-start justify-between">
+              <div className="flex-1">
+                <CardTitle className="text-2xl mb-2">{event.name}</CardTitle>
+                <Badge className={statusColors[event.status]}>
+                  {event.status.replace('_', ' ')}
+                </Badge>
+              </div>
+              
+              <div className="flex gap-2 flex-wrap">
+                <Button
+                  onClick={() => router.push(`/dashboard/admin/events/modify/${event.id}`)}
+                  variant="outline"
+                >
+                  <Edit className="h-4 w-4 mr-2" />
+                  Edit
+                </Button>
+                
+                {event.status === EventStatus.PENDING_APPROVAL && (
+                  <>
+                    <Button
+                      onClick={handleApprove}
+                      disabled={actionLoading}
+                      className="bg-green-600 hover:bg-green-700"
+                    >
+                      <CheckCircle className="h-4 w-4 mr-2" />
+                      Approve
+                    </Button>
+                    <Button
+                      onClick={() => setIsRejectionModalOpen(true)}
+                      disabled={actionLoading}
+                      variant="destructive"
+                    >
+                      <XCircle className="h-4 w-4 mr-2" />
+                      Reject
+                    </Button>
+                  </>
+                )}
+
+                {event.status === EventStatus.PUBLISHED && (
+                  <Button
+                    onClick={handleCancel}
+                    disabled={actionLoading}
+                    variant="outline"
+                    className="border-red-200 text-red-600 hover:bg-red-50"
+                  >
+                    <Ban className="h-4 w-4 mr-2" />
+                    Cancel Event
+                  </Button>
+                )}
+              </div>
+            </div>
+          </CardHeader>
+          
+          <CardContent className="space-y-6">
+            {event.rejectionReason && (
+              <div className="p-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md">
+                <h4 className="font-semibold text-red-900 dark:text-red-100 mb-2 flex items-center">
+                  <AlertCircle className="h-4 w-4 mr-2" />
+                  Rejection Reason:
+                </h4>
+                <p className="text-red-800 dark:text-red-200">{event.rejectionReason}</p>
+              </div>
+            )}
+
+            <div>
+              <h3 className="font-semibold text-lg mb-3">Description</h3>
+              <p className="text-slate-600 dark:text-slate-400">{event.description}</p>
+            </div>
+
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+              <div>
+                <h4 className="font-semibold mb-2">Category</h4>
+                <p className="text-slate-600 dark:text-slate-400">{event.category}</p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2">Speaker ID</h4>
+                <p className="text-slate-600 dark:text-slate-400 font-mono text-sm">{event.speakerId}</p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <MapPin className="h-4 w-4 mr-2" />
+                  Venue
+                </h4>
+                <p className="text-slate-600 dark:text-slate-400">{event.venue.name}</p>
+                <p className="text-sm text-slate-500 dark:text-slate-500">{event.venue.address}</p>
+                <p className="text-sm text-slate-500 dark:text-slate-500">
+                  Hours: {event.venue.openingTime} - {event.venue.closingTime}
+                </p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <Users className="h-4 w-4 mr-2" />
+                  Capacity
+                </h4>
+                <p className="text-slate-600 dark:text-slate-400">{event.venue.capacity} attendees</p>
+              </div>
+
+              <div className="col-span-2">
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <Clock className="h-4 w-4 mr-2" />
+                  Event Dates
+                </h4>
+                <div className="grid grid-cols-2 gap-4">
+                  <div>
+                    <p className="text-sm text-slate-500 dark:text-slate-500">Start Date</p>
+                    <p className="text-slate-600 dark:text-slate-400">
+                      {new Date(event.bookingStartDate).toLocaleString()}
+                    </p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-slate-500 dark:text-slate-500">End Date</p>
+                    <p className="text-slate-600 dark:text-slate-400">
+                      {new Date(event.bookingEndDate).toLocaleString()}
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2">Created At</h4>
+                <p className="text-slate-600 dark:text-slate-400 text-sm">
+                  {new Date(event.createdAt).toLocaleString()}
+                </p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2">Last Updated</h4>
+                <p className="text-slate-600 dark:text-slate-400 text-sm">
+                  {new Date(event.updatedAt).toLocaleString()}
+                </p>
+              </div>
+            </div>
+
+            {event.bannerImageUrl && (
+              <div>
+                <h4 className="font-semibold mb-2">Banner Image</h4>
+                <img 
+                  src={event.bannerImageUrl} 
+                  alt={event.name}
+                  className="w-full h-64 object-cover rounded-lg"
+                />
+              </div>
+            )}
+          </CardContent>
+        </Card>
+
+        {/* Rejection Modal */}
+        <RejectionModal
+          isOpen={isRejectionModalOpen}
+          onClose={() => setIsRejectionModalOpen(false)}
+          onConfirm={handleRejectConfirm}
+          eventName={event?.name}
+          isLoading={actionLoading}
+        />
+      </main>
+    </div>
   );
-};
+}
+
+export default withAdminAuth(AdminEventDetailsPage);
 
-export default withAdminAuth(AdminEventDetailsPage);
\ No newline at end of file
diff --git a/ems-client/app/dashboard/admin/events/page.tsx b/ems-client/app/dashboard/admin/events/page.tsx
index d5a362d..965547a 100644
--- a/ems-client/app/dashboard/admin/events/page.tsx
+++ b/ems-client/app/dashboard/admin/events/page.tsx
@@ -27,7 +27,6 @@ import {
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { useLogger } from "@/lib/logger/LoggerProvider";
-import { EventJoinInterface } from '@/components/attendance/EventJoinInterface';
 import { eventAPI } from "@/lib/api/event.api";
 import { EventResponse, EventStatus, EventFilters } from "@/lib/api/types/event.types";
 import { withAdminAuth } from "@/components/hoc/withAuth";
@@ -51,7 +50,7 @@ function EventManagementPage() {
   const [searchTerm, setSearchTerm] = useState('');
   const [selectedStatus, setSelectedStatus] = useState<EventStatus | 'ALL'>('ALL');
   const [selectedTimeframe, setSelectedTimeframe] = useState('ALL');
-  
+
   // Rejection modal state
   const [isRejectionModalOpen, setIsRejectionModalOpen] = useState(false);
   const [eventToReject, setEventToReject] = useState<{ id: string; name: string } | null>(null);
@@ -418,14 +417,6 @@ function EventManagementPage() {
                     <CardTitle className="text-lg font-semibold text-slate-900 dark:text-white mb-2">
                       {event.name}
                     </CardTitle>
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      className="mb-2 p-0 h-auto text-blue-600 hover:text-blue-800"
-                      onClick={() => router.push(`/dashboard/admin/events/${event.id}`)}
-                    >
-                      View Details →
-                    </Button>
                     <Badge className={statusColors[event.status]}>
                       {event.status.replace('_', ' ')}
                     </Badge>
@@ -465,8 +456,8 @@ function EventManagementPage() {
 
                 {/* Actions */}
                 <div className="flex flex-wrap gap-2">
-                  <Button 
-                    size="sm" 
+                  <Button
+                    size="sm"
                     variant="outline"
                     onClick={() => router.push(`/dashboard/admin/events/${event.id}`)}
                   >
@@ -483,6 +474,19 @@ function EventManagementPage() {
                     Edit
                   </Button>
 
+                  {event.status === EventStatus.DRAFT && (
+                    <Button
+                      size="sm"
+                      variant="default"
+                      onClick={() => handleEventAction(event.id, 'approve')}
+                      disabled={actionLoading === event.id}
+                      className="bg-green-600 hover:bg-green-700"
+                    >
+                      <Play className="h-4 w-4 mr-1" />
+                      Publish
+                    </Button>
+                  )}
+
                   {event.status === EventStatus.PENDING_APPROVAL && (
                     <>
                       <Button
@@ -529,23 +533,6 @@ function EventManagementPage() {
                     Delete
                   </Button>
                 </div>
-
-                {/* Event Join Interface - Only show for published events */}
-                {event.status === EventStatus.PUBLISHED && (
-                  <div className="mt-4 pt-4 border-t">
-                    <EventJoinInterface
-                      eventId={event.id}
-                      eventTitle={event.name}
-                      eventStartTime={event.bookingStartDate}
-                      eventEndTime={event.bookingEndDate}
-                      eventVenue={event.venue.name}
-                      eventCategory={event.category}
-                      eventStatus={event.status}
-                      eventDescription={event.description}
-                      userRole={user?.role || 'ADMIN'}
-                    />
-                  </div>
-                )}
               </CardContent>
             </Card>
           ))}
diff --git a/ems-client/app/dashboard/admin/page.tsx b/ems-client/app/dashboard/admin/page.tsx
index aedbfc6..1998b66 100644
--- a/ems-client/app/dashboard/admin/page.tsx
+++ b/ems-client/app/dashboard/admin/page.tsx
@@ -18,54 +18,52 @@ import {
   Eye,
   Edit,
   Trash2,
-  Ticket
+  Ticket,
+  Loader2
 } from "lucide-react";
 import { useRouter } from "next/navigation";
-import { useEffect } from "react";
+import { useEffect, useState, useCallback } from "react";
 import {useLogger} from "@/lib/logger/LoggerProvider";
 import {withAdminAuth} from "@/components/hoc/withAuth";
+import { eventAPI } from "@/lib/api/event.api";
+import { EventResponse, EventStatus } from "@/lib/api/types/event.types";
 
-// Mock data for development
-const mockStats = {
-  totalUsers: 156,
-  totalEvents: 8,
-  activeEvents: 3,
-  flaggedUsers: 2,
-  totalRegistrations: 342,
-  upcomingEvents: 3
-};
-
-const mockRecentEvents = [
-  {
-    id: '1',
-    title: 'Tech Conference 2024',
-    status: 'published',
-    registrations: 45,
-    capacity: 100,
-    startDate: '2024-02-15',
-    endDate: '2024-02-17'
-  },
-  {
-    id: '2',
-    title: 'Design Workshop',
-    status: 'draft',
-    registrations: 12,
-    capacity: 50,
-    startDate: '2024-02-20',
-    endDate: '2024-02-21'
-  },
-  {
-    id: '3',
-    title: 'AI Summit',
-    status: 'published',
-    registrations: 89,
-    capacity: 150,
-    startDate: '2024-03-01',
-    endDate: '2024-03-03'
-  }
-];
+const LOGGER_COMPONENT_NAME = 'AdminDashboard';
+
+// Interface for recent events display
+interface RecentEvent {
+  id: string;
+  title: string;
+  status: string;
+  registrations?: number;
+  capacity?: number;
+  startDate: string;
+  endDate: string;
+}
 
-const mockFlaggedUsers = [
+// Interface for flagged users
+interface FlaggedUser {
+  id: string;
+  name: string;
+  email: string;
+  reason: string;
+  flaggedAt: string;
+}
+
+// Interface for dashboard stats
+interface DashboardStats {
+  totalUsers: number | null;
+  totalEvents: number;
+  activeEvents: number;
+  flaggedUsers: number;
+  totalRegistrations: number | null;
+  upcomingEvents: number;
+}
+
+// TODO: Flagged users feature requires backend implementation
+// This mock data should be replaced with an API call once the backend endpoint is available
+// Expected endpoint: GET /api/admin/users/flagged
+const mockFlaggedUsers: FlaggedUser[] = [
   {
     id: '1',
     name: 'John Doe',
@@ -82,16 +80,120 @@ const mockFlaggedUsers = [
   }
 ];
 
-const LOGGER_COMPONENT_NAME = 'AdminDashboard';
-
 function AdminDashboard() {
   const { user, logout } = useAuth();
   const router = useRouter();
   const logger = useLogger();
+  const [recentEvents, setRecentEvents] = useState<RecentEvent[]>([]);
+  const [eventsLoading, setEventsLoading] = useState(true);
+  const [eventsError, setEventsError] = useState<string | null>(null);
+  const [flaggedUsers] = useState<FlaggedUser[]>(mockFlaggedUsers); // TODO: Replace with API call
+  const [stats, setStats] = useState<DashboardStats>({
+    totalUsers: null,
+    totalEvents: 0,
+    activeEvents: 0,
+    flaggedUsers: mockFlaggedUsers.length,
+    totalRegistrations: null,
+    upcomingEvents: 0
+  });
+  const [statsLoading, setStatsLoading] = useState(true);
+
+  // Fetch dashboard stats
+  const fetchDashboardStats = useCallback(async () => {
+    try {
+      setStatsLoading(true);
+      logger.debug(LOGGER_COMPONENT_NAME, 'Fetching dashboard stats');
+
+      // Fetch all events to get stats
+      const eventsResponse = await eventAPI.getAllEvents({
+        limit: 1000, // Large limit to get all events
+        page: 1
+      });
+
+      if (eventsResponse.success && eventsResponse.data) {
+        const allEvents = eventsResponse.data.events;
+        const totalEvents = eventsResponse.data.total || allEvents.length;
+        const activeEvents = allEvents.filter(e => e.status === EventStatus.PUBLISHED).length;
+
+        // Count upcoming events (events with bookingStartDate in the future)
+        const now = new Date();
+        const upcomingEvents = allEvents.filter(e => {
+          const startDate = new Date(e.bookingStartDate);
+          return startDate > now && e.status === EventStatus.PUBLISHED;
+        }).length;
+
+        // Total registrations: Currently no admin endpoint to get all bookings across all events
+        // TODO: Implement admin endpoint: GET /api/admin/bookings/stats or similar
+        // For now, we'll leave it as null and show "N/A"
+        let totalRegistrations: number | null = null;
+
+        setStats({
+          totalUsers: null, // TODO: No API endpoint available yet
+          totalEvents,
+          activeEvents,
+          flaggedUsers: mockFlaggedUsers.length,
+          totalRegistrations,
+          upcomingEvents
+        });
+
+        logger.info(LOGGER_COMPONENT_NAME, 'Dashboard stats fetched successfully', {
+          totalEvents,
+          activeEvents,
+          upcomingEvents,
+          totalRegistrations
+        });
+      }
+    } catch (error) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to fetch dashboard stats', error as Error);
+    } finally {
+      setStatsLoading(false);
+    }
+  }, [logger]);
+
+  // Fetch recent events function
+  const fetchRecentEvents = useCallback(async () => {
+    try {
+      setEventsLoading(true);
+      setEventsError(null);
+      logger.debug(LOGGER_COMPONENT_NAME, 'Fetching recent events');
+
+      // Fetch all events, sorted by creation date (most recent first)
+      // Limit to 3 most recent events for dashboard
+      const response = await eventAPI.getAllEvents({
+        limit: 3,
+        page: 1
+      });
+
+      if (response.success && response.data) {
+        // Sort by createdAt descending (most recent first) and take first 3
+        const sortedEvents = [...response.data.events]
+          .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
+          .slice(0, 3)
+          .map((event: EventResponse): RecentEvent => ({
+            id: event.id,
+            title: event.name,
+            status: event.status.toLowerCase(),
+            capacity: event.venue?.capacity,
+            startDate: event.bookingStartDate,
+            endDate: event.bookingEndDate
+          }));
+
+        setRecentEvents(sortedEvents);
+        logger.info(LOGGER_COMPONENT_NAME, 'Recent events fetched successfully', { count: sortedEvents.length });
+      }
+    } catch (error) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to fetch recent events', error as Error);
+      setEventsError('Failed to load recent events');
+    } finally {
+      setEventsLoading(false);
+    }
+  }, [logger]);
 
   useEffect(() => {
     logger.debug(LOGGER_COMPONENT_NAME, 'Admin dashboard loaded', { userRole: user?.role });
-  }, [user, logger]);
+    fetchDashboardStats();
+    fetchRecentEvents();
+  }, [user, logger, fetchDashboardStats, fetchRecentEvents]);
 
   // Loading and auth checks are handled by the HOC
 
@@ -163,10 +265,21 @@ function AdminDashboard() {
               <Users className="h-4 w-4 text-blue-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.totalUsers}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.flaggedUsers} flagged
-              </p>
+              {statsLoading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-5 w-5 animate-spin text-slate-600" />
+                  <span className="text-sm text-slate-600">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">
+                    {stats.totalUsers !== null ? stats.totalUsers : 'N/A'}
+                  </div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.totalUsers !== null ? `${stats.flaggedUsers} flagged` : 'API endpoint needed'}
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
@@ -178,10 +291,19 @@ function AdminDashboard() {
               <Calendar className="h-4 w-4 text-green-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.totalEvents}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.activeEvents} active
-              </p>
+              {statsLoading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-5 w-5 animate-spin text-slate-600" />
+                  <span className="text-sm text-slate-600">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.totalEvents}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.activeEvents} active
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
@@ -193,25 +315,45 @@ function AdminDashboard() {
               <UserCheck className="h-4 w-4 text-purple-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.totalRegistrations}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                Across all events
-              </p>
+              {statsLoading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-5 w-5 animate-spin text-slate-600" />
+                  <span className="text-sm text-slate-600">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">
+                    {stats.totalRegistrations !== null ? stats.totalRegistrations : 'N/A'}
+                  </div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    Across all events
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
           <Card className="border-slate-200 dark:border-slate-700 hover:shadow-lg transition-shadow">
             <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
               <CardTitle className="text-sm font-medium text-slate-600 dark:text-slate-400">
-                Flagged Users
+                Upcoming Events
               </CardTitle>
-              <AlertTriangle className="h-4 w-4 text-orange-600" />
+              <Calendar className="h-4 w-4 text-orange-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.flaggedUsers}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                Need review
-              </p>
+              {statsLoading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-5 w-5 animate-spin text-slate-600" />
+                  <span className="text-sm text-slate-600">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.upcomingEvents}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    Scheduled soon
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
         </div>
@@ -305,59 +447,124 @@ function AdminDashboard() {
               </CardDescription>
             </CardHeader>
             <CardContent>
-              <div className="space-y-4">
-                {mockRecentEvents.map((event) => (
-                  <div key={event.id} className="flex items-center justify-between p-3 bg-slate-50 dark:bg-slate-800 rounded-lg">
-                    <div className="flex-1">
-                      <h4 className="font-medium text-slate-900 dark:text-white">{event.title}</h4>
-                      <div className="flex items-center space-x-4 text-sm text-slate-600 dark:text-slate-400">
-                        <span>{event.registrations}/{event.capacity} registrations</span>
-                        <Badge
-                          variant={event.status === 'published' ? 'default' : 'secondary'}
-                          className={event.status === 'published' ? 'bg-green-100 text-green-800' : 'bg-yellow-100 text-yellow-800'}
+              {eventsLoading ? (
+                <div className="flex items-center justify-center py-8">
+                  <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-blue-600"></div>
+                  <span className="ml-2 text-sm text-slate-600 dark:text-slate-400">Loading events...</span>
+                </div>
+              ) : eventsError ? (
+                <div className="text-center py-8">
+                  <p className="text-sm text-red-600 dark:text-red-400">{eventsError}</p>
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    className="mt-2"
+                    onClick={() => {
+                      setEventsError(null);
+                      setEventsLoading(true);
+                      fetchRecentEvents();
+                    }}
+                  >
+                    Retry
+                  </Button>
+                </div>
+              ) : recentEvents.length === 0 ? (
+                <div className="text-center py-8">
+                  <p className="text-sm text-slate-600 dark:text-slate-400">No recent events found</p>
+                </div>
+              ) : (
+                <div className="space-y-4">
+                  {recentEvents.map((event) => (
+                    <div key={event.id} className="flex items-center justify-between p-3 bg-slate-50 dark:bg-slate-800 rounded-lg">
+                      <div className="flex-1">
+                        <h4 className="font-medium text-slate-900 dark:text-white">{event.title}</h4>
+                        <div className="flex items-center space-x-4 text-sm text-slate-600 dark:text-slate-400 mt-1">
+                          {event.capacity && (
+                            <span>Capacity: {event.capacity}</span>
+                          )}
+                          <Badge
+                            variant={event.status === 'published' ? 'default' : 'secondary'}
+                            className={
+                              event.status === 'published'
+                                ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200'
+                                : event.status === 'pending_approval'
+                                ? 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200'
+                                : 'bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200'
+                            }
+                          >
+                            {event.status}
+                          </Badge>
+                        </div>
+                        <p className="text-xs text-slate-500 dark:text-slate-500 mt-1">
+                          {new Date(event.startDate).toLocaleDateString()} - {new Date(event.endDate).toLocaleDateString()}
+                        </p>
+                      </div>
+                      <div className="flex space-x-2">
+                        <Button
+                          size="sm"
+                          variant="outline"
+                          onClick={() => router.push(`/dashboard/admin/events/${event.id}`)}
+                        >
+                          <Eye className="h-4 w-4" />
+                        </Button>
+                        <Button
+                          size="sm"
+                          variant="outline"
+                          onClick={() => router.push(`/dashboard/admin/events/modify/${event.id}`)}
                         >
-                          {event.status}
-                        </Badge>
+                          <Edit className="h-4 w-4" />
+                        </Button>
                       </div>
                     </div>
-                    <div className="flex space-x-2">
-                      <Button size="sm" variant="outline">
-                        <Eye className="h-4 w-4" />
-                      </Button>
-                      <Button size="sm" variant="outline">
-                        <Edit className="h-4 w-4" />
-                      </Button>
-                    </div>
-                  </div>
-                ))}
-              </div>
+                  ))}
+                </div>
+              )}
             </CardContent>
           </Card>
         </div>
 
         {/* Flagged Users Alert */}
-        {mockFlaggedUsers.length > 0 && (
+        {/* TODO: Replace with real API call once backend endpoint is available */}
+        {flaggedUsers.length > 0 && (
           <Card className="border-orange-200 dark:border-orange-700 bg-orange-50 dark:bg-orange-900/20">
             <CardHeader>
               <CardTitle className="text-xl font-semibold text-orange-900 dark:text-orange-100 flex items-center">
                 <AlertTriangle className="h-5 w-5 mr-2" />
                 Flagged Users Requiring Review
               </CardTitle>
+              <CardDescription className="text-orange-700 dark:text-orange-300">
+                {/* Note: Currently using mock data. Backend API endpoint needed. */}
+                {flaggedUsers.length} user{flaggedUsers.length !== 1 ? 's' : ''} flagged
+              </CardDescription>
             </CardHeader>
             <CardContent>
               <div className="space-y-3">
-                {mockFlaggedUsers.map((user) => (
-                  <div key={user.id} className="flex items-center justify-between p-3 bg-white dark:bg-slate-800 rounded-lg border border-orange-200 dark:border-orange-700">
+                {flaggedUsers.map((flaggedUser) => (
+                  <div key={flaggedUser.id} className="flex items-center justify-between p-3 bg-white dark:bg-slate-800 rounded-lg border border-orange-200 dark:border-orange-700">
                     <div>
-                      <h4 className="font-medium text-slate-900 dark:text-white">{user.name}</h4>
-                      <p className="text-sm text-slate-600 dark:text-slate-400">{user.email}</p>
-                      <p className="text-sm text-orange-600 dark:text-orange-400">Reason: {user.reason}</p>
+                      <h4 className="font-medium text-slate-900 dark:text-white">{flaggedUser.name}</h4>
+                      <p className="text-sm text-slate-600 dark:text-slate-400">{flaggedUser.email}</p>
+                      <p className="text-sm text-orange-600 dark:text-orange-400">Reason: {flaggedUser.reason}</p>
+                      <p className="text-xs text-slate-500 dark:text-slate-500 mt-1">
+                        Flagged: {new Date(flaggedUser.flaggedAt).toLocaleDateString()}
+                      </p>
                     </div>
                     <div className="flex space-x-2">
-                      <Button size="sm" variant="outline">
+                      <Button
+                        size="sm"
+                        variant="outline"
+                        onClick={() => router.push(`/dashboard/admin/users/flagged`)}
+                      >
                         Review
                       </Button>
-                      <Button size="sm" variant="destructive">
+                      <Button
+                        size="sm"
+                        variant="destructive"
+                        onClick={() => {
+                          // TODO: Implement delete/remove flag functionality
+                          logger.debug(LOGGER_COMPONENT_NAME, 'Remove flag clicked', { userId: flaggedUser.id });
+                        }}
+                      >
                         <Trash2 className="h-4 w-4" />
                       </Button>
                     </div>
diff --git a/ems-client/app/dashboard/attendee/events/page.tsx b/ems-client/app/dashboard/attendee/events/page.tsx
index 5ab7b89..431ad4b 100644
--- a/ems-client/app/dashboard/attendee/events/page.tsx
+++ b/ems-client/app/dashboard/attendee/events/page.tsx
@@ -11,25 +11,25 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { useRouter } from 'next/navigation';
 import { useLogger } from '@/lib/logger/LoggerProvider';
-import { 
-  Search, 
-  Filter, 
-  Calendar, 
-  MapPin, 
-  Users, 
-  Clock, 
-  CheckCircle, 
+import {
+  Search,
+  Filter,
+  Calendar,
+  MapPin,
+  Users,
+  Clock,
+  CheckCircle,
   AlertCircle,
   Loader2,
   Star,
   Eye,
-  Ticket
+  Ticket,
+  ArrowLeft
 } from 'lucide-react';
 
 const LOGGER_COMPONENT_NAME = 'AttendeeEventsPage';
 
 import { EventResponse } from '@/lib/api/types/event.types';
-import { EventJoinInterface } from '@/components/attendance/EventJoinInterface';
 
 interface Event extends EventResponse {}
 
@@ -48,7 +48,7 @@ export default function AttendeeEventsPage() {
   const { user, isAuthenticated } = useAuth();
   const router = useRouter();
   const logger = useLogger();
-  
+
   const [events, setEvents] = useState<Event[]>([]);
   const [filteredEvents, setFilteredEvents] = useState<Event[]>([]);
   const [loading, setLoading] = useState(true);
@@ -68,7 +68,7 @@ export default function AttendeeEventsPage() {
       router.push('/login');
       return;
     }
-    
+
     loadEvents();
     loadUserBookings();
   }, [isAuthenticated, router]);
@@ -80,7 +80,7 @@ export default function AttendeeEventsPage() {
     // Filter by search term
     if (filters.searchTerm) {
       const searchLower = filters.searchTerm.toLowerCase();
-      filtered = filtered.filter(event => 
+      filtered = filtered.filter(event =>
         event.name.toLowerCase().includes(searchLower) ||
         event.description.toLowerCase().includes(searchLower) ||
         event.category.toLowerCase().includes(searchLower) ||
@@ -102,7 +102,7 @@ export default function AttendeeEventsPage() {
     if (filters.dateRange) {
       const now = new Date();
       const filterDate = new Date();
-      
+
       switch (filters.dateRange) {
         case 'today':
           filterDate.setHours(0, 0, 0, 0);
@@ -126,10 +126,10 @@ export default function AttendeeEventsPage() {
     try {
       setLoading(true);
       logger.info(LOGGER_COMPONENT_NAME, 'Loading published events');
-      
+
       const response = await eventAPI.getPublishedEvents();
       setEvents(response.data?.events || []);
-      
+
       logger.info(LOGGER_COMPONENT_NAME, 'Events loaded successfully');
     } catch (error) {
       logger.error(LOGGER_COMPONENT_NAME, 'Failed to load events', error as Error);
@@ -141,36 +141,36 @@ export default function AttendeeEventsPage() {
   const loadUserBookings = async () => {
     try {
       logger.info(LOGGER_COMPONENT_NAME, 'Loading user bookings');
-      
+
       // Load both bookings and tickets to get complete picture
       const [bookingsResponse, ticketsResponse] = await Promise.all([
         bookingAPI.getUserBookings(),
         ticketAPI.getUserTickets()
       ]);
-      
+
       const bookings = bookingsResponse.data?.bookings || [];
       const tickets = ticketsResponse.data || [];
-      
+
       // Create a map of eventId -> true for events the user has booked
       const bookingMap: { [eventId: string]: boolean } = {};
-      
+
       // Add bookings
       bookings.forEach((booking: any) => {
         bookingMap[booking.eventId] = true;
       });
-      
+
       // Add tickets (in case bookings API doesn't return all data)
       tickets.forEach((ticket: any) => {
         if (ticket.eventId) {
           bookingMap[ticket.eventId] = true;
         }
       });
-      
+
       setUserBookings(bookingMap);
-      logger.info(LOGGER_COMPONENT_NAME, 'User bookings loaded successfully', { 
-        bookingsCount: bookings.length, 
+      logger.info(LOGGER_COMPONENT_NAME, 'User bookings loaded successfully', {
+        bookingsCount: bookings.length,
         ticketsCount: tickets.length,
-        uniqueEvents: Object.keys(bookingMap).length 
+        uniqueEvents: Object.keys(bookingMap).length
       });
     } catch (error) {
       logger.error(LOGGER_COMPONENT_NAME, 'Failed to load user bookings', error as Error);
@@ -210,7 +210,7 @@ export default function AttendeeEventsPage() {
 
     } catch (error: any) {
       setBookingStatus(prev => ({ ...prev, [eventId]: 'error' }));
-      
+
       // Handle specific error cases
       if (error?.response?.status === 409) {
         logger.info(LOGGER_COMPONENT_NAME, 'User already has booking for this event (409)');
@@ -231,17 +231,12 @@ export default function AttendeeEventsPage() {
   };
 
 
-  const getBookingButtonText = (eventId: string, event: Event) => {
-    // Check if event is expired
-    if (isEventExpired(event)) {
-      return 'Event Ended';
-    }
-    
+  const getBookingButtonText = (eventId: string) => {
     // Check if user already has a booking for this event
     if (userBookings[eventId]) {
       return 'Already Booked ✓';
     }
-    
+
     const status = bookingStatus[eventId];
     switch (status) {
       case 'loading': return 'Booking...';
@@ -251,17 +246,12 @@ export default function AttendeeEventsPage() {
     }
   };
 
-  const getBookingButtonVariant = (eventId: string, event: Event) => {
-    // Check if event is expired
-    if (isEventExpired(event)) {
-      return 'secondary';
-    }
-    
+  const getBookingButtonVariant = (eventId: string) => {
     // Check if user already has a booking for this event
     if (userBookings[eventId]) {
       return 'secondary';
     }
-    
+
     const status = bookingStatus[eventId];
     switch (status) {
       case 'success': return 'default';
@@ -275,14 +265,14 @@ export default function AttendeeEventsPage() {
     if (userBookings[eventId]) {
       return true;
     }
-    
+
     // Secondary check: bookingStatus (temporary UI state)
     // Only consider 'success' if we don't have userBookings data yet
     return bookingStatus[eventId] === 'success';
   };
 
-  const isButtonDisabled = (eventId: string, event: Event) => {
-    return isEventExpired(event) || isEventBooked(eventId) || bookingStatus[eventId] === 'loading';
+  const isButtonDisabled = (eventId: string) => {
+    return isEventBooked(eventId) || bookingStatus[eventId] === 'loading';
   };
 
   const handleFilterChange = (key: keyof EventFilters, value: string) => {
@@ -315,33 +305,22 @@ export default function AttendeeEventsPage() {
     };
   };
 
-  // Utility function to check if event is expired/ended
-  const isEventExpired = (event: Event) => {
-    const now = new Date();
-    const eventEndDate = new Date(event.bookingEndDate);
-    return eventEndDate < now || event.status === 'COMPLETED' || event.status === 'CANCELLED';
-  };
-
-  // Utility function to check if event is upcoming
-  const isEventUpcoming = (event: Event) => {
-    const now = new Date();
-    const eventStartDate = new Date(event.bookingStartDate);
-    return eventStartDate > now && event.status === 'PUBLISHED';
-  };
-
-  // Utility function to check if event is currently running
-  const isEventRunning = (event: Event) => {
-    const now = new Date();
-    const eventStartDate = new Date(event.bookingStartDate);
-    const eventEndDate = new Date(event.bookingEndDate);
-    return eventStartDate <= now && eventEndDate >= now && event.status === 'PUBLISHED';
-  };
-
 
   if (loading) {
     return (
       <div className="container mx-auto p-6">
-        <h1 className="text-3xl font-bold mb-6">Available Events</h1>
+        <div className="flex items-center gap-4 mb-6">
+          <Button
+            onClick={() => router.push('/dashboard/attendee')}
+            variant="outline"
+            size="sm"
+            className="flex items-center gap-2"
+          >
+            <ArrowLeft className="h-4 w-4" />
+            Back to Dashboard
+          </Button>
+          <h1 className="text-3xl font-bold">Available Events</h1>
+        </div>
         <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
           {[...Array(3)].map((_, i) => (
             <Card key={i} className="animate-pulse">
@@ -364,14 +343,25 @@ export default function AttendeeEventsPage() {
     <div className="container mx-auto p-6">
       {/* Header */}
       <div className="flex flex-col md:flex-row justify-between items-start md:items-center mb-6 gap-4">
-        <div>
-          <h1 className="text-3xl font-bold bg-gradient-to-r from-blue-600 to-purple-600 bg-clip-text text-transparent">
-            Discover Events
-          </h1>
-          <p className="text-gray-600 mt-1">Find and book amazing events happening around you</p>
+        <div className="flex items-center gap-4">
+          <Button
+            onClick={() => router.push('/dashboard/attendee')}
+            variant="outline"
+            size="sm"
+            className="flex items-center gap-2"
+          >
+            <ArrowLeft className="h-4 w-4" />
+            Back to Dashboard
+          </Button>
+          <div>
+            <h1 className="text-3xl font-bold bg-gradient-to-r from-blue-600 to-purple-600 bg-clip-text text-transparent">
+              Discover Events
+            </h1>
+            <p className="text-gray-600 mt-1">Find and book amazing events happening around you</p>
+          </div>
         </div>
         <div className="flex gap-2">
-          <Button 
+          <Button
             onClick={() => router.push('/dashboard/attendee/tickets')}
             variant="outline"
             className="flex items-center gap-2"
@@ -505,8 +495,8 @@ export default function AttendeeEventsPage() {
                 {events.length === 0 ? 'No Events Available' : 'No Events Match Your Filters'}
               </h3>
               <p className="text-gray-500 mb-4">
-                {events.length === 0 
-                  ? 'Check back later for new events!' 
+                {events.length === 0
+                  ? 'Check back later for new events!'
                   : 'Try adjusting your filters to see more events.'
                 }
               </p>
@@ -519,38 +509,20 @@ export default function AttendeeEventsPage() {
           </CardContent>
         </Card>
       ) : (
-        <div className="space-y-8">
-          {/* Upcoming and Running Events */}
-          {filteredEvents.filter(event => !isEventExpired(event)).length > 0 && (
-            <div>
-              <h2 className="text-xl font-semibold text-gray-800 mb-4 flex items-center gap-2">
-                <Calendar className="h-5 w-5 text-blue-600" />
-                Available Events ({filteredEvents.filter(event => !isEventExpired(event)).length})
-              </h2>
-              <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-          {filteredEvents.filter(event => !isEventExpired(event)).map((event) => {
+        <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
+          {filteredEvents.map((event) => {
             const eventTime = formatEventTime(event.bookingStartDate, event.bookingEndDate);
             const isBooked = userBookings[event.id];
             const isBooking = bookingStatus[event.id] === 'loading';
             const isBookedSuccess = bookingStatus[event.id] === 'success';
-            
+
             return (
               <Card key={event.id} className={`hover:shadow-xl transition-all duration-300 transform hover:-translate-y-1 ${
                 isBooked ? 'ring-2 ring-green-200 bg-green-50/30' : ''
               }`}>
                 <CardHeader className="pb-3">
                   <div className="flex items-start justify-between mb-2">
-                    <div className="flex-1">
-                      <CardTitle className="text-lg leading-tight pr-2">{event.name}</CardTitle>
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        className="mt-1 p-0 h-auto text-blue-600 hover:text-blue-800"
-                        onClick={() => router.push(`/dashboard/attendee/events/${event.id}`)}
-                      >
-                        View Details →
-                      </Button>
-                    </div>
+                    <CardTitle className="text-lg leading-tight pr-2">{event.name}</CardTitle>
                     <div className="flex flex-col gap-1">
                       {isBooked && (
                         <Badge className="bg-green-600 text-white flex items-center gap-1">
@@ -558,25 +530,9 @@ export default function AttendeeEventsPage() {
                           BOOKED
                         </Badge>
                       )}
-                      {isEventExpired(event) ? (
-                        <Badge variant="secondary" className="bg-gray-500 text-white">
-                          EXPIRED
-                        </Badge>
-                      ) : isEventRunning(event) ? (
-                        <Badge className="bg-orange-600 text-white flex items-center gap-1">
-                          <Clock className="h-3 w-3" />
-                          LIVE
-                        </Badge>
-                      ) : isEventUpcoming(event) ? (
-                        <Badge className="bg-blue-600 text-white flex items-center gap-1">
-                          <Calendar className="h-3 w-3" />
-                          UPCOMING
-                        </Badge>
-                      ) : (
-                        <Badge variant={event.status === 'PUBLISHED' ? 'default' : 'secondary'}>
-                          {event.status}
-                        </Badge>
-                      )}
+                      <Badge variant={event.status === 'PUBLISHED' ? 'default' : 'secondary'}>
+                        {event.status}
+                      </Badge>
                     </div>
                   </div>
                   <CardDescription className="flex items-center gap-1">
@@ -584,13 +540,13 @@ export default function AttendeeEventsPage() {
                     {eventTime.date}
                   </CardDescription>
                 </CardHeader>
-                
+
                 <CardContent className="space-y-4">
                   {/* Description */}
                   <p className="text-sm text-gray-600 line-clamp-3 leading-relaxed">
                     {event.description}
                   </p>
-                  
+
                   {/* Event Details */}
                   <div className="space-y-3">
                     <div className="flex items-center gap-2 text-sm">
@@ -598,19 +554,19 @@ export default function AttendeeEventsPage() {
                       <span className="font-medium">Time:</span>
                       <span>{eventTime.time}</span>
                     </div>
-                    
+
                     <div className="flex items-center gap-2 text-sm">
                       <MapPin className="h-4 w-4 text-red-500" />
                       <span className="font-medium">Venue:</span>
                       <span>{event.venue.name}</span>
                     </div>
-                    
+
                     <div className="flex items-center gap-2 text-sm">
                       <Users className="h-4 w-4 text-green-500" />
                       <span className="font-medium">Capacity:</span>
                       <span>{event.venue.capacity} people</span>
                     </div>
-                    
+
                     <div className="flex items-center gap-2 text-sm">
                       <Star className="h-4 w-4 text-yellow-500" />
                       <span className="font-medium">Category:</span>
@@ -631,18 +587,13 @@ export default function AttendeeEventsPage() {
                   {/* Booking Button */}
                   <Button
                     onClick={() => handleBookEvent(event.id)}
-                    disabled={isButtonDisabled(event.id, event)}
-                    variant={getBookingButtonVariant(event.id, event)}
+                    disabled={isButtonDisabled(event.id)}
+                    variant={getBookingButtonVariant(event.id)}
                     className={`w-full transition-all duration-200 ${
-                      isBooked || isEventExpired(event) ? 'opacity-60' : 'hover:scale-105'
+                      isBooked ? 'opacity-60' : 'hover:scale-105'
                     }`}
                   >
-                    {isEventExpired(event) ? (
-                      <>
-                        <AlertCircle className="h-4 w-4 mr-2" />
-                        Event Ended
-                      </>
-                    ) : isBooking ? (
+                    {isBooking ? (
                       <>
                         <Loader2 className="h-4 w-4 mr-2 animate-spin" />
                         Booking...
@@ -664,137 +615,10 @@ export default function AttendeeEventsPage() {
                       </>
                     )}
                   </Button>
-
-                  {/* Event Join Interface - Only show for booked events */}
-                  {isBooked && (
-                    <div className="mt-4 pt-4 border-t">
-                      <EventJoinInterface
-                        eventId={event.id}
-                        eventTitle={event.name}
-                        eventStartTime={event.bookingStartDate}
-                        eventEndTime={event.bookingEndDate}
-                        eventVenue={event.venue.name}
-                        eventCategory={event.category}
-                        eventStatus={event.status}
-                        eventDescription={event.description}
-                        userRole={user?.role || 'USER'}
-                      />
-                    </div>
-                  )}
                 </CardContent>
               </Card>
             );
           })}
-              </div>
-            </div>
-          )}
-
-          {/* Expired Events */}
-          {filteredEvents.filter(event => isEventExpired(event)).length > 0 && (
-            <div>
-              <h2 className="text-xl font-semibold text-gray-800 mb-4 flex items-center gap-2">
-                <AlertCircle className="h-5 w-5 text-gray-500" />
-                Past Events ({filteredEvents.filter(event => isEventExpired(event)).length})
-              </h2>
-              <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-                {filteredEvents.filter(event => isEventExpired(event)).map((event) => {
-                  const eventTime = formatEventTime(event.bookingStartDate, event.bookingEndDate);
-                  const isBooked = userBookings[event.id];
-                  
-                  return (
-                    <Card key={event.id} className={`opacity-75 hover:shadow-lg transition-all duration-300 ${
-                      isBooked ? 'ring-2 ring-green-200 bg-green-50/30' : ''
-                    }`}>
-                      <CardHeader className="pb-3">
-                        <div className="flex items-start justify-between mb-2">
-                          <div className="flex-1">
-                            <CardTitle className="text-lg leading-tight pr-2">{event.name}</CardTitle>
-                            <Button
-                              variant="ghost"
-                              size="sm"
-                              className="mt-1 p-0 h-auto text-blue-600 hover:text-blue-800"
-                              onClick={() => router.push(`/dashboard/attendee/events/${event.id}`)}
-                            >
-                              View Details →
-                            </Button>
-                          </div>
-                          <div className="flex flex-col gap-1">
-                            {isBooked && (
-                              <Badge className="bg-green-600 text-white flex items-center gap-1">
-                                <CheckCircle className="h-3 w-3" />
-                                ATTENDED
-                              </Badge>
-                            )}
-                            <Badge variant="secondary" className="bg-gray-500 text-white">
-                              EXPIRED
-                            </Badge>
-                          </div>
-                        </div>
-                        <CardDescription className="flex items-center gap-1">
-                          <Calendar className="h-4 w-4" />
-                          {eventTime.date}
-                        </CardDescription>
-                      </CardHeader>
-                      
-                      <CardContent className="space-y-4">
-                        {/* Description */}
-                        <p className="text-sm text-gray-600 line-clamp-3 leading-relaxed">
-                          {event.description}
-                        </p>
-                        
-                        {/* Event Details */}
-                        <div className="space-y-3">
-                          <div className="flex items-center gap-2 text-sm">
-                            <Clock className="h-4 w-4 text-blue-500" />
-                            <span className="font-medium">Time:</span>
-                            <span>{eventTime.time}</span>
-                          </div>
-                          
-                          <div className="flex items-center gap-2 text-sm">
-                            <MapPin className="h-4 w-4 text-red-500" />
-                            <span className="font-medium">Venue:</span>
-                            <span>{event.venue.name}</span>
-                          </div>
-                          
-                          <div className="flex items-center gap-2 text-sm">
-                            <Users className="h-4 w-4 text-green-500" />
-                            <span className="font-medium">Capacity:</span>
-                            <span>{event.venue.capacity} people</span>
-                          </div>
-                          
-                          <div className="flex items-center gap-2 text-sm">
-                            <Star className="h-4 w-4 text-yellow-500" />
-                            <span className="font-medium">Category:</span>
-                            <Badge variant="outline" className="text-xs">{event.category}</Badge>
-                          </div>
-                        </div>
-
-                        {/* Booking Status */}
-                        {isBooked && (
-                          <div className="p-3 bg-green-50 border border-green-200 rounded-lg">
-                            <div className="flex items-center gap-2 text-green-700">
-                              <CheckCircle className="h-4 w-4" />
-                              <span className="text-sm font-medium">You attended this event!</span>
-                            </div>
-                          </div>
-                        )}
-
-                        {/* Disabled Button for Expired Events */}
-                        <Button
-                          disabled={true}
-                          variant="secondary"
-                          className="w-full opacity-60"
-                        >
-                          <AlertCircle className="h-4 w-4 mr-2" />
-                          Event Ended
-                        </Button>
-                      </CardContent>
-                    </Card>
-                  );
-                })}
-              </div>
-            </div>
-          )}
         </div>
       )}
     </div>
diff --git a/ems-client/app/dashboard/attendee/page.tsx b/ems-client/app/dashboard/attendee/page.tsx
index f068e23..945664d 100644
--- a/ems-client/app/dashboard/attendee/page.tsx
+++ b/ems-client/app/dashboard/attendee/page.tsx
@@ -18,76 +18,39 @@ import {
   TrendingUp,
   Award,
   MapPin,
-  Users
+  Users,
+  Loader2
 } from "lucide-react";
 import { useRouter } from "next/navigation";
-import { useEffect } from "react";
+import { useEffect, useState, useCallback } from "react";
 import {useLogger} from "@/lib/logger/LoggerProvider";
 import {withUserAuth} from "@/components/hoc/withAuth";
+import { bookingAPI, ticketAPI } from "@/lib/api/booking.api";
+import { eventAPI } from "@/lib/api/event.api";
+import { BookingResponse, TicketResponse } from "@/lib/api/types/booking.types";
+import { EventResponse } from "@/lib/api/types/event.types";
 
-// Mock data for development
-const mockStats = {
-  registeredEvents: 8,
-  upcomingEvents: 3,
-  attendedEvents: 5,
-  ticketsPurchased: 12,
-  activeTickets: 4,
-  usedTickets: 8,
-  pointsEarned: 1250,
-  pointsThisMonth: 300,
-  upcomingThisWeek: 2,
-  nextWeekEvents: 1
-};
-
-const mockUpcomingEvents = [
-  {
-    id: '1',
-    title: 'TechConf 2024',
-    date: '2024-01-15',
-    time: '9:00 AM',
-    location: 'Convention Center',
-    attendees: 500,
-    status: 'registered',
-    ticketType: 'VIP Pass'
-  },
-  {
-    id: '2',
-    title: 'React Workshop',
-    date: '2024-01-18',
-    time: '2:00 PM',
-    location: 'Tech Hub',
-    attendees: 50,
-    status: 'registered',
-    ticketType: 'Standard'
-  },
-  {
-    id: '3',
-    title: 'Design Thinking Summit',
-    date: '2024-01-22',
-    time: '10:00 AM',
-    location: 'Innovation Lab',
-    attendees: 200,
-    status: 'interested',
-    ticketType: null
-  }
-];
-
-const mockRecentRegistrations = [
-  {
-    id: '1',
-    event: 'DevSummit 2024',
-    date: '2024-01-10',
-    status: 'confirmed',
-    ticketType: 'Early Bird'
-  },
-  {
-    id: '2',
-    event: 'UX Conference',
-    date: '2024-01-08',
-    status: 'confirmed',
-    ticketType: 'Standard'
-  }
-];
+// Interface for display data
+interface UpcomingEventDisplay {
+  id: string;
+  title: string;
+  date: string;
+  time: string;
+  location: string;
+  attendees?: number;
+  status: 'registered' | 'interested';
+  ticketType?: string | null;
+  eventId: string;
+}
+
+interface RecentRegistrationDisplay {
+  id: string;
+  event: string;
+  date: string;
+  status: string;
+  ticketType?: string;
+  bookingId: string;
+}
 
 const LOGGER_COMPONENT_NAME = 'AttendeeDashboard';
 
@@ -96,9 +59,187 @@ function AttendeeDashboard() {
   const router = useRouter();
   const logger = useLogger();
 
+  // State for real data
+  const [loading, setLoading] = useState(true);
+  const [stats, setStats] = useState({
+    registeredEvents: 0,
+    upcomingEvents: 0,
+    attendedEvents: 0,
+    ticketsPurchased: 0,
+    activeTickets: 0,
+    usedTickets: 0,
+    pointsEarned: 0,
+    pointsThisMonth: 0,
+    upcomingThisWeek: 0,
+    nextWeekEvents: 0
+  });
+  const [upcomingEvents, setUpcomingEvents] = useState<UpcomingEventDisplay[]>([]);
+  const [recentRegistrations, setRecentRegistrations] = useState<RecentRegistrationDisplay[]>([]);
+  const [error, setError] = useState<string | null>(null);
+
+  // Helper function to format date
+  const formatDate = (dateString: string): string => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' });
+  };
+
+  // Helper function to format time
+  const formatTime = (dateString: string): string => {
+    const date = new Date(dateString);
+    return date.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true });
+  };
+
+  // Helper function to check if event is upcoming
+  const isUpcoming = (dateString: string): boolean => {
+    return new Date(dateString) > new Date();
+  };
+
+  // Helper function to check if event is this week
+  const isThisWeek = (dateString: string): boolean => {
+    const eventDate = new Date(dateString);
+    const now = new Date();
+    const weekFromNow = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000);
+    return eventDate >= now && eventDate <= weekFromNow;
+  };
+
+  // Helper function to check if event is next week
+  const isNextWeek = (dateString: string): boolean => {
+    const eventDate = new Date(dateString);
+    const now = new Date();
+    const weekFromNow = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000);
+    const twoWeeksFromNow = new Date(now.getTime() + 14 * 24 * 60 * 60 * 1000);
+    return eventDate >= weekFromNow && eventDate <= twoWeeksFromNow;
+  };
+
+  // Fetch all dashboard data
+  const fetchDashboardData = useCallback(async () => {
+    if (!user?.id) return;
+
+    try {
+      setLoading(true);
+      setError(null);
+      logger.debug(LOGGER_COMPONENT_NAME, 'Fetching dashboard data', { userId: user.id });
+
+      // Fetch bookings, tickets, and published events in parallel
+      const [bookingsResponse, ticketsResponse, publishedEventsResponse] = await Promise.all([
+        bookingAPI.getUserBookings(),
+        ticketAPI.getUserTickets(),
+        eventAPI.getPublishedEvents()
+      ]);
+
+      const bookings = bookingsResponse.success ? bookingsResponse.data.bookings : [];
+      const tickets = ticketsResponse.success ? ticketsResponse.data : [];
+      const publishedEvents = publishedEventsResponse.success ? publishedEventsResponse.data.events : [];
+
+      logger.debug(LOGGER_COMPONENT_NAME, 'Data fetched', {
+        bookings: bookings.length,
+        tickets: tickets.length,
+        events: publishedEvents.length
+      });
+
+      // Calculate stats
+      const now = new Date();
+      const currentMonth = now.getMonth();
+      const currentYear = now.getFullYear();
+
+      const upcomingBookings = bookings.filter(booking => {
+        const event = publishedEvents.find(e => e.id === booking.eventId);
+        return event && isUpcoming(event.bookingStartDate);
+      });
+
+      const upcomingThisWeek = upcomingBookings.filter(booking => {
+        const event = publishedEvents.find(e => e.id === booking.eventId);
+        return event && isThisWeek(event.bookingStartDate);
+      });
+
+      const nextWeekBookings = upcomingBookings.filter(booking => {
+        const event = publishedEvents.find(e => e.id === booking.eventId);
+        return event && isNextWeek(event.bookingStartDate);
+      });
+
+      const activeTickets = tickets.filter(t => t.status === 'ISSUED');
+      const usedTickets = tickets.filter(t => t.status === 'SCANNED');
+
+      // Calculate points (simple calculation: 100 points per booking, 50 per ticket)
+      const pointsEarned = (bookings.length * 100) + (tickets.length * 50);
+      const bookingsThisMonth = bookings.filter(b => {
+        const bookingDate = new Date(b.createdAt);
+        return bookingDate.getMonth() === currentMonth && bookingDate.getFullYear() === currentYear;
+      });
+      const pointsThisMonth = (bookingsThisMonth.length * 100) + (bookingsThisMonth.length * 50);
+
+      setStats({
+        registeredEvents: bookings.length,
+        upcomingEvents: upcomingBookings.length,
+        attendedEvents: usedTickets.length,
+        ticketsPurchased: tickets.length,
+        activeTickets: activeTickets.length,
+        usedTickets: usedTickets.length,
+        pointsEarned,
+        pointsThisMonth,
+        upcomingThisWeek: upcomingThisWeek.length,
+        nextWeekEvents: nextWeekBookings.length
+      });
+
+      // Build upcoming events display
+      const upcomingEventsDisplay: UpcomingEventDisplay[] = upcomingBookings
+        .slice(0, 3)
+        .reduce<UpcomingEventDisplay[]>((acc, booking) => {
+          const event = publishedEvents.find(e => e.id === booking.eventId);
+          if (!event) return acc;
+
+          acc.push({
+            id: booking.id,
+            eventId: event.id,
+            title: event.name,
+            date: formatDate(event.bookingStartDate),
+            time: formatTime(event.bookingStartDate),
+            location: event.venue.name,
+            attendees: event.venue.capacity,
+            status: 'registered' as const,
+            ticketType: 'Standard' // Default, could be enhanced with ticket type from booking
+          });
+          return acc;
+        }, []);
+
+      setUpcomingEvents(upcomingEventsDisplay);
+
+      // Build recent registrations display
+      const recentBookings = bookings
+        .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
+        .slice(0, 5);
+
+      const recentRegistrationsDisplay: RecentRegistrationDisplay[] = recentBookings.map(booking => {
+        const event = publishedEvents.find(e => e.id === booking.eventId);
+        const ticket = tickets.find(t => t.bookingId === booking.id);
+
+        return {
+          id: booking.id,
+          bookingId: booking.id,
+          event: event?.name || 'Unknown Event',
+          date: formatDate(booking.createdAt),
+          status: booking.status.toLowerCase(),
+          ticketType: ticket ? 'Standard' : undefined
+        };
+      });
+
+      setRecentRegistrations(recentRegistrationsDisplay);
+
+      logger.info(LOGGER_COMPONENT_NAME, 'Dashboard data loaded successfully');
+    } catch (err) {
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to load dashboard data', err as Error);
+      setError('Failed to load dashboard data. Please refresh the page.');
+    } finally {
+      setLoading(false);
+    }
+  }, [user, logger]);
+
   useEffect(() => {
     logger.debug(LOGGER_COMPONENT_NAME, 'Attendee dashboard loaded', { userRole: user?.role });
-  }, [user, logger]);
+    if (user?.id) {
+      fetchDashboardData();
+    }
+  }, [user, logger, fetchDashboardData]);
 
   // Loading and auth checks are handled by the HOC
 
@@ -169,10 +310,19 @@ function AttendeeDashboard() {
               <Calendar className="h-4 w-4 text-blue-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.registeredEvents}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.upcomingEvents} upcoming
-              </p>
+              {loading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                  <span className="text-sm text-slate-500">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.registeredEvents}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.upcomingEvents} upcoming
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
@@ -184,10 +334,19 @@ function AttendeeDashboard() {
               <Ticket className="h-4 w-4 text-green-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.ticketsPurchased}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.activeTickets} active
-              </p>
+              {loading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                  <span className="text-sm text-slate-500">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.ticketsPurchased}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.activeTickets} active
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
@@ -199,10 +358,19 @@ function AttendeeDashboard() {
               <Award className="h-4 w-4 text-yellow-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.pointsEarned}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.pointsThisMonth} this month
-              </p>
+              {loading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                  <span className="text-sm text-slate-500">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.pointsEarned}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.pointsThisMonth} this month
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
 
@@ -214,10 +382,19 @@ function AttendeeDashboard() {
               <Clock className="h-4 w-4 text-purple-600" />
             </CardHeader>
             <CardContent>
-              <div className="text-2xl font-bold text-slate-900 dark:text-white">{mockStats.upcomingThisWeek}</div>
-              <p className="text-xs text-slate-600 dark:text-slate-400">
-                {mockStats.nextWeekEvents} next week
-              </p>
+              {loading ? (
+                <div className="flex items-center gap-2">
+                  <Loader2 className="h-4 w-4 animate-spin" />
+                  <span className="text-sm text-slate-500">Loading...</span>
+                </div>
+              ) : (
+                <>
+                  <div className="text-2xl font-bold text-slate-900 dark:text-white">{stats.upcomingThisWeek}</div>
+                  <p className="text-xs text-slate-600 dark:text-slate-400">
+                    {stats.nextWeekEvents} next week
+                  </p>
+                </>
+              )}
             </CardContent>
           </Card>
         </div>
@@ -285,41 +462,56 @@ function AttendeeDashboard() {
               </CardDescription>
             </CardHeader>
             <CardContent>
-              <div className="space-y-4">
-                {mockUpcomingEvents.map((event) => (
-                  <div key={event.id} className="flex items-center justify-between p-3 bg-slate-50 dark:bg-slate-800 rounded-lg">
-                    <div className="flex-1">
-                      <h4 className="font-medium text-slate-900 dark:text-white">{event.title}</h4>
-                      <div className="flex items-center space-x-4 mt-1">
-                        <span className="text-xs text-slate-500 dark:text-slate-400 flex items-center">
-                          <Calendar className="h-3 w-3 mr-1" />
-                          {event.date} at {event.time}
-                        </span>
-                        <span className="text-xs text-slate-500 dark:text-slate-400 flex items-center">
-                          <MapPin className="h-3 w-3 mr-1" />
-                          {event.location}
-                        </span>
+              {loading ? (
+                <div className="flex items-center justify-center py-8">
+                  <Loader2 className="h-6 w-6 animate-spin text-slate-400" />
+                </div>
+              ) : upcomingEvents.length === 0 ? (
+                <div className="text-center py-8 text-slate-500 dark:text-slate-400">
+                  <Calendar className="h-8 w-8 mx-auto mb-2 opacity-50" />
+                  <p className="text-sm">No upcoming events</p>
+                </div>
+              ) : (
+                <div className="space-y-4">
+                  {upcomingEvents.map((event) => (
+                    <div key={event.id} className="flex items-center justify-between p-3 bg-slate-50 dark:bg-slate-800 rounded-lg">
+                      <div className="flex-1">
+                        <h4 className="font-medium text-slate-900 dark:text-white">{event.title}</h4>
+                        <div className="flex items-center space-x-4 mt-1">
+                          <span className="text-xs text-slate-500 dark:text-slate-400 flex items-center">
+                            <Calendar className="h-3 w-3 mr-1" />
+                            {event.date} at {event.time}
+                          </span>
+                          <span className="text-xs text-slate-500 dark:text-slate-400 flex items-center">
+                            <MapPin className="h-3 w-3 mr-1" />
+                            {event.location}
+                          </span>
+                        </div>
+                        {event.ticketType && (
+                          <span className="text-xs text-slate-500 dark:text-slate-400">
+                            {event.ticketType}
+                          </span>
+                        )}
+                      </div>
+                      <div className="flex items-center space-x-2">
+                        <Badge
+                          variant={event.status === 'registered' ? 'default' : 'secondary'}
+                          className={event.status === 'registered' ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200' : 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200'}
+                        >
+                          {event.status}
+                        </Badge>
+                        <Button
+                          size="sm"
+                          variant="outline"
+                          onClick={() => router.push(`/dashboard/attendee/events`)}
+                        >
+                          <Eye className="h-4 w-4" />
+                        </Button>
                       </div>
-                      {event.ticketType && (
-                        <span className="text-xs text-slate-500 dark:text-slate-400">
-                          {event.ticketType}
-                        </span>
-                      )}
-                    </div>
-                    <div className="flex items-center space-x-2">
-                      <Badge
-                        variant={event.status === 'registered' ? 'default' : 'secondary'}
-                        className={event.status === 'registered' ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200' : 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200'}
-                      >
-                        {event.status}
-                      </Badge>
-                      <Button size="sm" variant="outline">
-                        <Eye className="h-4 w-4" />
-                      </Button>
                     </div>
-                  </div>
-                ))}
-              </div>
+                  ))}
+                </div>
+              )}
             </CardContent>
           </Card>
         </div>
@@ -335,34 +527,56 @@ function AttendeeDashboard() {
             </CardDescription>
           </CardHeader>
           <CardContent>
-            <div className="space-y-4">
-              {mockRecentRegistrations.map((registration) => (
-                <div key={registration.id} className="flex items-center justify-between p-4 bg-slate-50 dark:bg-slate-800 rounded-lg">
-                  <div className="flex-1">
-                    <h4 className="font-medium text-slate-900 dark:text-white">{registration.event}</h4>
-                    <div className="flex items-center space-x-4 mt-1">
-                      <span className="text-sm text-slate-600 dark:text-slate-400">
-                        {registration.ticketType}
-                      </span>
-                      <span className="text-xs text-slate-500 dark:text-slate-400">
-                        Registered on {registration.date}
-                      </span>
+            {error && (
+              <div className="mb-4 p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg">
+                <p className="text-sm text-red-600 dark:text-red-400">{error}</p>
+              </div>
+            )}
+            {loading ? (
+              <div className="flex items-center justify-center py-8">
+                <Loader2 className="h-6 w-6 animate-spin text-slate-400" />
+              </div>
+            ) : recentRegistrations.length === 0 ? (
+              <div className="text-center py-8 text-slate-500 dark:text-slate-400">
+                <Ticket className="h-8 w-8 mx-auto mb-2 opacity-50" />
+                <p className="text-sm">No recent registrations</p>
+              </div>
+            ) : (
+              <div className="space-y-4">
+                {recentRegistrations.map((registration) => (
+                  <div key={registration.id} className="flex items-center justify-between p-4 bg-slate-50 dark:bg-slate-800 rounded-lg">
+                    <div className="flex-1">
+                      <h4 className="font-medium text-slate-900 dark:text-white">{registration.event}</h4>
+                      <div className="flex items-center space-x-4 mt-1">
+                        {registration.ticketType && (
+                          <span className="text-sm text-slate-600 dark:text-slate-400">
+                            {registration.ticketType}
+                          </span>
+                        )}
+                        <span className="text-xs text-slate-500 dark:text-slate-400">
+                          Registered on {registration.date}
+                        </span>
+                      </div>
+                    </div>
+                    <div className="flex items-center space-x-2">
+                      <Badge
+                        variant="default"
+                        className="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200"
+                      >
+                        {registration.status}
+                      </Badge>
+                      <Button
+                        size="sm"
+                        variant="outline"
+                        onClick={() => router.push(`/dashboard/attendee/tickets`)}
+                      >
+                        <Download className="h-4 w-4" />
+                      </Button>
                     </div>
                   </div>
-                  <div className="flex items-center space-x-2">
-                    <Badge
-                      variant="default"
-                      className="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200"
-                    >
-                      {registration.status}
-                    </Badge>
-                    <Button size="sm" variant="outline">
-                      <Download className="h-4 w-4" />
-                    </Button>
-                  </div>
-                </div>
-              ))}
-            </div>
+                ))}
+              </div>
+            )}
           </CardContent>
         </Card>
       </main>
diff --git a/ems-client/app/dashboard/attendee/tickets/page.tsx b/ems-client/app/dashboard/attendee/tickets/page.tsx
index 07675e0..f26890c 100644
--- a/ems-client/app/dashboard/attendee/tickets/page.tsx
+++ b/ems-client/app/dashboard/attendee/tickets/page.tsx
@@ -10,6 +10,7 @@ import { useRouter } from 'next/navigation';
 import { useLogger } from '@/lib/logger/LoggerProvider';
 import { TicketResponse } from '@/lib/api/types/booking.types';
 import { QRCodeSVG } from 'qrcode.react';
+import { ArrowLeft } from 'lucide-react';
 
 const LOGGER_COMPONENT_NAME = 'AttendeeTicketsPage';
 
@@ -17,7 +18,7 @@ export default function AttendeeTicketsPage() {
   const { user, isAuthenticated } = useAuth();
   const router = useRouter();
   const logger = useLogger();
-  
+
   const [tickets, setTickets] = useState<TicketResponse[]>([]);
   const [loading, setLoading] = useState(true);
 
@@ -26,7 +27,7 @@ export default function AttendeeTicketsPage() {
       router.push('/login');
       return;
     }
-    
+
     loadTickets();
   }, [isAuthenticated, router]);
 
@@ -34,10 +35,10 @@ export default function AttendeeTicketsPage() {
     try {
       setLoading(true);
       logger.info(LOGGER_COMPONENT_NAME, 'Loading user tickets');
-      
+
       const response = await ticketAPI.getUserTickets();
       setTickets(response.data || []);
-      
+
       logger.info(LOGGER_COMPONENT_NAME, 'Tickets loaded successfully');
     } catch (error) {
       logger.error(LOGGER_COMPONENT_NAME, 'Failed to load tickets', error as Error);
@@ -54,7 +55,7 @@ export default function AttendeeTicketsPage() {
       'REVOKED': 'destructive',
       'EXPIRED': 'outline'
     } as const;
-    
+
     return (
       <Badge variant={variants[status as keyof typeof variants] || 'outline'}>
         {status}
@@ -66,36 +67,22 @@ export default function AttendeeTicketsPage() {
     return new Date(expiresAt) < new Date();
   };
 
-  // Utility function to check if ticket's event is expired/ended
-  const isTicketEventExpired = (ticket: TicketResponse) => {
-    if (!ticket.event) return false;
-    const now = new Date();
-    const eventEndDate = new Date(ticket.event.bookingEndDate);
-    return eventEndDate < now;
-  };
-
-  // Utility function to check if ticket's event is upcoming
-  const isTicketEventUpcoming = (ticket: TicketResponse) => {
-    if (!ticket.event) return false;
-    const now = new Date();
-    const eventStartDate = new Date(ticket.event.bookingStartDate);
-    return eventStartDate > now;
-  };
-
-  // Utility function to check if ticket's event is currently running
-  const isTicketEventRunning = (ticket: TicketResponse) => {
-    if (!ticket.event) return false;
-    const now = new Date();
-    const eventStartDate = new Date(ticket.event.bookingStartDate);
-    const eventEndDate = new Date(ticket.event.bookingEndDate);
-    return eventStartDate <= now && eventEndDate >= now;
-  };
-
 
   if (loading) {
     return (
       <div className="container mx-auto p-6">
-        <h1 className="text-3xl font-bold mb-6">My Tickets</h1>
+        <div className="flex items-center gap-4 mb-6">
+          <Button
+            onClick={() => router.push('/dashboard/attendee')}
+            variant="outline"
+            size="sm"
+            className="flex items-center gap-2"
+          >
+            <ArrowLeft className="h-4 w-4" />
+            Back to Dashboard
+          </Button>
+          <h1 className="text-3xl font-bold">My Tickets</h1>
+        </div>
         <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
           {[...Array(3)].map((_, i) => (
             <Card key={i} className="animate-pulse">
@@ -117,16 +104,28 @@ export default function AttendeeTicketsPage() {
 
   return (
     <div className="container mx-auto p-6">
-      <div className="flex justify-between items-center mb-6">
-        <h1 className="text-3xl font-bold">My Tickets</h1>
-        <div className="space-x-2">
-          <Button 
+      {/* Header */}
+      <div className="flex flex-col md:flex-row justify-between items-start md:items-center mb-6 gap-4">
+        <div className="flex items-center gap-4">
+          <Button
+            onClick={() => router.push('/dashboard/attendee')}
+            variant="outline"
+            size="sm"
+            className="flex items-center gap-2"
+          >
+            <ArrowLeft className="h-4 w-4" />
+            Back to Dashboard
+          </Button>
+          <h1 className="text-3xl font-bold">My Tickets</h1>
+        </div>
+        <div className="flex gap-2">
+          <Button
             onClick={loadTickets}
             variant="outline"
           >
             Refresh
           </Button>
-          <Button 
+          <Button
             onClick={() => router.push('/dashboard/attendee/events')}
             variant="outline"
           >
@@ -145,16 +144,8 @@ export default function AttendeeTicketsPage() {
           </CardContent>
         </Card>
       ) : (
-        <div className="space-y-8">
-          {/* Active Tickets (Upcoming and Running Events) */}
-          {tickets.filter(ticket => !isTicketEventExpired(ticket)).length > 0 && (
-            <div>
-              <h2 className="text-xl font-semibold text-gray-800 mb-4 flex items-center gap-2">
-                <div className="h-5 w-5 bg-green-500 rounded-full"></div>
-                Active Tickets ({tickets.filter(ticket => !isTicketEventExpired(ticket)).length})
-              </h2>
-              <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-                {tickets.filter(ticket => !isTicketEventExpired(ticket)).map((ticket) => (
+        <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
+          {tickets.map((ticket) => (
             <Card key={ticket.id} className="hover:shadow-lg transition-shadow">
               <CardHeader>
                 <CardTitle className="flex items-center justify-between">
@@ -206,8 +197,8 @@ export default function AttendeeTicketsPage() {
                       </p>
                       <p className="text-sm">
                         <span className="font-medium">Event Date:</span> {
-                          ticket.event.bookingStartDate ? 
-                            new Date(ticket.event.bookingStartDate).toLocaleDateString() : 
+                          ticket.event.bookingStartDate ?
+                            new Date(ticket.event.bookingStartDate).toLocaleDateString() :
                             'Date not available'
                         }
                       </p>
@@ -236,88 +227,6 @@ export default function AttendeeTicketsPage() {
               </CardContent>
             </Card>
           ))}
-              </div>
-            </div>
-          )}
-
-          {/* Expired Tickets */}
-          {tickets.filter(ticket => isTicketEventExpired(ticket)).length > 0 && (
-            <div>
-              <h2 className="text-xl font-semibold text-gray-800 mb-4 flex items-center gap-2">
-                <div className="h-5 w-5 bg-gray-500 rounded-full"></div>
-                Past Event Tickets ({tickets.filter(ticket => isTicketEventExpired(ticket)).length})
-              </h2>
-              <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
-                {tickets.filter(ticket => isTicketEventExpired(ticket)).map((ticket) => (
-                  <Card key={ticket.id} className="opacity-75 hover:shadow-lg transition-shadow">
-                    <CardHeader>
-                      <CardTitle className="flex items-center justify-between">
-                        {ticket.event?.name || 'Event Ticket'}
-                        <Badge variant="secondary" className="bg-gray-500 text-white">
-                          EXPIRED EVENT
-                        </Badge>
-                      </CardTitle>
-                      <CardDescription>
-                        {ticket.event?.category && (
-                          <span className="inline-block bg-gray-100 text-gray-600 text-xs px-2 py-1 rounded-full mr-2">
-                            {ticket.event.category}
-                          </span>
-                        )}
-                        Ticket ID: {ticket.id.substring(0, 8)}...
-                      </CardDescription>
-                    </CardHeader>
-                    <CardContent>
-                      {/* QR Code Display - Disabled for expired events */}
-                      <div className="mb-4">
-                        <div className="h-48 bg-gray-100 rounded flex items-center justify-center opacity-50">
-                          <p className="text-gray-500">QR Code no longer valid</p>
-                        </div>
-                      </div>
-
-                      <div className="space-y-2 mb-4">
-                        {ticket.event && (
-                          <>
-                            <p className="text-sm">
-                              <span className="font-medium">Event:</span> {ticket.event.name}
-                            </p>
-                            <p className="text-sm">
-                              <span className="font-medium">Venue:</span> {ticket.event.venue.name}
-                            </p>
-                            <p className="text-sm text-gray-600">
-                              {ticket.event.venue.address}
-                            </p>
-                            <p className="text-sm">
-                              <span className="font-medium">Event Date:</span> {
-                                ticket.event.bookingStartDate ? 
-                                  new Date(ticket.event.bookingStartDate).toLocaleDateString() : 
-                                  'Date not available'
-                              }
-                            </p>
-                          </>
-                        )}
-                        <p className="text-sm">
-                          <span className="font-medium">Issued:</span> {new Date(ticket.issuedAt).toLocaleString()}
-                        </p>
-                        <p className="text-sm">
-                          <span className="font-medium">Expires:</span> {new Date(ticket.expiresAt).toLocaleString()}
-                        </p>
-                        {ticket.scannedAt && (
-                          <p className="text-sm">
-                            <span className="font-medium">Scanned:</span> {new Date(ticket.scannedAt).toLocaleString()}
-                          </p>
-                        )}
-                      </div>
-
-                      {/* Event Ended Notice */}
-                      <div className="mb-4 p-3 bg-gray-100 border border-gray-300 rounded text-gray-700 text-sm">
-                        📅 This event has ended
-                      </div>
-                    </CardContent>
-                  </Card>
-                ))}
-              </div>
-            </div>
-          )}
         </div>
       )}
     </div>
diff --git a/ems-client/app/dashboard/speaker/events/[id]/page.tsx b/ems-client/app/dashboard/speaker/events/[id]/page.tsx
index df49887..718b384 100644
--- a/ems-client/app/dashboard/speaker/events/[id]/page.tsx
+++ b/ems-client/app/dashboard/speaker/events/[id]/page.tsx
@@ -1,17 +1,217 @@
 'use client';
 
-import { EventDetailsPage } from "@/components/events/EventDetailsPage";
+import { useAuth } from "@/lib/auth-context";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import {
+  ArrowLeft,
+  Calendar,
+  MapPin,
+  Clock,
+  Users,
+  AlertCircle,
+  Edit,
+  Send
+} from "lucide-react";
+import { useRouter, useParams } from "next/navigation";
+import { useEffect, useState } from "react";
+import { useLogger } from "@/lib/logger/LoggerProvider";
+import { eventAPI } from "@/lib/api/event.api";
+import { EventResponse, EventStatus } from "@/lib/api/types/event.types";
 import { withSpeakerAuth } from "@/components/hoc/withAuth";
 
-const SpeakerEventDetailsPage = () => {
+const LOGGER_COMPONENT_NAME = 'SpeakerEventDetailsPage';
+
+const statusColors = {
+  [EventStatus.DRAFT]: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200',
+  [EventStatus.PENDING_APPROVAL]: 'bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-200',
+  [EventStatus.PUBLISHED]: 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200',
+  [EventStatus.REJECTED]: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200',
+  [EventStatus.CANCELLED]: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200',
+  [EventStatus.COMPLETED]: 'bg-gray-100 text-gray-800 dark:bg-gray-900 dark:text-gray-200'
+};
+
+function SpeakerEventDetailsPage() {
+  const { user } = useAuth();
+  const router = useRouter();
+  const params = useParams();
+  const logger = useLogger();
+  const eventId = params.id as string;
+
+  const [event, setEvent] = useState<EventResponse | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (eventId) {
+      loadEvent();
+    }
+  }, [eventId]);
+
+  const loadEvent = async () => {
+    try {
+      setIsLoading(true);
+      logger.debug(LOGGER_COMPONENT_NAME, 'Loading event details', { eventId });
+      
+      const response = await eventAPI.getMyEventById(eventId);
+      
+      if (response.success) {
+        setEvent(response.data);
+        logger.debug(LOGGER_COMPONENT_NAME, 'Event loaded successfully');
+      } else {
+        throw new Error('Failed to load event');
+      }
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : 'Failed to load event';
+      setError(errorMessage);
+      logger.error(LOGGER_COMPONENT_NAME, 'Failed to load event', err instanceof Error ? err : new Error(String(err)));
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+      </div>
+    );
+  }
+
+  if (error || !event) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <Card className="max-w-md">
+          <CardContent className="text-center py-8">
+            <AlertCircle className="h-12 w-12 text-red-500 mx-auto mb-4" />
+            <h3 className="text-lg font-semibold mb-2">Error Loading Event</h3>
+            <p className="text-slate-600 mb-4">{error}</p>
+            <Button onClick={() => router.push('/dashboard/speaker/events')}>
+              Back to Events
+            </Button>
+          </CardContent>
+        </Card>
+      </div>
+    );
+  }
+
+  const canEdit = event.status === EventStatus.DRAFT || event.status === EventStatus.REJECTED;
+  const canSubmit = event.status === EventStatus.DRAFT || event.status === EventStatus.REJECTED;
+
   return (
-    <EventDetailsPage 
-      userRole="SPEAKER"
-      showJoinInterface={true}
-      showAdminControls={false}
-      showSpeakerControls={true}
-    />
+    <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-indigo-50 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900">
+      <header className="bg-white/80 dark:bg-slate-800/80 backdrop-blur-sm border-b border-slate-200 dark:border-slate-700">
+        <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+          <div className="flex justify-between items-center h-16">
+            <div className="flex items-center space-x-4">
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={() => router.push('/dashboard/speaker/events')}
+              >
+                <ArrowLeft className="h-4 w-4 mr-2" />
+                Back to Events
+              </Button>
+              <h1 className="text-2xl font-bold bg-gradient-to-r from-blue-600 to-indigo-600 bg-clip-text text-transparent">
+                Event Details
+              </h1>
+            </div>
+          </div>
+        </div>
+      </header>
+
+      <main className="max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
+        <Card>
+          <CardHeader>
+            <div className="flex items-start justify-between">
+              <div>
+                <CardTitle className="text-2xl mb-2">{event.name}</CardTitle>
+                <Badge className={statusColors[event.status]}>
+                  {event.status.replace('_', ' ')}
+                </Badge>
+              </div>
+              <div className="flex gap-2">
+                {canEdit && (
+                  <Button
+                    onClick={() => router.push(`/dashboard/speaker/events/edit/${event.id}`)}
+                    variant="outline"
+                  >
+                    <Edit className="h-4 w-4 mr-2" />
+                    Edit
+                  </Button>
+                )}
+                {canSubmit && (
+                  <Button
+                    onClick={async () => {
+                      try {
+                        await eventAPI.submitEvent(event.id);
+                        router.push('/dashboard/speaker/events');
+                      } catch (error) {
+                        logger.error(LOGGER_COMPONENT_NAME, 'Failed to submit event', error as Error);
+                      }
+                    }}
+                  >
+                    <Send className="h-4 w-4 mr-2" />
+                    Submit for Approval
+                  </Button>
+                )}
+              </div>
+            </div>
+          </CardHeader>
+          <CardContent className="space-y-6">
+            {event.rejectionReason && (
+              <div className="p-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md">
+                <h4 className="font-semibold text-red-900 dark:text-red-100 mb-2">Rejection Reason:</h4>
+                <p className="text-red-800 dark:text-red-200">{event.rejectionReason}</p>
+              </div>
+            )}
+
+            <div>
+              <h3 className="font-semibold text-lg mb-3">Description</h3>
+              <p className="text-slate-600 dark:text-slate-400">{event.description}</p>
+            </div>
+
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+              <div>
+                <h4 className="font-semibold mb-2">Category</h4>
+                <p className="text-slate-600">{event.category}</p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <MapPin className="h-4 w-4 mr-2" />
+                  Venue
+                </h4>
+                <p className="text-slate-600">{event.venue.name}</p>
+                <p className="text-sm text-slate-500">{event.venue.address}</p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <Clock className="h-4 w-4 mr-2" />
+                  Event Dates
+                </h4>
+                <p className="text-slate-600">
+                  {new Date(event.bookingStartDate).toLocaleString()} - <br />
+                  {new Date(event.bookingEndDate).toLocaleString()}
+                </p>
+              </div>
+
+              <div>
+                <h4 className="font-semibold mb-2 flex items-center">
+                  <Users className="h-4 w-4 mr-2" />
+                  Capacity
+                </h4>
+                <p className="text-slate-600">{event.venue.capacity} attendees</p>
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+      </main>
+    </div>
   );
-};
+}
+
+export default withSpeakerAuth(SpeakerEventDetailsPage);
 
-export default withSpeakerAuth(SpeakerEventDetailsPage);
\ No newline at end of file
diff --git a/ems-client/app/dashboard/speaker/events/page.tsx b/ems-client/app/dashboard/speaker/events/page.tsx
index 57fc36c..0f35b23 100644
--- a/ems-client/app/dashboard/speaker/events/page.tsx
+++ b/ems-client/app/dashboard/speaker/events/page.tsx
@@ -22,20 +22,15 @@ import {
     Play,
     Pause,
     Archive,
-    AlertCircle,
-    Mail,
-    CheckCircle,
-    XCircle
+    AlertCircle
 } from "lucide-react";
 import {useRouter} from "next/navigation";
 import {useEffect, useState} from "react";
 import {useLogger} from "@/lib/logger/LoggerProvider";
-import { EventJoinInterface } from '@/components/attendance/EventJoinInterface';
 
 import {eventAPI} from "@/lib/api/event.api";
 import {EventResponse, EventStatus, EventFilters} from "@/lib/api/types/event.types";
 import {withSpeakerAuth} from "@/components/hoc/withAuth";
-import {speakerApiClient, SpeakerInvitation} from "@/lib/api/speaker.api";
 
 const statusColors = {
   [EventStatus.DRAFT]: 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200',
@@ -53,13 +48,11 @@ function SpeakerEventManagementPage() {
     const router = useRouter();
     const logger = useLogger();
     const [searchTerm, setSearchTerm] = useState('');
+    const [selectedStatus, setSelectedStatus] = useState<EventStatus | 'ALL'>('ALL');
     const [selectedTimeframe, setSelectedTimeframe] = useState('ALL');
-    const [activeTab, setActiveTab] = useState<'my-events' | 'invited-events'>('my-events');
 
     // API state management
     const [events, setEvents] = useState<EventResponse[]>([]);
-    const [invitations, setInvitations] = useState<SpeakerInvitation[]>([]);
-    const [invitedEvents, setInvitedEvents] = useState<Map<string, EventResponse>>(new Map());
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<string | null>(null);
     const [actionLoading, setActionLoading] = useState<string | null>(null);
@@ -70,8 +63,10 @@ function SpeakerEventManagementPage() {
         totalPages: 0
     });
 
-    // Load events from API - Show all published events in "All Events" tab
+    // Load events from API
     const loadEvents = async () => {
+        if (!user?.id) return;
+
         try {
             setLoading(true);
             setError(null);
@@ -79,13 +74,12 @@ function SpeakerEventManagementPage() {
             const filters: EventFilters = {
                 page: pagination.page,
                 limit: pagination.limit,
-                // Note: Published events API only returns PUBLISHED events, so status filter is not needed
+                status: selectedStatus !== 'ALL' ? selectedStatus : undefined
             };
 
-            logger.debug(LOGGER_COMPONENT_NAME, 'Loading all published events with filters', filters);
+            logger.debug(LOGGER_COMPONENT_NAME, 'Loading events with filters', filters);
 
-            // Use getPublishedEvents to show ALL published events, not just speaker's own events
-            const response = await eventAPI.getPublishedEvents(filters);
+            const response = await eventAPI.getMyEvents(user.id, filters);
 
             if (response.success) {
                 setEvents(response.data.events);
@@ -94,7 +88,7 @@ function SpeakerEventManagementPage() {
                     total: response.data.total,
                     totalPages: response.data.totalPages
                 }));
-                logger.debug(LOGGER_COMPONENT_NAME, 'All events loaded successfully', { count: response.data.events.length });
+                logger.debug(LOGGER_COMPONENT_NAME, 'Events loaded successfully', { count: response.data.events.length });
             } else {
                 throw new Error('Failed to load events');
             }
@@ -107,44 +101,9 @@ function SpeakerEventManagementPage() {
         }
     };
 
-    // Load invitations and their events
-    const loadInvitations = async () => {
-        if (!user?.id) return;
-
-        try {
-            setLoading(true);
-            const speakerProfile = await speakerApiClient.getSpeakerProfile(user.id);
-            const allInvitations = await speakerApiClient.getSpeakerInvitations(speakerProfile.id);
-            setInvitations(allInvitations);
-
-            // Load event details for each invitation
-            const eventMap = new Map<string, EventResponse>();
-            for (const invitation of allInvitations) {
-                try {
-                    const eventResponse = await eventAPI.getEventById(invitation.eventId);
-                    eventMap.set(invitation.eventId, eventResponse.data);
-                } catch (err) {
-                    logger.warn(LOGGER_COMPONENT_NAME, 'Failed to load event for invitation', { 
-                        invitationId: invitation.id, 
-                        eventId: invitation.eventId 
-                    });
-                }
-            }
-            setInvitedEvents(eventMap);
-        } catch (err) {
-            logger.error(LOGGER_COMPONENT_NAME, 'Failed to load invitations', err instanceof Error ? err : new Error(String(err)));
-        } finally {
-            setLoading(false);
-        }
-    };
-
     useEffect(() => {
-        if (activeTab === 'my-events') {
-            loadEvents();
-        } else {
-            loadInvitations();
-        }
-    }, [pagination.page, activeTab]);
+        loadEvents();
+    }, [selectedStatus, pagination.page]);
 
     // Filter events based on search and timeframe (status filtering is done server-side)
     const filteredEvents = events.filter(event => {
@@ -202,13 +161,13 @@ function SpeakerEventManagementPage() {
         return Math.round((registered / capacity) * 100);
     };
 
-    // Calculate stats from real data (all events shown are published)
+    // Calculate stats from real data
     const stats = {
         total: events.length,
-        published: events.length, // All events in this tab are published
-        draft: 0, // Draft events are not shown in "All Events" tab
-        pending: 0, // Pending events are not shown in "All Events" tab
-        rejected: 0 // Rejected events are not shown in "All Events" tab
+        published: events.filter(e => e.status === EventStatus.PUBLISHED).length,
+        draft: events.filter(e => e.status === EventStatus.DRAFT).length,
+        pending: events.filter(e => e.status === EventStatus.PENDING_APPROVAL).length,
+        rejected: events.filter(e => e.status === EventStatus.REJECTED).length
     };
 
     if (loading) {
@@ -302,39 +261,10 @@ function SpeakerEventManagementPage() {
                         Event Management
                     </h2>
                     <p className="text-slate-600 dark:text-slate-400">
-                        Browse all published events, manage your own events, and join invited events.
+                        Create, manage, and monitor all events across the platform.
                     </p>
                 </div>
 
-                {/* Tabs */}
-                <div className="mb-6 flex space-x-4 border-b border-slate-200 dark:border-slate-700">
-                    <button
-                        onClick={() => setActiveTab('my-events')}
-                        className={`px-4 py-2 font-medium transition-colors ${
-                            activeTab === 'my-events'
-                                ? 'border-b-2 border-blue-600 text-blue-600 dark:text-blue-400'
-                                : 'text-slate-600 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'
-                        }`}
-                    >
-                        All Events
-                    </button>
-                    <button
-                        onClick={() => setActiveTab('invited-events')}
-                        className={`px-4 py-2 font-medium transition-colors ${
-                            activeTab === 'invited-events'
-                                ? 'border-b-2 border-blue-600 text-blue-600 dark:text-blue-400'
-                                : 'text-slate-600 dark:text-slate-400 hover:text-slate-900 dark:hover:text-white'
-                        }`}
-                    >
-                        Invited Events
-                        {invitations.filter(inv => inv.status === 'PENDING').length > 0 && (
-                            <Badge className="ml-2 bg-yellow-500 text-white">
-                                {invitations.filter(inv => inv.status === 'PENDING').length}
-                            </Badge>
-                        )}
-                    </button>
-                </div>
-
                 {/* Stats Cards */}
                 <div className="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8">
                     <Card className="border-slate-200 dark:border-slate-700">
@@ -394,7 +324,7 @@ function SpeakerEventManagementPage() {
                         </CardTitle>
                     </CardHeader>
                     <CardContent>
-                        <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+                        <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
                             <div className="relative">
                                 <Search className="absolute left-3 top-3 h-4 w-4 text-slate-400"/>
                                 <Input
@@ -405,6 +335,20 @@ function SpeakerEventManagementPage() {
                                 />
                             </div>
 
+                            <select
+                                value={selectedStatus}
+                                onChange={(e) => setSelectedStatus(e.target.value as EventStatus | 'ALL')}
+                                className="px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-md bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
+                            >
+                                <option value="ALL">All Status</option>
+                                <option value={EventStatus.DRAFT}>Draft</option>
+                                <option value={EventStatus.PENDING_APPROVAL}>Pending Approval</option>
+                                <option value={EventStatus.PUBLISHED}>Published</option>
+                                <option value={EventStatus.REJECTED}>Rejected</option>
+                                <option value={EventStatus.CANCELLED}>Cancelled</option>
+                                <option value={EventStatus.COMPLETED}>Completed</option>
+                            </select>
+
                             <select
                                 value={selectedTimeframe}
                                 onChange={(e) => setSelectedTimeframe(e.target.value)}
@@ -415,12 +359,20 @@ function SpeakerEventManagementPage() {
                                 <option value="ONGOING">Ongoing</option>
                                 <option value="PAST">Past</option>
                             </select>
+
+                            <Button
+                                variant="outline"
+                                onClick={() => router.push('/dashboard/admin/events/pending')}
+                                className="border-orange-200 text-orange-600 hover:bg-orange-50"
+                            >
+                                <Filter className="h-4 w-4 mr-2"/>
+                                Pending Reviews
+                            </Button>
                         </div>
                     </CardContent>
                 </Card>
 
-                {/* Events Grid - My Events */}
-                {activeTab === 'my-events' && (
+                {/* Events Grid */}
                 <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-6">
                     {filteredEvents.map((event) => (
                         <Card key={event.id}
@@ -432,14 +384,6 @@ function SpeakerEventManagementPage() {
                                             className="text-lg font-semibold text-slate-900 dark:text-white mb-2">
                                             {event.name}
                                         </CardTitle>
-                                        <Button
-                                            variant="ghost"
-                                            size="sm"
-                                            className="mb-2 p-0 h-auto text-blue-600 hover:text-blue-800"
-                                            onClick={() => router.push(`/dashboard/speaker/events/${event.id}`)}
-                                        >
-                                            View Details →
-                                        </Button>
                                         <Badge className={statusColors[event.status]}>
                                             {event.status.replace('_', ' ')}
                                         </Badge>
@@ -494,49 +438,43 @@ function SpeakerEventManagementPage() {
                                         onClick={() => router.push(`/dashboard/speaker/events/${event.id}`)}
                                     >
                                         <Eye className="h-4 w-4 mr-1"/>
-                                        View Details
+                                        View
                                     </Button>
 
-                                    {/* Only show edit/delete/submit actions if speaker is the event creator */}
-                                    {event.speakerId === user?.id && (
-                                        <>
-                                            <Button
-                                                size="sm"
-                                                variant="outline"
-                                                onClick={() => router.push(`/dashboard/speaker/events/edit/${event.id}`)}
-                                                disabled={event.status !== EventStatus.DRAFT && event.status !== EventStatus.REJECTED}
-                                            >
-                                                <Edit className="h-4 w-4 mr-1"/>
-                                                Edit
-                                            </Button>
-
-                                            {(event.status === EventStatus.DRAFT || event.status === EventStatus.REJECTED) && (
-                                                <Button
-                                                    size="sm"
-                                                    variant="default"
-                                                    onClick={() => handleEventAction(event.id, 'submit')}
-                                                    disabled={actionLoading === event.id}
-                                                >
-                                                    <Play className="h-4 w-4 mr-1"/>
-                                                    Submit for Approval
-                                                </Button>
-                                            )}
-
-                                            {event.status === EventStatus.DRAFT && (
-                                                <Button
-                                                    size="sm"
-                                                    variant="destructive"
-                                                    onClick={() => handleEventAction(event.id, 'delete')}
-                                                    disabled={actionLoading === event.id}
-                                                >
-                                                    <Trash2 className="h-4 w-4 mr-1"/>
-                                                    Delete
-                                                </Button>
-                                            )}
-                                        </>
+                                    <Button
+                                        size="sm"
+                                        variant="outline"
+                                        onClick={() => router.push(`/dashboard/speaker/events/edit/${event.id}`)}
+                                        disabled={event.status !== EventStatus.DRAFT && event.status !== EventStatus.REJECTED}
+                                    >
+                                        <Edit className="h-4 w-4 mr-1"/>
+                                        Edit
+                                    </Button>
+
+                                    {(event.status === EventStatus.DRAFT || event.status === EventStatus.REJECTED) && (
+                                        <Button
+                                            size="sm"
+                                            variant="default"
+                                            onClick={() => handleEventAction(event.id, 'submit')}
+                                            disabled={actionLoading === event.id}
+                                        >
+                                            <Play className="h-4 w-4 mr-1"/>
+                                            Submit for Approval
+                                        </Button>
                                     )}
-                                </div>
 
+                                    {event.status === EventStatus.DRAFT && (
+                                        <Button
+                                            size="sm"
+                                            variant="destructive"
+                                            onClick={() => handleEventAction(event.id, 'delete')}
+                                            disabled={actionLoading === event.id}
+                                        >
+                                            <Trash2 className="h-4 w-4 mr-1"/>
+                                            Delete
+                                        </Button>
+                                    )}
+                                </div>
                             </CardContent>
                         </Card>
                     ))}
@@ -564,127 +502,6 @@ function SpeakerEventManagementPage() {
                         </div>
                     )}
                 </div>
-                )}
-
-                {/* Invited Events Grid */}
-                {activeTab === 'invited-events' && (
-                <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-6">
-                    {invitations.map((invitation) => {
-                        const event = invitedEvents.get(invitation.eventId);
-                        if (!event) return null;
-
-                        const getStatusIcon = () => {
-                            switch (invitation.status) {
-                                case 'PENDING':
-                                    return <Mail className="h-5 w-5 text-yellow-500" />;
-                                case 'ACCEPTED':
-                                    return <CheckCircle className="h-5 w-5 text-green-500" />;
-                                case 'DECLINED':
-                                    return <XCircle className="h-5 w-5 text-red-500" />;
-                                default:
-                                    return <AlertCircle className="h-5 w-5 text-gray-500" />;
-                            }
-                        };
-
-                        return (
-                            <Card key={invitation.id} className="border-slate-200 dark:border-slate-700 hover:shadow-lg transition-shadow">
-                                <CardHeader>
-                                    <div className="flex items-start justify-between">
-                                        <div className="flex-1">
-                                            <div className="flex items-center gap-2 mb-2">
-                                                {getStatusIcon()}
-                                                <CardTitle className="text-lg font-semibold text-slate-900 dark:text-white">
-                                                    {event.name}
-                                                </CardTitle>
-                                            </div>
-                                            <Badge className={statusColors[event.status]}>
-                                                {event.status.replace('_', ' ')}
-                                            </Badge>
-                                            <Badge className={`ml-2 ${invitation.status === 'PENDING' ? 'bg-yellow-500' : invitation.status === 'ACCEPTED' ? 'bg-green-500' : 'bg-red-500'} text-white`}>
-                                                {invitation.status}
-                                            </Badge>
-                                        </div>
-                                    </div>
-                                </CardHeader>
-                                <CardContent>
-                                    <p className="text-slate-600 dark:text-slate-400 text-sm mb-4 line-clamp-2">
-                                        {event.description}
-                                    </p>
-
-                                    <div className="space-y-3 mb-4">
-                                        <div className="flex items-center text-sm text-slate-600 dark:text-slate-400">
-                                            <MapPin className="h-4 w-4 mr-2"/>
-                                            <span>{event.venue.name}</span>
-                                        </div>
-                                        <div className="flex items-center text-sm text-slate-600 dark:text-slate-400">
-                                            <Clock className="h-4 w-4 mr-2"/>
-                                            <span>
-                                                {new Date(event.bookingStartDate).toLocaleDateString()} - {new Date(event.bookingEndDate).toLocaleDateString()}
-                                            </span>
-                                        </div>
-                                    </div>
-
-                                    <div className="flex flex-wrap gap-2">
-                                        <Button 
-                                            size="sm" 
-                                            variant="outline"
-                                            onClick={() => router.push(`/dashboard/speaker/events/${event.id}`)}
-                                        >
-                                            <Eye className="h-4 w-4 mr-1"/>
-                                            View Details
-                                        </Button>
-
-                                        {invitation.status === 'ACCEPTED' && event.status === EventStatus.PUBLISHED && (
-                                            <Button
-                                                size="sm"
-                                                variant="default"
-                                                onClick={() => router.push(`/dashboard/speaker/events/${event.id}/live`)}
-                                                className="bg-gradient-to-r from-blue-600 to-indigo-600 hover:from-blue-700 hover:to-indigo-700"
-                                            >
-                                                <Play className="h-4 w-4 mr-1"/>
-                                                Join Event
-                                            </Button>
-                                        )}
-                                    </div>
-
-                                    {invitation.status === 'ACCEPTED' && event.status === EventStatus.PUBLISHED && (
-                                        <div className="mt-4 pt-4 border-t">
-                                            <EventJoinInterface
-                                                eventId={event.id}
-                                                eventTitle={event.name}
-                                                eventStartTime={event.bookingStartDate}
-                                                eventEndTime={event.bookingEndDate}
-                                                eventVenue={event.venue.name}
-                                                eventCategory={event.category}
-                                                eventStatus={event.status}
-                                                eventDescription={event.description}
-                                                userRole={user?.role || 'SPEAKER'}
-                                                speakerId={user?.id}
-                                            />
-                                        </div>
-                                    )}
-                                </CardContent>
-                            </Card>
-                        );
-                    })}
-
-                    {invitations.length === 0 && !loading && (
-                        <div className="col-span-full">
-                            <Card className="border-slate-200 dark:border-slate-700">
-                                <CardContent className="text-center py-12">
-                                    <Mail className="h-12 w-12 text-slate-400 mx-auto mb-4"/>
-                                    <h3 className="text-lg font-semibold text-slate-900 dark:text-white mb-2">
-                                        No Invitations
-                                    </h3>
-                                    <p className="text-slate-600 dark:text-slate-400 mb-4">
-                                        You haven't received any event invitations yet.
-                                    </p>
-                                </CardContent>
-                            </Card>
-                        </div>
-                    )}
-                </div>
-                )}
 
                 {/* Pagination */}
                 {pagination.totalPages > 1 && (
diff --git a/ems-client/app/dashboard/speaker/page.tsx b/ems-client/app/dashboard/speaker/page.tsx
index 7feac42..a7c2935 100644
--- a/ems-client/app/dashboard/speaker/page.tsx
+++ b/ems-client/app/dashboard/speaker/page.tsx
@@ -24,7 +24,7 @@ import {
   Download,
   Presentation
 } from "lucide-react";
-import { useRouter, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import { useEffect } from "react";
 import {useLogger} from "@/lib/logger/LoggerProvider";
 import {withSpeakerAuth} from "@/components/hoc/withAuth";
@@ -44,7 +44,6 @@ const LOGGER_COMPONENT_NAME = 'SpeakerDashboard';
 function SpeakerDashboard() {
   const { user, logout } = useAuth();
   const router = useRouter();
-  const searchParams = useSearchParams();
   const logger = useLogger();
   const [activeSection, setActiveSection] = useState<DashboardSection>('overview');
   
@@ -66,14 +65,6 @@ function SpeakerDashboard() {
     updateSpeakerProfile,
   } = useSpeakerData();
 
-  // Set active section from URL query params
-  useEffect(() => {
-    const section = searchParams.get('section') as DashboardSection | null;
-    if (section && ['overview', 'profile', 'materials', 'invitations', 'messages'].includes(section)) {
-      setActiveSection(section);
-    }
-  }, [searchParams]);
-
   useEffect(() => {
     logger.debug(LOGGER_COMPONENT_NAME, 'Speaker dashboard loaded', { userRole: user?.role });
   }, [user, logger]);
@@ -342,18 +333,9 @@ function SpeakerDashboard() {
                   </CardDescription>
                 </CardHeader>
                 <CardContent>
-                  <div className="grid grid-cols-2 md:grid-cols-3 gap-4">
+                  <div className="grid grid-cols-2 gap-4">
                     <Button
                       className="h-20 flex flex-col items-center justify-center space-y-2 bg-gradient-to-r from-purple-600 to-indigo-600 hover:from-purple-700 hover:to-indigo-700"
-                      onClick={() => router.push('/dashboard/speaker/events')}
-                    >
-                      <Calendar className="h-5 w-5" />
-                      <span className="text-sm">Manage Events</span>
-                    </Button>
-
-                    <Button
-                      variant="outline"
-                      className="h-20 flex flex-col items-center justify-center space-y-2 border-slate-200 dark:border-slate-700"
                       onClick={() => setActiveSection('materials')}
                     >
                       <Upload className="h-5 w-5" />
diff --git a/ems-client/eslint.config.mjs b/ems-client/eslint.config.mjs
index bf205c7..db6e9ff 100644
--- a/ems-client/eslint.config.mjs
+++ b/ems-client/eslint.config.mjs
@@ -19,14 +19,10 @@ const eslintConfig = [
             "build/**",
             "next-env.d.ts",
         ],
+        extends: ["next/core-web-vitals", "next/typescript"],
         rules: {
             "@typescript-eslint/no-explicit-any": "off",
-            "@typescript-eslint/no-unused-vars": "off",
-            "@typescript-eslint/no-empty-object-type": "off",
-            "react/no-unescaped-entities": "off",
-            "react-hooks/exhaustive-deps": "off",
-            "@next/next/no-img-element": "off",
-            "@next/next/no-page-custom-font": "off"
+            "@typescript-eslint/no-unused-vars": "off"
         }
     },
 ];
diff --git a/ems-client/lib/api/base-api.client.ts b/ems-client/lib/api/base-api.client.ts
index aa5a5d8..4c0bb00 100644
--- a/ems-client/lib/api/base-api.client.ts
+++ b/ems-client/lib/api/base-api.client.ts
@@ -13,11 +13,7 @@ export abstract class BaseApiClient {
         endpoint: string,
         options: RequestInit = {}
     ): Promise<T> {
-        // If endpoint is already an absolute URL, use it directly
-        // Otherwise, prepend the base URL
-        const url = endpoint.startsWith('http://') || endpoint.startsWith('https://') 
-            ? endpoint 
-            : `${this.baseURL}${endpoint}`;
+        const url = `${this.baseURL}${endpoint}`;
         const method = options.method || 'GET';
 
         const defaultHeaders: Record<string, string> = {
@@ -81,93 +77,27 @@ export abstract class BaseApiClient {
     // Token management (for authenticated requests)
     public getToken(): string | null {
         if (typeof window === 'undefined') return null;
-        
-        // Try localStorage first
-        let token = localStorage.getItem('auth_token');
-        
-        // If not found in localStorage, try sessionStorage (fallback)
-        if (!token) {
-            token = sessionStorage.getItem('auth_token');
-        }
-        
-        logger.debug(this.LOGGER_COMPONENT_NAME, 'Token retrieved from storage', { 
-            hasToken: !!token,
-            source: token ? (localStorage.getItem('auth_token') ? 'localStorage' : 'sessionStorage') : 'none'
-        });
+        const token = localStorage.getItem('auth_token');
+        logger.debug(this.LOGGER_COMPONENT_NAME, 'Token retrieved from storage', { hasToken: !!token });
         return token;
     }
 
     // Public token management methods (can be overridden by subclasses)
     public setToken(token: string): void {
         if (typeof window === 'undefined') return;
-        
-        try {
-            localStorage.setItem('auth_token', token);
-            logger.info(this.LOGGER_COMPONENT_NAME, 'Token stored in localStorage');
-        } catch (error) {
-            // Handle localStorage quota exceeded
-            if (error instanceof DOMException && error.name === 'QuotaExceededError') {
-                logger.warn(this.LOGGER_COMPONENT_NAME, 'localStorage quota exceeded, attempting cleanup');
-                
-                // Try to clear old data and retry
-                this.cleanupLocalStorage();
-                
-                try {
-                    localStorage.setItem('auth_token', token);
-                    logger.info(this.LOGGER_COMPONENT_NAME, 'Token stored after cleanup');
-                } catch (retryError) {
-                    logger.error(this.LOGGER_COMPONENT_NAME, 'Failed to store token even after cleanup', retryError as Error);
-                    // Fallback: use sessionStorage
-                    sessionStorage.setItem('auth_token', token);
-                    logger.info(this.LOGGER_COMPONENT_NAME, 'Token stored in sessionStorage as fallback');
-                }
-            } else {
-                logger.error(this.LOGGER_COMPONENT_NAME, 'Failed to store token', error as Error);
-                throw error;
-            }
-        }
+        localStorage.setItem('auth_token', token);
+        logger.info(this.LOGGER_COMPONENT_NAME, 'Token stored in localStorage');
     }
 
     public removeToken(): void {
         if (typeof window === 'undefined') return;
         localStorage.removeItem('auth_token');
-        sessionStorage.removeItem('auth_token'); // Also remove from sessionStorage fallback
-        logger.info(this.LOGGER_COMPONENT_NAME, 'Token removed from storage');
+        logger.info(this.LOGGER_COMPONENT_NAME, 'Token removed from localStorage');
     }
 
     public isAuthenticated(): boolean {
-        const hasToken = !!(this.getToken());
+        const hasToken = !!this.getToken();
         logger.debug(this.LOGGER_COMPONENT_NAME, 'Authentication check', { isAuthenticated: hasToken });
         return hasToken;
     }
-
-    // Helper method to cleanup localStorage
-    private cleanupLocalStorage(): void {
-        try {
-            // Remove old/expired tokens and other unnecessary data
-            const keysToRemove: string[] = [];
-            
-            for (let i = 0; i < localStorage.length; i++) {
-                const key = localStorage.key(i);
-                if (key && (
-                    key.startsWith('auth_token_') || // Old token versions
-                    key.startsWith('temp_') || // Temporary data
-                    key.startsWith('cache_') || // Cache data
-                    key.includes('_backup') // Backup data
-                )) {
-                    keysToRemove.push(key);
-                }
-            }
-            
-            // Remove identified keys
-            keysToRemove.forEach(key => {
-                localStorage.removeItem(key);
-                logger.debug(this.LOGGER_COMPONENT_NAME, `Removed old data: ${key}`);
-            });
-            
-            logger.info(this.LOGGER_COMPONENT_NAME, `Cleaned up ${keysToRemove.length} old items from localStorage`);
-        } catch (error) {
-            logger.error(this.LOGGER_COMPONENT_NAME, 'Failed to cleanup localStorage', error as Error);
-        }
-    }
 }
diff --git a/ems-client/lib/api/booking.api.ts b/ems-client/lib/api/booking.api.ts
index b23b5b2..ff48ccf 100644
--- a/ems-client/lib/api/booking.api.ts
+++ b/ems-client/lib/api/booking.api.ts
@@ -1,7 +1,7 @@
 import { BaseApiClient } from './base-api.client';
-import { 
-  CreateBookingRequest, 
-  BookingResponse, 
+import {
+  CreateBookingRequest,
+  BookingResponse,
   BookingListResponse,
   TicketResponse,
   TicketListResponse
@@ -50,7 +50,7 @@ class BookingApiClient extends BaseApiClient {
 
   // Public methods for admin operations
   async getEventAttendance(eventId: string): Promise<any> {
-    return this.request(`/admin/tickets/events/${eventId}/attendance`);
+    return this.request(`/admin/events/${eventId}/attendance`);
   }
 
   async getEventTickets(eventId: string, filters?: { page?: number; limit?: number; status?: string }): Promise<any> {
@@ -58,17 +58,17 @@ class BookingApiClient extends BaseApiClient {
     if (filters?.page) params.append('page', filters.page.toString());
     if (filters?.limit) params.append('limit', filters.limit.toString());
     if (filters?.status) params.append('status', filters.status);
-    
-    const endpoint = `/admin/tickets/events/${eventId}/tickets?${params.toString()}`;
+
+    const endpoint = `/admin/events/${eventId}/tickets?${params.toString()}`;
     return this.request(endpoint);
   }
 
   async getEventTicketStats(eventId: string): Promise<any> {
-    return this.request(`/admin/tickets/events/${eventId}/stats`);
+    return this.request(`/admin/events/${eventId}/stats`);
   }
 
   async revokeTicket(ticketId: string): Promise<{ success: boolean; message: string }> {
-    return this.request<{ success: boolean; message: string }>(`/admin/tickets/${ticketId}/revoke`, {
+    return this.request<{ success: boolean; message: string }>(`/admin/${ticketId}/revoke`, {
       method: 'PUT'
     });
   }
@@ -120,7 +120,7 @@ export const adminTicketAPI = {
   /**
    * Get all tickets for an event
    */
-  getEventTickets: (eventId: string, filters?: { page?: number; limit?: number; status?: string }) => 
+  getEventTickets: (eventId: string, filters?: { page?: number; limit?: number; status?: string }) =>
     bookingApiClient.getEventTickets(eventId, filters),
 
   /**
diff --git a/ems-client/lib/api/event.api.ts b/ems-client/lib/api/event.api.ts
index 8b23c99..0a867cd 100644
--- a/ems-client/lib/api/event.api.ts
+++ b/ems-client/lib/api/event.api.ts
@@ -141,7 +141,7 @@ class EventApiClient extends BaseApiClient {
   }
 
   async getEventById(eventId: string): Promise<{ success: boolean; data: EventResponse }> {
-    return this.request<{ success: boolean; data: EventResponse }>(`/events/${eventId}`);
+    return this.request<{ success: boolean; data: EventResponse }>(`/admin/admin/events/${eventId}`);
   }
 
   async approveEvent(eventId: string): Promise<{ success: boolean; data: EventResponse }> {
diff --git a/ems-client/lib/api/speaker.api.ts b/ems-client/lib/api/speaker.api.ts
index 4c02dd5..5faa5ef 100644
--- a/ems-client/lib/api/speaker.api.ts
+++ b/ems-client/lib/api/speaker.api.ts
@@ -181,11 +181,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -198,11 +198,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -216,11 +216,11 @@ class SpeakerApiClient extends BaseApiClient {
       },
       body: JSON.stringify(response),
     });
-    
+
     if (!fetchResponse.ok) {
       throw new Error(`HTTP error! status: ${fetchResponse.status}`);
     }
-    
+
     const result = await fetchResponse.json();
     return result.data;
   }
@@ -239,11 +239,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || { total: 0, pending: 0, accepted: 0, declined: 0, expired: 0 };
   }
@@ -257,11 +257,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -274,11 +274,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -291,11 +291,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -308,11 +308,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || null;
   }
@@ -326,11 +326,11 @@ class SpeakerApiClient extends BaseApiClient {
       },
       body: JSON.stringify(message),
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data;
   }
@@ -343,11 +343,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data;
   }
@@ -360,11 +360,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || { count: 0 };
   }
@@ -378,11 +378,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || [];
   }
@@ -450,11 +450,11 @@ class SpeakerApiClient extends BaseApiClient {
         'Content-Type': 'application/json',
       },
     });
-    
+
     if (!response.ok) {
       throw new Error(`HTTP error! status: ${response.status}`);
     }
-    
+
     const result = await response.json();
     return result.data || { totalMaterials: 0, totalSize: 0, materialsByType: {} };
   }
diff --git a/ems-client/lib/logger.ts b/ems-client/lib/logger.ts
index bbd5610..72e80c5 100644
--- a/ems-client/lib/logger.ts
+++ b/ems-client/lib/logger.ts
@@ -53,82 +53,20 @@ class Logger {
                 this.logBuffer.shift();
             }
 
-            // Client-side (browser) - store in localStorage with size limits
+            // Client-side (browser) - store in localStorage
             if (typeof window !== 'undefined') {
                 const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
                 const logKey = `ems-logs-${timestamp.split('T')[0]}`;
-                const maxLogSize = 2 * 1024 * 1024; // 2MB max per day
-                const maxLogEntries = 500; // Max log entries per day
 
                 // Get existing logs for today
-                let existingLogs = localStorage.getItem(logKey) || '';
-                
-                // Clean up old logs if needed (keep last 7 days max)
-                this.cleanupOldLogs(7);
-
-                // Check if we need to truncate existing logs
-                if (existingLogs.length > maxLogSize) {
-                    // Keep only the most recent entries
-                    const logLines = existingLogs.split('\n').filter(line => line.trim());
-                    const recentLogs = logLines.slice(-maxLogEntries).join('\n');
-                    existingLogs = recentLogs;
-                }
-
+                const existingLogs = localStorage.getItem(logKey) || '';
                 const updatedLogs = existingLogs + logEntry + '\n';
 
-                // Truncate if exceeds max size
-                if (updatedLogs.length > maxLogSize) {
-                    const logLines = updatedLogs.split('\n').filter(line => line.trim());
-                    const recentLogs = logLines.slice(-maxLogEntries).join('\n');
-                    localStorage.setItem(logKey, recentLogs);
-                } else {
-                    localStorage.setItem(logKey, updatedLogs);
-                }
+                // Store in localStorage (limited to ~5-10MB per domain)
+                localStorage.setItem(logKey, updatedLogs);
             }
         } catch (error) {
-            // If quota exceeded, try to clean up and retry once
-            if (error instanceof DOMException && error.name === 'QuotaExceededError') {
-                try {
-                    this.cleanupOldLogs(1); // Keep only today's logs
-                    // Retry with truncated logs
-                    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-                    const logKey = `ems-logs-${timestamp.split('T')[0]}`;
-                    const existingLogs = localStorage.getItem(logKey) || '';
-                    const logLines = existingLogs.split('\n').filter(line => line.trim());
-                    const recentLogs = logLines.slice(-200).join('\n') + '\n' + logEntry + '\n';
-                    localStorage.setItem(logKey, recentLogs);
-                } catch (retryError) {
-                    // If still fails, just log to console and skip localStorage
-                    console.warn('localStorage quota exceeded, skipping log storage');
-                }
-            } else {
-                console.error('Failed to write log to storage:', error);
-            }
-        }
-    }
-
-    private cleanupOldLogs(daysToKeep: number = 7): void {
-        if (typeof window === 'undefined') return;
-
-        try {
-            const today = new Date();
-            const keys = Object.keys(localStorage);
-            
-            keys.forEach(key => {
-                if (key.startsWith('ems-logs-')) {
-                    const dateMatch = key.match(/ems-logs-(\d{4}-\d{2}-\d{2})/);
-                    if (dateMatch) {
-                        const logDate = new Date(dateMatch[1]);
-                        const daysDiff = Math.floor((today.getTime() - logDate.getTime()) / (1000 * 60 * 60 * 24));
-                        
-                        if (daysDiff > daysToKeep) {
-                            localStorage.removeItem(key);
-                        }
-                    }
-                }
-            });
-        } catch (error) {
-            console.warn('Failed to cleanup old logs:', error);
+            console.error('Failed to write log to storage:', error);
         }
     }
 
@@ -220,11 +158,6 @@ class Logger {
             });
         }
     }
-
-    // Method to cleanup old logs (public API)
-    public cleanup(): void {
-        this.cleanupOldLogs(7);
-    }
 }
 
 // Create and export a singleton instance
diff --git a/ems-gateway/nginx.conf b/ems-gateway/nginx.conf
index 2f9d339..41189a7 100644
--- a/ems-gateway/nginx.conf
+++ b/ems-gateway/nginx.conf
@@ -63,7 +63,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
 
         # event-service
@@ -74,7 +73,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         #
         # booking-service
@@ -85,7 +83,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         #
         # # ticketing-service
@@ -106,7 +103,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         
         location /api/invitations/ {
@@ -116,7 +112,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         
         location /api/messages/ {
@@ -126,7 +121,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         
         location /api/materials/ {
@@ -136,7 +130,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         
         # speaker-service - legacy /api/speaker/ route
@@ -147,18 +140,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
-        }
-        
-        # speaker-attendance routes
-        location /api/speaker-attendance/ {
-            rewrite ^/api/speaker-attendance/?(.*)$ /api/speaker-attendance/$1 break;
-            proxy_pass http://speaker-service;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
         #
         # feedback-service
@@ -169,7 +150,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
 
         # notification-service
@@ -180,7 +160,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Authorization $http_authorization;
         }
 
         # # reporting-analytics-service
diff --git a/ems-services/auth-service/Dockerfile.dev b/ems-services/auth-service/Dockerfile.dev
new file mode 100644
index 0000000..1d4dbf3
--- /dev/null
+++ b/ems-services/auth-service/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Development Dockerfile for Auth Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+# Copy prisma schema
+COPY prisma ./prisma
+
+# Generate Prisma client (will be regenerated on volume mount)
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+RUN npx prisma generate || echo "Prisma generate will run on container start"
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["npm", "run", "dev"]
diff --git a/ems-services/auth-service/prisma/seed.ts b/ems-services/auth-service/prisma/seed.ts
index d1eef4e..9a0b456 100644
--- a/ems-services/auth-service/prisma/seed.ts
+++ b/ems-services/auth-service/prisma/seed.ts
@@ -12,22 +12,22 @@ const adminUsers = [
         emailVerified: new Date(),
         isActive: true
     },
-    {
-        name: 'Ashwin Athappan',
-        email: 'ashwinathappank@yahoo.com',
-        password: 'Speaker123!',
-        role: Role.SPEAKER,
-        emailVerified: new Date(),
-        isActive: true
-    },
-    {
-        name: 'User 1',
-        email: '085.ashwin@gmail.com',
-        password: 'User123!',
-        role: Role.USER,
-        emailVerified: new Date(),
-        isActive: true
-    }
+    // {
+    //     name: 'Ashwin Athappan',
+    //     email: 'ashwinathappank@yahoo.com',
+    //     password: 'Speaker123!',
+    //     role: Role.SPEAKER,
+    //     emailVerified: new Date(),
+    //     isActive: true
+    // },
+    // {
+    //     name: 'User 1',
+    //     email: '085.ashwin@gmail.com',
+    //     password: 'User123!',
+    //     role: Role.USER,
+    //     emailVerified: new Date(),
+    //     isActive: true
+    // }
 ];
 
 async function main() {
diff --git a/ems-services/auth-service/src/middleware/admin.middleware.ts b/ems-services/auth-service/src/middleware/admin.middleware.ts
new file mode 100644
index 0000000..28f9c28
--- /dev/null
+++ b/ems-services/auth-service/src/middleware/admin.middleware.ts
@@ -0,0 +1,33 @@
+// src/middleware/admin.middleware.ts
+import {Request, Response, NextFunction} from 'express';
+import {contextService} from '../services/context.service';
+import {logger} from '../utils/logger';
+
+/**
+ * Middleware that ensures the authenticated user has ADMIN role
+ * Must be used after authMiddleware to ensure user is authenticated
+ */
+export const adminMiddleware = (req: Request, res: Response, next: NextFunction) => {
+    try {
+        const userRole = contextService.getCurrentUserRole();
+
+        if (!userRole || userRole !== 'ADMIN') {
+            logger.warn('Admin access denied', {
+                role: userRole,
+                userId: contextService.getCurrentUserId()
+            });
+            return res.status(403).json({error: 'Admin access required'});
+        }
+
+        logger.debug('Admin access granted', {
+            role: userRole,
+            userId: contextService.getCurrentUserId()
+        });
+
+        next();
+    } catch (error) {
+        logger.error('Admin middleware error', error as Error);
+        return res.status(500).json({error: 'Authorization check failed'});
+    }
+};
+
diff --git a/ems-services/auth-service/src/routes/routes.ts b/ems-services/auth-service/src/routes/routes.ts
index 83e7edc..93c90ad 100644
--- a/ems-services/auth-service/src/routes/routes.ts
+++ b/ems-services/auth-service/src/routes/routes.ts
@@ -3,6 +3,7 @@ import {Express} from 'express';
 import {AuthService} from '../services/auth.service';
 import {contextMiddleware} from '../middleware/context.middleware';
 import {authMiddleware} from '../middleware/auth.middleware';
+import {adminMiddleware} from '../middleware/admin.middleware';
 import {Request, Response} from 'express';
 import {UpdateProfileRequest, ResetPasswordRequest, VerifyResetTokenRequest} from "../types/types";
 import {contextService} from '../services/context.service';
@@ -352,4 +353,42 @@ export function registerRoutes(app: Express, authService: AuthService) {
             return res.status(400).json({error: error.message});
         }
     });
+
+    /**
+     * @route   POST /api/auth/admin/activate-users
+     * @desc    Activate multiple users by setting emailVerified and isActive (Admin only)
+     * @access  Protected (Admin)
+     */
+    app.post('/admin/activate-users', authMiddleware, adminMiddleware, async (req: Request, res: Response) => {
+        try {
+            const { emails } = req.body;
+
+            if (!emails || !Array.isArray(emails) || emails.length === 0) {
+                return res.status(400).json({error: 'Emails array is required'});
+            }
+
+            logger.info('/admin/activate-users - Admin activation request', {
+                adminId: contextService.getCurrentUserId(),
+                userCount: emails.length
+            });
+
+            const result = await authService.activateUsers(emails);
+
+            logger.info('/admin/activate-users - Users activated', {
+                activated: result.activated,
+                notFound: result.notFound
+            });
+
+            res.json({
+                success: true,
+                message: `Activated ${result.activated} user(s)`,
+                activated: result.activated,
+                notFound: result.notFound,
+                total: emails.length
+            });
+        } catch (error: any) {
+            logger.error('/admin/activate-users - Activation failed', error);
+            res.status(400).json({error: error.message});
+        }
+    });
 }
\ No newline at end of file
diff --git a/ems-services/auth-service/src/services/auth.service.ts b/ems-services/auth-service/src/services/auth.service.ts
index b4600aa..fa733ec 100644
--- a/ems-services/auth-service/src/services/auth.service.ts
+++ b/ems-services/auth-service/src/services/auth.service.ts
@@ -118,7 +118,7 @@ class AuthService {
     async createSpeakerProfile(user: User): Promise<void> {
         try {
             logger.debug("START - createSpeakerProfile(): ", {userId: user.id, role: user.role});
-            
+
             if (user.role !== 'SPEAKER') {
                 logger.debug("createSpeakerProfile(): User is not a SPEAKER, skipping profile creation", {userId: user.id, role: user.role});
                 return;
@@ -138,12 +138,12 @@ class AuthService {
 
             const queueName = 'speaker.profile.create';
             await rabbitMQService.sendMessage(queueName, speakerProfileMessage);
-            
+
             logger.info("createSpeakerProfile(): Speaker profile creation message sent", {
                 userId: user.id,
                 queue: queueName
             });
-            
+
             logger.debug("END - createSpeakerProfile(): ", {userId: user.id});
         } catch (error) {
             logger.error("createSpeakerProfile(): Failed to send speaker profile creation message", error as Error, {userId: user.id});
@@ -256,11 +256,11 @@ class AuthService {
             logger.debug("register(): Exited transaction", {userId: user.id});
             await this.sendVerificationEmail(user);
             logger.debug("register(): Sent verification email to ", {email: user.email});
-            
+
             // Create speaker profile if user registered as SPEAKER
             await this.createSpeakerProfile(user);
             logger.debug("register(): Speaker profile creation initiated", {userId: user.id, role: user.role});
-            
+
             const token = this._generateToken(user);
             logger.debug("END - register(): ", {userId: user.id});
             return {token, email: user.email, id: user.id, user: user as User};
@@ -691,6 +691,50 @@ class AuthService {
             throw new Error("Profile update failed: " + (error as Error).message);
         }
     }
+
+    /**
+     * Activate multiple users by setting emailVerified and isActive
+     * Admin-only operation
+     * @param emails Array of email addresses to activate
+     * @returns Number of users activated
+     */
+    async activateUsers(emails: string[]): Promise<{ activated: number; notFound: number }> {
+        try {
+            if (!emails || emails.length === 0) {
+                throw new Error('Email list is required');
+            }
+
+            logger.info('activateUsers(): Activating users', { count: emails.length });
+
+            // Update all users with matching emails
+            const result = await prisma.user.updateMany({
+                where: {
+                    email: {
+                        in: emails
+                    }
+                },
+                data: {
+                    emailVerified: new Date(),
+                    isActive: true,
+                    updatedAt: new Date()
+                }
+            });
+
+            const activated = result.count;
+            const notFound = emails.length - activated;
+
+            logger.info('activateUsers(): Users activated', {
+                activated,
+                notFound,
+                total: emails.length
+            });
+
+            return { activated, notFound };
+        } catch (error) {
+            logger.error('activateUsers(): Activation failed', error as Error);
+            throw new Error('Failed to activate users: ' + (error as Error).message);
+        }
+    }
 }
 
 export { AuthService };
diff --git a/ems-services/booking-service/Dockerfile.dev b/ems-services/booking-service/Dockerfile.dev
new file mode 100644
index 0000000..458c866
--- /dev/null
+++ b/ems-services/booking-service/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Development Dockerfile for Booking Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+# Copy prisma schema
+COPY prisma ./prisma
+
+# Generate Prisma client (will be regenerated on volume mount)
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+RUN npx prisma generate || echo "Prisma generate will run on container start"
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["sh", "-c", "npx prisma migrate deploy && npm run dev"]
diff --git a/ems-services/booking-service/prisma/schema.prisma b/ems-services/booking-service/prisma/schema.prisma
index ea369c9..51bf524 100644
--- a/ems-services/booking-service/prisma/schema.prisma
+++ b/ems-services/booking-service/prisma/schema.prisma
@@ -55,10 +55,6 @@ model Booking {
   // Ticket relationship
   ticket    Ticket?
 
-  // Attendance tracking fields
-  joinedAt  DateTime?     // When user joined the event (null if not joined)
-  isAttended Boolean      @default(false) // Whether user has attended the event
-
   createdAt DateTime      @default(now())
   updatedAt DateTime      @updatedAt
 
diff --git a/ems-services/booking-service/src/routes/admin.routes.ts b/ems-services/booking-service/src/routes/admin.routes.ts
index bc3670e..26f633d 100644
--- a/ems-services/booking-service/src/routes/admin.routes.ts
+++ b/ems-services/booking-service/src/routes/admin.routes.ts
@@ -298,6 +298,7 @@ router.get('/events/:eventId/tickets', async (req: AuthRequest, res: Response) =
           id: ticket.id,
           bookingId: ticket.bookingId,
           userId: ticket.booking.userId,
+          eventId: ticket.booking.eventId,
           status: ticket.status,
           issuedAt: ticket.issuedAt.toISOString(),
           expiresAt: ticket.expiresAt.toISOString(),
diff --git a/ems-services/booking-service/src/routes/index.ts b/ems-services/booking-service/src/routes/index.ts
index 6ff8494..230ebe1 100644
--- a/ems-services/booking-service/src/routes/index.ts
+++ b/ems-services/booking-service/src/routes/index.ts
@@ -3,13 +3,9 @@ import bookingRoutes from './booking.routes';
 import { ticketRoutes } from './ticket.routes';
 import speakerRoutes from './speaker.routes';
 import adminRoutes from './admin.routes';
-import attendanceRoutes from './attendance.routes';
 
 const router = Router();
 
-// Attendance routes (All authenticated users) - MUST be first to avoid conflicts with booking routes
-router.use('/', attendanceRoutes);
-
 // Booking routes (USER/ADMIN role required)
 router.use('/', bookingRoutes);
 
diff --git a/ems-services/booking-service/src/services/booking.service.ts b/ems-services/booking-service/src/services/booking.service.ts
index 739c7e5..1e95b74 100644
--- a/ems-services/booking-service/src/services/booking.service.ts
+++ b/ems-services/booking-service/src/services/booking.service.ts
@@ -1,6 +1,5 @@
 import { prisma } from '../database';
 import { logger } from '../utils/logger';
-import { getUserInfo } from '../utils/auth-helpers';
 import {
   CreateBookingRequest,
   BookingResponse,
@@ -361,33 +360,14 @@ class BookingService {
         throw new Error('Event not found');
       }
 
-      // Get all confirmed bookings
-      const confirmedBookingsList = await prisma.booking.findMany({
+      // Count confirmed bookings (active users)
+      const confirmedBookings = await prisma.booking.count({
         where: {
           eventId: eventId,
           status: BookingStatus.CONFIRMED
         }
       });
 
-      // Get user info for all bookings to filter out admins
-      const bookingsWithUserInfo = await Promise.all(
-        confirmedBookingsList.map(async (booking) => {
-          const userInfo = await getUserInfo(booking.userId);
-          return {
-            booking,
-            userInfo
-          };
-        })
-      );
-
-      // Filter out admin users from attendance counts
-      const nonAdminBookings = bookingsWithUserInfo.filter(
-        ({ userInfo }) => userInfo && userInfo.role !== 'ADMIN'
-      );
-
-      // Count confirmed bookings (active users, excluding admins)
-      const confirmedBookings = nonAdminBookings.length;
-
       // Count cancelled bookings
       const cancelledBookings = await prisma.booking.count({
         where: {
diff --git a/ems-services/event-service/Dockerfile.dev b/ems-services/event-service/Dockerfile.dev
new file mode 100644
index 0000000..1424f98
--- /dev/null
+++ b/ems-services/event-service/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Development Dockerfile for Event Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+# Copy prisma schema
+COPY prisma ./prisma
+
+# Generate Prisma client (will be regenerated on volume mount)
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+RUN npx prisma generate || echo "Prisma generate will run on container start"
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["sh", "-c", "npx prisma migrate deploy && npm run dev"]
diff --git a/ems-services/event-service/src/routes/speaker.routes.ts b/ems-services/event-service/src/routes/speaker.routes.ts
index 5a0d10a..7ea8228 100644
--- a/ems-services/event-service/src/routes/speaker.routes.ts
+++ b/ems-services/event-service/src/routes/speaker.routes.ts
@@ -143,10 +143,11 @@ router.put('/events/:id',
         const {id} = req.params;
         const updateData: UpdateEventRequest = req.body;
         const speakerId = req.user!.userId;
+        const userRole = req.user!.role;
 
-        logger.info('Updating event', {eventId: id, speakerId});
+        logger.info('Updating event', {eventId: id, speakerId, userRole});
 
-        const event = await eventService.updateEvent(id, updateData, speakerId);
+        const event = await eventService.updateEvent(id, updateData, speakerId, userRole);
 
         res.json({
             success: true,
diff --git a/ems-services/event-service/src/services/event.service.ts b/ems-services/event-service/src/services/event.service.ts
index b21d4e2..41309b9 100644
--- a/ems-services/event-service/src/services/event.service.ts
+++ b/ems-services/event-service/src/services/event.service.ts
@@ -98,7 +98,7 @@ class EventService {
             // Get creator information to determine if they're an admin
             const creatorInfo = await this.getSpeakerInfo(speakerId);
             const isAdmin = creatorInfo?.role === 'ADMIN';
-            
+
             // Admin events are auto-published, speaker events start as DRAFT
             const initialStatus = isAdmin ? EventStatus.PUBLISHED : EventStatus.DRAFT;
 
@@ -173,8 +173,8 @@ class EventService {
             });
 
             logger.info('createEvent() - Event created successfully', {
-                eventId: event.id, 
-                speakerId, 
+                eventId: event.id,
+                speakerId,
                 status: event.status,
                 autoPublished: isAdmin
             });
@@ -200,11 +200,17 @@ class EventService {
     }
 
     /**
-     * Update an event (only if DRAFT or REJECTED)
+     * Update an event
+     * - Speakers can only update their own events in DRAFT or REJECTED status
+     * - Admins can update any event in any status
      */
-    async updateEvent(eventId: string, data: UpdateEventRequest, speakerId: string): Promise<EventResponse> {
+    async updateEvent(eventId: string, data: UpdateEventRequest, speakerId: string, userRole?: string): Promise<EventResponse> {
         try {
-            logger.info('updateEvent() - Updating event', {eventId, speakerId});
+            logger.info('updateEvent() - Updating event', {eventId, speakerId, userRole});
+
+            // Get user information to determine if they're an admin
+            const userInfo = await this.getSpeakerInfo(speakerId);
+            const isAdmin = userInfo?.role === 'ADMIN' || userRole === 'ADMIN';
 
             const existingEvent = await prisma.event.findUnique({
                 where: {id: eventId},
@@ -216,12 +222,14 @@ class EventService {
                 throw new Error('Event not found');
             }
 
-            if (existingEvent.speakerId !== speakerId) {
+            // Check ownership - admins can update any event, speakers can only update their own
+            if (!isAdmin && existingEvent.speakerId !== speakerId) {
                 logger.info("updateEvent() - Unauthorized: You can only update your own events", {eventId, speakerId});
                 throw new Error('Unauthorized: You can only update your own events');
             }
 
-            if (existingEvent.status !== EventStatus.DRAFT && existingEvent.status !== EventStatus.REJECTED) {
+            // Status check - admins can update events in any status, speakers only DRAFT or REJECTED
+            if (!isAdmin && existingEvent.status !== EventStatus.DRAFT && existingEvent.status !== EventStatus.REJECTED) {
                 logger.info("updateEvent() - Event can only be updated when in DRAFT or REJECTED status", {eventId, status: existingEvent.status});
                 throw new Error('Event can only be updated when in DRAFT or REJECTED status');
             }
@@ -348,7 +356,8 @@ class EventService {
     }
 
     /**
-     * Approve event (PENDING_APPROVAL -> PUBLISHED)
+     * Approve/publish event (PENDING_APPROVAL or DRAFT -> PUBLISHED)
+     * Admins can publish events directly from DRAFT status
      */
     async approveEvent(eventId: string): Promise<EventResponse> {
         try {
@@ -364,9 +373,10 @@ class EventService {
                 throw new Error('Event not found');
             }
 
-            if (existingEvent.status !== EventStatus.PENDING_APPROVAL) {
-                logger.info("approveEvent() - Event must be in PENDING_APPROVAL status to be approved", {eventId, status: existingEvent.status});
-                throw new Error('Event must be in PENDING_APPROVAL status to be approved');
+            // Allow approving events that are in PENDING_APPROVAL or DRAFT status
+            if (existingEvent.status !== EventStatus.PENDING_APPROVAL && existingEvent.status !== EventStatus.DRAFT) {
+                logger.info("approveEvent() - Event must be in PENDING_APPROVAL or DRAFT status to be approved/published", {eventId, status: existingEvent.status});
+                throw new Error('Event must be in PENDING_APPROVAL or DRAFT status to be approved/published');
             }
 
             const event = await prisma.event.update({
diff --git a/ems-services/feedback-service/Dockerfile.dev b/ems-services/feedback-service/Dockerfile.dev
new file mode 100644
index 0000000..598d693
--- /dev/null
+++ b/ems-services/feedback-service/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Development Dockerfile for Feedback Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+# Copy prisma schema
+COPY prisma ./prisma
+
+# Generate Prisma client (will be regenerated on volume mount)
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+RUN npx prisma generate || echo "Prisma generate will run on container start"
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["npm", "run", "dev"]
diff --git a/ems-services/notification-service/Dockerfile.dev b/ems-services/notification-service/Dockerfile.dev
new file mode 100644
index 0000000..4ac4d12
--- /dev/null
+++ b/ems-services/notification-service/Dockerfile.dev
@@ -0,0 +1,22 @@
+# Development Dockerfile for Notification Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["npm", "run", "dev"]
diff --git a/ems-services/speaker-service/.env.example b/ems-services/speaker-service/.env.example
new file mode 100644
index 0000000..ef5b518
--- /dev/null
+++ b/ems-services/speaker-service/.env.example
@@ -0,0 +1,11 @@
+PORT=3000
+APP_NAME=EVENTO
+EVENT_APP_URL=http://localhost/api/event/
+CLIENT_URL=http://localhost
+
+DATABASE_URL=
+
+RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672
+EMAIL_VERIFICATION_SECRET=
+
+JWT_SECRET=
\ No newline at end of file
diff --git a/ems-services/speaker-service/Dockerfile b/ems-services/speaker-service/Dockerfile
index 2450c97..4a3ebc1 100644
--- a/ems-services/speaker-service/Dockerfile
+++ b/ems-services/speaker-service/Dockerfile
@@ -1,26 +1,32 @@
 # Stage 1: Build
-FROM node:20-bullseye-slim AS builder
-RUN apt-get update && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+FROM alpine:latest AS builder
+RUN apk update && apk add nodejs npm && rm -rf /var/cache/apk/*
 WORKDIR /app
 
 COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY prisma ./prisma
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
 RUN npx prisma generate
 
 COPY . .
 RUN npm run build
 
 # Stage 2: Runner
-FROM node:20-bullseye-slim AS runner
-RUN apt-get update && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+FROM alpine:latest AS runner
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
 WORKDIR /app
 
 ENV NODE_ENV=production
 ENV PORT=3000
 ENV HOSTNAME="0.0.0.0"
 
+# Database URL will be provided at runtime via docker-compose
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+
 # Install only prod deps in final image
 COPY package.json package-lock.json ./
 RUN npm ci --omit=dev --omit=optional --ignore-scripts && npm cache clean --force
diff --git a/ems-services/speaker-service/Dockerfile.dev b/ems-services/speaker-service/Dockerfile.dev
new file mode 100644
index 0000000..91e13a6
--- /dev/null
+++ b/ems-services/speaker-service/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Development Dockerfile for Speaker Service
+FROM alpine:latest
+RUN apk update && apk add nodejs npm openssl && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+
+# Set development environment
+ENV NODE_ENV=development
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+# Copy package files first for better caching
+COPY package.json package-lock.json ./
+
+# Install all dependencies (including dev dependencies)
+RUN npm ci
+
+# Copy prisma schema
+COPY prisma ./prisma
+
+# Generate Prisma client (will be regenerated on volume mount)
+ARG DATABASE_URL
+ENV DATABASE_URL=$DATABASE_URL
+RUN npx prisma generate || echo "Prisma generate will run on container start"
+
+EXPOSE 3000
+
+# The actual source code will be mounted as a volume
+# Command will be overridden in docker-compose to use nodemon
+CMD ["npm", "run", "dev"]
diff --git a/ems-services/speaker-service/prisma/migrations/20251101033404_init/migration.sql b/ems-services/speaker-service/prisma/migrations/20251101033404_init/migration.sql
new file mode 100644
index 0000000..4fc556a
--- /dev/null
+++ b/ems-services/speaker-service/prisma/migrations/20251101033404_init/migration.sql
@@ -0,0 +1,70 @@
+-- CreateEnum
+CREATE TYPE "InvitationStatus" AS ENUM ('PENDING', 'ACCEPTED', 'DECLINED', 'EXPIRED');
+
+-- CreateTable
+CREATE TABLE "speaker_profiles" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "bio" TEXT,
+    "expertise" TEXT[],
+    "isAvailable" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "speaker_profiles_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "speaker_invitations" (
+    "id" TEXT NOT NULL,
+    "speakerId" TEXT NOT NULL,
+    "eventId" TEXT NOT NULL,
+    "message" TEXT,
+    "status" "InvitationStatus" NOT NULL DEFAULT 'PENDING',
+    "sentAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "respondedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "speaker_invitations_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "messages" (
+    "id" TEXT NOT NULL,
+    "fromUserId" TEXT NOT NULL,
+    "toUserId" TEXT NOT NULL,
+    "subject" TEXT NOT NULL,
+    "content" TEXT NOT NULL,
+    "threadId" TEXT,
+    "sentAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "readAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "messages_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "presentation_materials" (
+    "id" TEXT NOT NULL,
+    "speakerId" TEXT NOT NULL,
+    "eventId" TEXT,
+    "fileName" TEXT NOT NULL,
+    "filePath" TEXT NOT NULL,
+    "fileSize" INTEGER NOT NULL,
+    "mimeType" TEXT NOT NULL,
+    "uploadDate" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "presentation_materials_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "speaker_profiles_userId_key" ON "speaker_profiles"("userId");
+
+-- AddForeignKey
+ALTER TABLE "speaker_invitations" ADD CONSTRAINT "speaker_invitations_speakerId_fkey" FOREIGN KEY ("speakerId") REFERENCES "speaker_profiles"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "presentation_materials" ADD CONSTRAINT "presentation_materials_speakerId_fkey" FOREIGN KEY ("speakerId") REFERENCES "speaker_profiles"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/ems-services/speaker-service/prisma/migrations/migration_lock.toml b/ems-services/speaker-service/prisma/migrations/migration_lock.toml
index 99e4f20..044d57c 100644
--- a/ems-services/speaker-service/prisma/migrations/migration_lock.toml
+++ b/ems-services/speaker-service/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
+# It should be added in your version-control system (e.g., Git)
 provider = "postgresql"
diff --git a/ems-services/speaker-service/prisma/schema.prisma b/ems-services/speaker-service/prisma/schema.prisma
index 156d183..9e49db2 100644
--- a/ems-services/speaker-service/prisma/schema.prisma
+++ b/ems-services/speaker-service/prisma/schema.prisma
@@ -4,8 +4,7 @@
 generator client {
   provider      = "prisma-client-js"
   output        = "../generated/prisma"
-  // Debian (glibc) compatible engines
-  binaryTargets = ["native", "debian-openssl-3.0.x"]
+  binaryTargets = ["native", "linux-arm64-openssl-3.0.x"]
 }
 
 datasource db {
@@ -47,14 +46,8 @@ model SpeakerInvitation {
   status      InvitationStatus @default(PENDING)
   sentAt      DateTime         @default(now())
   respondedAt DateTime?
-  
-  // Speaker joining and material selection
-  joinedAt           DateTime?  // When speaker joined the event (null if not joined)
-  materialsSelected  String[]   @default([]) // Array of material IDs selected for this event
-  isAttended         Boolean    @default(false) // Whether speaker has attended the event
-  
-  createdAt DateTime         @default(now())
-  updatedAt DateTime         @updatedAt
+  createdAt   DateTime         @default(now())
+  updatedAt   DateTime         @updatedAt
   
   speaker     SpeakerProfile @relation(fields: [speakerId], references: [id])
   
diff --git a/ems-services/speaker-service/src/middleware/auth.middleware.ts b/ems-services/speaker-service/src/middleware/auth.middleware.ts
index 269279b..1538523 100644
--- a/ems-services/speaker-service/src/middleware/auth.middleware.ts
+++ b/ems-services/speaker-service/src/middleware/auth.middleware.ts
@@ -34,7 +34,7 @@ export const authMiddleware = (req: AuthRequest, res: Response, next: NextFuncti
 
     const decoded = jwt.verify(token, JWT_SECRET) as any;
     req.user = {
-      id: decoded.userId, // Auth-service uses 'userId' in token payload
+      id: decoded.id,
       email: decoded.email,
       role: decoded.role
     };
diff --git a/ems-services/speaker-service/src/routes/speaker.routes.ts b/ems-services/speaker-service/src/routes/speaker.routes.ts
index d8251a6..5e98af3 100644
--- a/ems-services/speaker-service/src/routes/speaker.routes.ts
+++ b/ems-services/speaker-service/src/routes/speaker.routes.ts
@@ -11,20 +11,20 @@ const speakerService = new SpeakerService();
 router.get('/', async (req: Request, res: Response) => {
   try {
     const { query, expertise, isAvailable, limit = 10, offset = 0 } = req.query;
-    
+
     const searchParams: any = {
       limit: parseInt(limit as string),
       offset: parseInt(offset as string)
     };
-    
+
     if (query) searchParams.query = query as string;
     if (expertise) searchParams.expertise = (expertise as string).split(',');
     if (isAvailable !== undefined) searchParams.isAvailable = isAvailable === 'true';
-    
+
     const speakers = await speakerService.searchSpeakers(searchParams);
 
     logger.info('Speakers retrieved', { count: speakers.length });
-    
+
     return res.json({
       success: true,
       data: speakers,
@@ -44,7 +44,7 @@ router.get('/', async (req: Request, res: Response) => {
 router.get('/:id', async (req: Request, res: Response) => {
   try {
     const { id } = req.params;
-    
+
     if (!id) {
       return res.status(400).json({
         success: false,
@@ -52,9 +52,9 @@ router.get('/:id', async (req: Request, res: Response) => {
         timestamp: new Date().toISOString()
       });
     }
-    
+
     const speaker = await speakerService.getSpeakerById(id);
-    
+
     if (!speaker) {
       return res.status(404).json({
         success: false,
@@ -64,7 +64,7 @@ router.get('/:id', async (req: Request, res: Response) => {
     }
 
     logger.info('Speaker retrieved', { speakerId: id });
-    
+
     return res.json({
       success: true,
       data: speaker,
@@ -84,7 +84,7 @@ router.get('/:id', async (req: Request, res: Response) => {
 router.post('/', async (req: Request, res: Response) => {
   try {
     const { userId, name, email, bio, expertise, isAvailable } = req.body;
-    
+
     if (!userId || !name || !email) {
       return res.status(400).json({
         success: false,
@@ -103,7 +103,7 @@ router.post('/', async (req: Request, res: Response) => {
     });
 
     logger.info('Speaker profile created', { speakerId: speakerProfile.id, userId, name });
-    
+
     return res.status(201).json({
       success: true,
       data: speakerProfile,
@@ -125,7 +125,7 @@ router.put('/:id', async (req: Request, res: Response) => {
   try {
     const { id } = req.params;
     const { name, bio, expertise, isAvailable } = req.body;
-    
+
     if (!id) {
       return res.status(400).json({
         success: false,
@@ -133,7 +133,7 @@ router.put('/:id', async (req: Request, res: Response) => {
         timestamp: new Date().toISOString()
       });
     }
-    
+
     // Check if speaker exists
     const existingSpeaker = await speakerService.getSpeakerById(id);
     if (!existingSpeaker) {
@@ -152,7 +152,7 @@ router.put('/:id', async (req: Request, res: Response) => {
     });
 
     logger.info('Speaker profile updated', { speakerId: id });
-    
+
     return res.json({
       success: true,
       data: updatedSpeaker,
@@ -173,7 +173,7 @@ router.put('/:id', async (req: Request, res: Response) => {
 router.get('/profile/me', async (req: Request, res: Response) => {
   try {
     const { userId } = req.query;
-    
+
     if (!userId) {
       return res.status(400).json({
         success: false,
@@ -181,9 +181,9 @@ router.get('/profile/me', async (req: Request, res: Response) => {
         timestamp: new Date().toISOString()
       });
     }
-    
+
     const speaker = await speakerService.getSpeakerByUserId(userId as string);
-    
+
     if (!speaker) {
       return res.status(404).json({
         success: false,
@@ -193,7 +193,7 @@ router.get('/profile/me', async (req: Request, res: Response) => {
     }
 
     logger.info('Speaker profile retrieved', { speakerId: speaker.id, userId });
-    
+
     return res.json({
       success: true,
       data: speaker,
diff --git a/ems-services/speaker-service/src/server.ts b/ems-services/speaker-service/src/server.ts
index 4341d53..5e0a56c 100644
--- a/ems-services/speaker-service/src/server.ts
+++ b/ems-services/speaker-service/src/server.ts
@@ -6,7 +6,6 @@ import speakerRoutes from './routes/speaker.routes';
 import invitationRoutes from './routes/invitation.routes';
 import messageRoutes from './routes/message.routes';
 import materialRoutes from './routes/material.routes';
-import speakerAttendanceRoutes from './routes/speaker-attendance.routes';
 import { errorMiddleware, notFoundHandler } from './middleware/error.middleware';
 import { RabbitMQService } from './services/rabbitmq.service';
 import { SpeakerService } from './services/speaker.service';
@@ -35,7 +34,6 @@ app.use('/api/speakers', speakerRoutes);
 app.use('/api/invitations', invitationRoutes);
 app.use('/api/messages', messageRoutes);
 app.use('/api/materials', materialRoutes);
-app.use('/api/speaker-attendance', speakerAttendanceRoutes);
 
 // Error handling middleware
 app.use(notFoundHandler);
diff --git a/ems-services/speaker-service/src/services/material.service.ts b/ems-services/speaker-service/src/services/material.service.ts
index 3278bc8..df2c118 100644
--- a/ems-services/speaker-service/src/services/material.service.ts
+++ b/ems-services/speaker-service/src/services/material.service.ts
@@ -11,9 +11,7 @@ export class MaterialService {
   private readonly uploadDir: string;
 
   constructor() {
-    // Use absolute path to avoid path resolution issues
-    const defaultDir = path.resolve(process.cwd(), 'uploads');
-    this.uploadDir = process.env['UPLOAD_DIR'] || defaultDir;
+    this.uploadDir = process.env['UPLOAD_DIR'] || './uploads';
     this.ensureUploadDir();
   }
 
@@ -28,18 +26,6 @@ export class MaterialService {
     }
   }
 
-  /**
-   * Check if file exists
-   */
-  private async fileExists(filePath: string): Promise<boolean> {
-    try {
-      await fs.access(filePath);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
   /**
    * Upload presentation material
    */
@@ -85,8 +71,7 @@ export class MaterialService {
       const fileExtension = path.extname(data.fileName);
       const baseName = path.basename(data.fileName, fileExtension);
       const uniqueFileName = `${baseName}_${Date.now()}${fileExtension}`;
-      // Use absolute path to avoid path resolution issues
-      const filePath = path.resolve(this.uploadDir, uniqueFileName);
+      const filePath = path.join(this.uploadDir, uniqueFileName);
 
       // Save file to disk
       await fs.writeFile(filePath, file.buffer);
@@ -215,30 +200,14 @@ export class MaterialService {
         throw new Error('Material not found');
       }
 
-      // Resolve file path - handle both absolute and relative paths
-      let resolvedPath = material.filePath;
-      
-      // If path is relative, resolve it relative to current working directory
-      if (!path.isAbsolute(material.filePath)) {
-        // Try relative to uploads directory first
-        resolvedPath = path.resolve(this.uploadDir, path.basename(material.filePath));
-        
-        // If not found, try the original relative path
-        if (!await this.fileExists(resolvedPath)) {
-          resolvedPath = path.resolve(process.cwd(), material.filePath);
-        }
-      }
-
       // Check if file exists on disk
       try {
-        await fs.access(resolvedPath);
+        await fs.access(material.filePath);
       } catch {
-        const errorMsg = `Material file not found on disk. Material ID: ${id}, Original Path: ${material.filePath}, Resolved Path: ${resolvedPath}, Upload Dir: ${this.uploadDir}, CWD: ${process.cwd()}`;
-        logger.error('Material file not found', new Error(errorMsg));
-        throw new Error(`Material file not found on disk. Path: ${resolvedPath}`);
+        throw new Error('Material file not found on disk');
       }
 
-      const fileBuffer = await fs.readFile(resolvedPath);
+      const fileBuffer = await fs.readFile(material.filePath);
 
       logger.info('Material downloaded successfully', { materialId: id });
       return { material, fileBuffer };
diff --git a/scripts/README-SEEDING.md b/scripts/README-SEEDING.md
new file mode 100644
index 0000000..e7a8f6f
--- /dev/null
+++ b/scripts/README-SEEDING.md
@@ -0,0 +1,259 @@
+# Event Management System - Complete Seeding Script
+
+This directory contains a comprehensive seeding script for the Event Management System that creates users, speakers, events, and bookings.
+
+## Overview
+
+The seeding process ensures that:
+- ✅ Users and speakers are created via HTTP API (triggers all service integrations)
+- ✅ Speaker profiles are created automatically via RabbitMQ (when speakers register)
+- ✅ Users are activated via admin API (emailVerified and isActive set)
+- ✅ Events are created by admin and assigned to speakers
+- ✅ Events respect venue operating hours
+- ✅ Users register for events (bookings created)
+- ✅ Admin users are seeded separately via auth-service prisma seed script (seed.ts)
+
+## Files
+
+1. **`seed.py`** - Main seeding script (Python, modular structure)
+2. **`modules/`** - Modular components:
+   - `utils.py` - Shared utilities (colors, config, API URLs)
+   - `user_seeding.py` - User and speaker registration
+   - `event_seeding.py` - Event creation by admin
+   - `booking_seeding.py` - User registrations for events
+3. **`requirements.txt`** - Python dependencies
+
+## Prerequisites
+
+1. **Admin User**: An admin user must exist before running the script. Seed it via:
+   ```bash
+   cd ems-services/auth-service
+   npx prisma db seed
+   ```
+   Default admin credentials:
+   - Email: `admin@eventmanagement.com`
+   - Password: `Admin123!`
+
+2. **Venues**: Venues should be seeded first. Run:
+   ```bash
+   cd ems-services/event-service
+   npx prisma db seed
+   ```
+
+3. **Services Running**: Ensure all services are running:
+   - auth-service
+   - event-service
+   - booking-service
+   - speaker-service
+   - RabbitMQ
+
+## Installation
+
+```bash
+# Install dependencies
+cd scripts
+pip install -r requirements.txt
+
+# Or install manually:
+pip install requests faker
+```
+
+## Usage
+
+### Basic Usage
+
+```bash
+# From project root
+python3 scripts/seed.py
+
+# Or from scripts directory
+cd scripts
+python3 seed.py
+```
+
+### Custom Configuration
+
+You can override default URLs via environment variables:
+
+```bash
+# Custom API URLs
+AUTH_API_URL=http://localhost:3000/api/auth \
+EVENT_API_URL=http://localhost:3000/api/event \
+BOOKING_API_URL=http://localhost:3000/api/booking \
+python3 scripts/seed.py
+
+# Custom admin credentials
+ADMIN_EMAIL=your-admin@example.com \
+ADMIN_PASSWORD=YourPassword123! \
+python3 scripts/seed.py
+```
+
+### Full Example
+
+```bash
+AUTH_API_URL=http://localhost/api/auth \
+EVENT_API_URL=http://localhost/api/event \
+BOOKING_API_URL=http://localhost/api/booking \
+ADMIN_EMAIL=admin@eventmanagement.com \
+ADMIN_PASSWORD=Admin123! \
+python3 scripts/seed.py
+```
+
+## What Gets Created
+
+### Step 1-2: Speakers and Users
+- **5 Speakers**: speaker1@test.com through speaker5@test.com
+  - **Password**: Speaker1123! through Speaker5123!
+  - **Profile**: Created automatically via RabbitMQ
+- **10 Regular Users**: user1@test.com through user10@test.com
+  - **Password**: User1123! through User10123!
+
+### Step 3: RabbitMQ Processing
+- Waits 5 seconds for RabbitMQ to process speaker profile creation
+
+### Step 4: User Activation
+- All users are activated via admin API
+- `emailVerified` set to current date
+- `isActive` set to `true`
+- Users can login immediately without email verification
+
+### Step 5: Events (8 events created)
+- Created by admin and assigned to random speakers
+- Events are **auto-published** (PUBLISHED status) when created by admin
+- Events respect venue operating hours (openingTime/closingTime)
+- Event durations:
+  - Same-day events: 2-8 hours
+  - Multi-day events: 1-3 days
+- Event names generated using Faker library (creative names)
+- Categories: Technology, Business, Education, Arts & Culture, Health & Wellness, Science, Entertainment, Networking
+
+### Step 6: Bookings
+- Each user randomly registers for 1-4 events
+- Only published events are used
+- Bookings created via booking-service API
+
+## Script Flow
+
+```
+1. Admin Login Verification
+   ↓
+2. Register Speakers (5)
+   ↓
+3. Register Users (10)
+   ↓
+4. Wait for RabbitMQ (5 seconds)
+   ↓
+5. Activate Users (via admin API)
+   ↓
+6. Create Events (8 events, assigned to speakers)
+   ↓
+7. Create Bookings (users register for events)
+```
+
+## Important Notes
+
+1. **Admin Credentials**:
+   - Default: `admin@eventmanagement.com` / `Admin123!`
+   - Can be overridden via `ADMIN_EMAIL` and `ADMIN_PASSWORD` env vars
+   - Admin must exist before running script
+
+2. **Speaker Profiles**:
+   - Created automatically via RabbitMQ when speakers register
+   - May take 5-10 seconds after registration
+   - Script waits for RabbitMQ processing
+
+3. **Event Creation**:
+   - Admin creates events with speaker's `userId` to assign them
+   - Events auto-publish when created by admin
+   - Venue times are validated (events must fit within venue hours)
+
+4. **User Activation**:
+   - All users are activated via protected admin API endpoint
+   - No need for email verification after seeding
+   - Users can login immediately
+
+5. **Password Format**:
+   - Pattern: `[Role][Number]123!`
+   - Examples: `Speaker1123!`, `User5123!`
+
+## Troubleshooting
+
+### Admin Login Fails
+- Verify admin user exists: `cd ems-services/auth-service && npx prisma db seed`
+- Check credentials match default or override via env vars
+- Ensure auth-service is running
+
+### 502 Bad Gateway Errors
+- Auth-service may not be running
+- Check: `docker ps | grep auth-service`
+- Check logs: `docker logs auth-service`
+- Start service: `docker-compose up -d auth-service`
+
+### No Venues Available
+- Seed venues first: `cd ems-services/event-service && npx prisma db seed`
+- Verify venues exist via: `GET /api/event/venues/all`
+
+### Events Not Created
+- Check event-service is running
+- Verify venues exist
+- Check admin token is valid
+- Review event-service logs
+
+### Bookings Not Created
+- Ensure events are PUBLISHED status
+- Verify users can login (check activation)
+- Check booking-service is running
+- Review booking-service logs
+
+### Speaker Profiles Not Created
+- Verify RabbitMQ is running
+- Check speaker-service logs for RabbitMQ connection
+- Wait longer (RabbitMQ may need more time)
+- Manually create via `POST /api/speakers`
+
+## API Endpoints Used
+
+- `POST /api/auth/register` - Register users and speakers
+- `POST /api/auth/login` - Admin authentication
+- `POST /api/auth/admin/activate-users` - Activate users (admin only)
+- `GET /api/event/venues/all` - Fetch available venues
+- `POST /api/event/events` - Create events (as admin)
+- `POST /api/booking/bookings` - Create bookings (user registrations)
+
+## Verification
+
+After running the seeding script, verify the data:
+
+```bash
+# Check users were created
+curl http://localhost/api/auth/check-user?email=speaker1@test.com
+
+# Check events (requires authentication)
+curl -H "Authorization: Bearer <admin_token>" \
+  http://localhost/api/event/admin/events
+
+# Check bookings (requires authentication)
+curl -H "Authorization: Bearer <user_token>" \
+  http://localhost/api/booking/bookings/my-bookings
+```
+
+## Next Steps
+
+After seeding:
+1. ✅ Verify users can login
+2. ✅ Check speaker profiles were created
+3. ✅ Verify events are published and assigned to speakers
+4. ✅ Check users have bookings/registrations
+5. ✅ Test the system with seeded data
+
+## Module Structure
+
+The script is modular for maintainability:
+
+- **`seed.py`** - Main orchestrator
+- **`modules/utils.py`** - Shared utilities (colors, config)
+- **`modules/user_seeding.py`** - User/speaker registration logic
+- **`modules/event_seeding.py`** - Event creation with venue validation
+- **`modules/booking_seeding.py`** - User registration for events
+
+Each module can be tested independently or modified without affecting others.
diff --git a/scripts/modules/__init__.py b/scripts/modules/__init__.py
new file mode 100644
index 0000000..5f4aac2
--- /dev/null
+++ b/scripts/modules/__init__.py
@@ -0,0 +1,2 @@
+# Modules package for seeding script
+
diff --git a/scripts/modules/booking_seeding.py b/scripts/modules/booking_seeding.py
new file mode 100644
index 0000000..c66f774
--- /dev/null
+++ b/scripts/modules/booking_seeding.py
@@ -0,0 +1,149 @@
+"""
+Booking/Registration Seeding Module
+"""
+import random
+import time
+import requests
+from typing import List, Dict, Optional
+from .utils import (
+    BOOKING_API_URL, print_success, print_error, print_info, print_step
+)
+
+
+def login_user(email: str, password: str) -> Optional[str]:
+    """
+    Login as a user to get authentication token
+
+    Args:
+        email: User email
+        password: User password
+
+    Returns:
+        JWT token or None if failed
+    """
+    from .utils import AUTH_API_URL
+
+    url = f"{AUTH_API_URL}/login"
+    payload = {
+        "email": email,
+        "password": password
+    }
+
+    try:
+        response = requests.post(url, json=payload, timeout=10)
+        if response.status_code == 200:
+            data = response.json()
+            return data.get('token', '')
+        else:
+            return None
+    except:
+        return None
+
+
+def create_booking(user_token: str, event_id: str) -> bool:
+    """
+    Create a booking for an event
+
+    Args:
+        user_token: User authentication token
+        event_id: Event ID to register for
+
+    Returns:
+        True if successful, False otherwise
+    """
+    url = f"{BOOKING_API_URL}/bookings"
+    headers = {
+        "Authorization": f"Bearer {user_token}",
+        "Content-Type": "application/json"
+    }
+    payload = {
+        "eventId": event_id
+    }
+
+    try:
+        response = requests.post(url, json=payload, headers=headers, timeout=10)
+
+        if response.status_code == 201:
+            return True
+        elif response.status_code == 409:
+            # Already registered or fully booked
+            return False
+        else:
+            return False
+    except:
+        return False
+
+
+def seed_bookings(events: List[Dict], users: List[Dict]) -> int:
+    """
+    Seed bookings by having users register for events
+
+    Args:
+        events: List of event dictionaries (should be PUBLISHED)
+        users: List of user dictionaries with email
+
+    Returns:
+        Number of successful bookings created
+    """
+    from .utils import print_header
+
+    print()
+    print_header("Step 5: Creating User Registrations")
+    print("-" * 50)
+
+    if not events:
+        print_error("No events available to register for")
+        return 0
+
+    if not users:
+        print_error("No users available to register")
+        return 0
+
+    # Filter to only published events
+    published_events = [e for e in events if e.get('status') == 'PUBLISHED']
+
+    if not published_events:
+        print_error("No published events available to register for")
+        return 0
+
+    print_info(f"Registering users for {len(published_events)} published events...")
+
+    successful_bookings = 0
+    failed_bookings = 0
+
+    # For each user, randomly register for 1-4 events
+    for user in users:
+        email = user['email']
+        password = f"User{email.split('@')[0].replace('user', '')}123!"  # Extract number from email
+
+        # Login as user
+        user_token = login_user(email, password)
+        if not user_token:
+            print_error(f"Failed to login as {email}, skipping bookings")
+            continue
+
+        # Randomly select 1-4 events to register for
+        num_registrations = random.randint(1, min(4, len(published_events)))
+        events_to_register = random.sample(published_events, num_registrations)
+
+        for event in events_to_register:
+            event_id = event.get('id')
+            event_name = event.get('name', 'Unknown Event')
+
+            if create_booking(user_token, event_id):
+                successful_bookings += 1
+                print_step(f"User {email} registered for: {event_name[:50]}")
+                time.sleep(0.1)  # Small delay between requests
+            else:
+                failed_bookings += 1
+                # Don't print failed bookings to reduce noise (might be duplicates or full capacity)
+
+        time.sleep(0.2)  # Delay between users
+
+    print()
+    print_success(f"Created {successful_bookings} bookings")
+    if failed_bookings > 0:
+        print_info(f"{failed_bookings} bookings failed (may be duplicates or capacity issues)")
+
+    return successful_bookings
+
diff --git a/scripts/modules/event_seeding.py b/scripts/modules/event_seeding.py
new file mode 100644
index 0000000..5ce1a34
--- /dev/null
+++ b/scripts/modules/event_seeding.py
@@ -0,0 +1,301 @@
+"""
+Event Seeding Module
+"""
+import random
+from datetime import datetime, timedelta
+from typing import List, Dict, Optional, Tuple
+import requests
+from faker import Faker
+from .utils import (
+    EVENT_API_URL, print_success, print_error, print_info, print_step
+)
+
+fake = Faker()
+Faker.seed(42)  # For reproducible results
+
+
+def parse_time(time_str: str) -> Tuple[int, int]:
+    """Parse HH:mm time string to (hour, minute) tuple"""
+    parts = time_str.split(':')
+    return int(parts[0]), int(parts[1])
+
+
+def time_to_minutes(time_str: str) -> int:
+    """Convert HH:mm time string to total minutes since midnight"""
+    hour, minute = parse_time(time_str)
+    return hour * 60 + minute
+
+
+def validate_event_time_against_venue(event_start: datetime, event_end: datetime,
+                                      venue_opening: str, venue_closing: str) -> bool:
+    """
+    Validate that event times fall within venue operating hours
+
+    Args:
+        event_start: Event start datetime
+        event_end: Event end datetime
+        venue_opening: Venue opening time (HH:mm)
+        venue_closing: Venue closing time (HH:mm)
+
+    Returns:
+        True if valid, False otherwise
+    """
+    event_start_minutes = event_start.hour * 60 + event_start.minute
+    event_end_minutes = event_end.hour * 60 + event_end.minute
+
+    venue_open_minutes = time_to_minutes(venue_opening)
+    venue_close_minutes = time_to_minutes(venue_closing)
+
+    # Handle venues that close at 24:00 (midnight)
+    if venue_close_minutes == 24 * 60:
+        venue_close_minutes = 23 * 60 + 59
+
+    return (event_start_minutes >= venue_open_minutes and
+            event_end_minutes <= venue_close_minutes)
+
+
+def generate_event_dates(days_ahead: int = None, duration_days: int = None) -> Tuple[datetime, datetime]:
+    """
+    Generate event start and end dates
+
+    Args:
+        days_ahead: Days from now to start event (default: 7-30 days)
+        duration_days: Event duration in days (default: 0-3 days)
+
+    Returns:
+        Tuple of (start_date, end_date)
+    """
+    if days_ahead is None:
+        days_ahead = random.randint(7, 30)
+
+    if duration_days is None:
+        duration_days = random.randint(0, 3)  # 0 = same day, 1-3 = multiple days
+
+    start_date = datetime.now() + timedelta(days=days_ahead)
+
+    # Randomize start time (between 9 AM and 6 PM)
+    start_hour = random.randint(9, 18)
+    start_minute = random.choice([0, 30])
+    start_date = start_date.replace(hour=start_hour, minute=start_minute, second=0, microsecond=0)
+
+    # Calculate end date
+    if duration_days == 0:
+        # Same day event - duration 2-8 hours
+        duration_hours = random.randint(2, 8)
+        end_date = start_date + timedelta(hours=duration_hours)
+    else:
+        # Multi-day event
+        end_date = start_date + timedelta(days=duration_days)
+        # End time between 5 PM and 10 PM
+        end_hour = random.randint(17, 22)
+        end_minute = random.choice([0, 30])
+        end_date = end_date.replace(hour=end_hour, minute=end_minute, second=0, microsecond=0)
+
+    return start_date, end_date
+
+
+def adjust_event_times_for_venue(event_start: datetime, event_end: datetime,
+                                 venue_opening: str, venue_closing: str) -> Tuple[datetime, datetime]:
+    """
+    Adjust event times to fit within venue operating hours
+
+    Args:
+        event_start: Desired event start datetime
+        event_end: Desired event end datetime
+        venue_opening: Venue opening time (HH:mm)
+        venue_closing: Venue closing time (HH:mm)
+
+    Returns:
+        Tuple of (adjusted_start, adjusted_end)
+    """
+    venue_open_hour, venue_open_minute = parse_time(venue_opening)
+    venue_close_hour, venue_close_minute = parse_time(venue_closing)
+
+    # Adjust start time to not be before venue opening
+    if event_start.hour < venue_open_hour or (event_start.hour == venue_open_hour and event_start.minute < venue_open_minute):
+        event_start = event_start.replace(hour=venue_open_hour, minute=venue_open_minute)
+
+    # Handle closing at 24:00 (midnight)
+    if venue_close_hour == 24:
+        venue_close_hour = 23
+        venue_close_minute = 59
+
+    # Adjust end time to not be after venue closing
+    if event_end.hour > venue_close_hour or (event_end.hour == venue_close_hour and event_end.minute > venue_close_minute):
+        event_end = event_end.replace(hour=venue_close_hour, minute=venue_close_minute)
+
+    # Ensure end is after start
+    if event_end <= event_start:
+        event_end = event_start + timedelta(hours=2)  # Minimum 2 hour event
+
+    return event_start, event_end
+
+
+def get_venues(admin_token: str) -> List[Dict]:
+    """
+    Fetch all available venues
+
+    Args:
+        admin_token: Admin authentication token
+
+    Returns:
+        List of venue dictionaries
+    """
+    url = f"{EVENT_API_URL}/venues/all"
+    headers = {
+        "Authorization": f"Bearer {admin_token}",
+        "Content-Type": "application/json"
+    }
+
+    try:
+        response = requests.get(url, headers=headers, timeout=10)
+        if response.status_code == 200:
+            data = response.json()
+            return data.get('data', [])
+        else:
+            print_error(f"Failed to fetch venues: HTTP {response.status_code}")
+            return []
+    except Exception as e:
+        print_error(f"Error fetching venues: {str(e)}")
+        return []
+
+
+def create_event(admin_token: str, admin_user_id: str, venue: Dict,
+                event_name: str, description: str, category: str) -> Optional[Dict]:
+    """
+    Create an event as admin (admin is the creator)
+
+    Args:
+        admin_token: Admin authentication token
+        admin_user_id: User ID of the admin creating the event
+        venue: Venue dictionary
+        event_name: Event name
+        description: Event description
+        category: Event category
+
+    Returns:
+        Created event dictionary or None if failed
+    """
+    # Generate event dates
+    start_date, end_date = generate_event_dates()
+
+    # Adjust times for venue operating hours
+    start_date, end_date = adjust_event_times_for_venue(
+        start_date, end_date,
+        venue['openingTime'], venue['closingTime']
+    )
+
+    # Create event as admin (admin uses their own userId)
+    # Admin uses the speaker endpoint but with admin token - this auto-publishes the event
+    url = f"{EVENT_API_URL}/speaker/events"
+    headers = {
+        "Authorization": f"Bearer {admin_token}",
+        "Content-Type": "application/json"
+    }
+    payload = {
+        "name": event_name,
+        "description": description,
+        "category": category,
+        "venueId": venue['id'],
+        "bookingStartDate": start_date.isoformat(),
+        "bookingEndDate": end_date.isoformat(),
+        "userId": admin_user_id  # Admin creates event with their own userId
+    }
+
+    try:
+        response = requests.post(url, json=payload, headers=headers, timeout=10)
+
+        if response.status_code == 201:
+            data = response.json()
+            event = data.get('data', {})
+            status = event.get('status', 'UNKNOWN')
+            print_success(f"Created event: {event_name} (status: {status}, created by admin)")
+            return event
+        else:
+            try:
+                error_data = response.json()
+                error_msg = error_data.get('error', response.text)
+                print_error(f"Failed to create event '{event_name}': HTTP {response.status_code} - {error_msg}")
+            except:
+                print_error(f"Failed to create event '{event_name}': HTTP {response.status_code}")
+            return None
+
+    except Exception as e:
+        print_error(f"Error creating event '{event_name}': {str(e)}")
+        return None
+
+
+def seed_events(admin_token: str, admin_user_id: str, num_events: int = 8) -> List[Dict]:
+    """
+    Seed events by creating them as admin (admin is the creator)
+
+    Args:
+        admin_token: Admin authentication token
+        admin_user_id: Admin user ID
+        num_events: Number of events to create
+
+    Returns:
+        List of created event dictionaries
+    """
+    from .utils import print_header
+
+    print()
+    print_header("Step 4: Creating Events")
+    print("-" * 50)
+
+    # Fetch available venues
+    print_info("Fetching available venues...")
+    venues = get_venues(admin_token)
+
+    if not venues:
+        print_error("No venues available. Please seed venues first.")
+        return []
+
+    print_success(f"Found {len(venues)} venues")
+    print_info(f"Creating events as admin (user ID: {admin_user_id[:8]}...)")
+
+    # Event categories
+    categories = [
+        "Technology", "Business", "Education", "Arts & Culture",
+        "Health & Wellness", "Science", "Entertainment", "Networking"
+    ]
+
+    # Generate creative event names using Faker
+    created_events = []
+
+    for i in range(num_events):
+        # Pick random venue
+        venue = random.choice(venues)
+
+        # Generate creative event name
+        event_name = fake.catch_phrase() + " " + fake.bs().title()
+        # Ensure it's not too long
+        if len(event_name) > 80:
+            event_name = event_name[:77] + "..."
+
+        # Generate description
+        description = fake.text(max_nb_chars=200)
+
+        # Pick category
+        category = random.choice(categories)
+
+        print_step(f"Creating event {i+1}/{num_events}: {event_name}")
+        print_info(f"  Venue: {venue['name']}")
+        print_info(f"  Category: {category}")
+
+        event = create_event(
+            admin_token=admin_token,
+            admin_user_id=admin_user_id,
+            venue=venue,
+            event_name=event_name,
+            description=description,
+            category=category
+        )
+
+        if event:
+            created_events.append(event)
+
+    print()
+    print_success(f"Created {len(created_events)} events")
+    return created_events
+
diff --git a/scripts/modules/user_seeding.py b/scripts/modules/user_seeding.py
new file mode 100644
index 0000000..73ccb1a
--- /dev/null
+++ b/scripts/modules/user_seeding.py
@@ -0,0 +1,296 @@
+"""
+User and Speaker Seeding Module
+"""
+import time
+import requests
+from typing import Optional, Tuple, List, Dict
+from .utils import (
+    AUTH_API_URL, ADMIN_EMAIL, ADMIN_PASSWORD,
+    print_success, print_error, print_info, print_step
+)
+
+
+def get_user_id_by_login(email: str, password: str) -> Optional[str]:
+    """
+    Get user ID by logging in with email and password
+
+    Args:
+        email: User email
+        password: User password
+
+    Returns:
+        User ID if login successful, None otherwise
+    """
+    url = f"{AUTH_API_URL}/login"
+    payload = {
+        "email": email,
+        "password": password
+    }
+
+    try:
+        response = requests.post(url, json=payload, timeout=10)
+        if response.status_code == 200:
+            data = response.json()
+            user_id = data.get('user', {}).get('id', '')
+            return user_id
+        return None
+    except:
+        return None
+
+
+def register_user(email: str, password: str, name: str, role: str) -> Tuple[bool, Optional[str], Optional[int]]:
+    """
+    Register a user via HTTP POST to /api/auth/register
+    If user already exists, attempts to get their user_id via login
+
+    Args:
+        email: User email
+        password: User password
+        name: User name
+        role: User role (USER or SPEAKER)
+
+    Returns:
+        Tuple of (success: bool, user_id: Optional[str], http_status: Optional[int])
+    """
+    print_step(f"Registering {role}: {name} ({email})")
+
+    url = f"{AUTH_API_URL}/register"
+    payload = {
+        "email": email,
+        "password": password,
+        "name": name,
+        "role": role
+    }
+
+    try:
+        response = requests.post(url, json=payload, timeout=10)
+        http_status = response.status_code
+
+        if http_status == 201:
+            data = response.json()
+            user_id = data.get('user', {}).get('id', '')
+            print_success(f"Registered {role}: {name}")
+            return True, user_id, http_status
+
+        elif http_status == 400:
+            try:
+                error_data = response.json()
+                error_msg = error_data.get('error', '')
+
+                if 'already exists' in error_msg.lower() or 'User with this email already exists' in error_msg:
+                    print_info(f"User {email} already exists, fetching user ID...")
+                    # Try to get user_id by logging in
+                    user_id = get_user_id_by_login(email, password)
+                    if user_id:
+                        print_success(f"Found existing {role}: {name} (ID: {user_id[:8]}...)")
+                        return True, user_id, http_status
+                    else:
+                        print_info(f"Could not get user ID for {email} (may need activation)")
+                        # Still return success so we can add email to activation list
+                        return True, None, http_status
+                else:
+                    print_error(f"Failed to register {email}: {error_msg}")
+                    return False, None, http_status
+            except:
+                print_error(f"Failed to register {email}: {response.text}")
+                return False, None, http_status
+
+        elif http_status == 502:
+            print_error(f"Bad Gateway (502) - nginx cannot reach auth-service")
+            print_error(f"Failed to register {email}")
+            return False, None, http_status
+
+        elif http_status == 503:
+            print_error(f"Service Unavailable (503) - auth-service may be starting up")
+            print_info("Wait a few seconds and try again")
+            return False, None, http_status
+
+        else:
+            try:
+                error_data = response.json()
+                error_msg = error_data.get('error', response.text)
+                print_error(f"Failed to register {email}: HTTP {http_status} - {error_msg}")
+            except:
+                print_error(f"Failed to register {email}: HTTP {http_status}")
+            return False, None, http_status
+
+    except requests.exceptions.ConnectionError:
+        print_error(f"Connection error - cannot reach {url}")
+        return False, None, None
+
+    except requests.exceptions.Timeout:
+        print_error(f"Request timeout - server took too long to respond")
+        return False, None, None
+
+    except Exception as e:
+        print_error(f"Error registering {email}: {str(e)}")
+        return False, None, None
+
+
+def login_admin() -> Tuple[bool, Optional[str], Optional[str]]:
+    """
+    Login as admin to get authentication token and user ID
+
+    Returns:
+        Tuple of (success: bool, token: Optional[str], user_id: Optional[str])
+    """
+    print_info(f"Logging in as admin ({ADMIN_EMAIL})...")
+
+    url = f"{AUTH_API_URL}/login"
+    payload = {
+        "email": ADMIN_EMAIL,
+        "password": ADMIN_PASSWORD
+    }
+
+    try:
+        response = requests.post(url, json=payload, timeout=10)
+        http_status = response.status_code
+
+        if http_status == 200:
+            data = response.json()
+            token = data.get('token', '')
+            user_id = data.get('user', {}).get('id', '')
+            if token:
+                print_success("Admin login successful")
+                return True, token, user_id
+            else:
+                print_error("No token received from login")
+                return False, None, None
+        elif http_status == 401:
+            print_error("Admin login failed: Invalid credentials")
+            print_info(f"Please check ADMIN_EMAIL and ADMIN_PASSWORD environment variables")
+            print_info(f"Current admin email: {ADMIN_EMAIL}")
+            print_info(f"Expected password from seed: Admin123!")
+            return False, None, None
+        else:
+            try:
+                error_data = response.json()
+                error_msg = error_data.get('error', response.text)
+                print_error(f"Admin login failed: HTTP {http_status} - {error_msg}")
+            except:
+                print_error(f"Admin login failed: HTTP {http_status}")
+            return False, None, None
+
+    except requests.exceptions.ConnectionError:
+        print_error(f"Connection error - cannot reach {url}")
+        return False, None, None
+    except Exception as e:
+        print_error(f"Error during admin login: {str(e)}")
+        return False, None, None
+
+
+def activate_users_via_api(user_emails: List[str], admin_token: str) -> bool:
+    """
+    Activate users via protected API endpoint (requires admin authentication)
+
+    Args:
+        user_emails: List of email addresses to activate
+        admin_token: JWT token from admin login
+
+    Returns:
+        True if successful, False otherwise
+    """
+    if not user_emails:
+        print_info("No user emails to activate")
+        return False
+
+    print_info(f"Activating {len(user_emails)} users via API...")
+
+    url = f"{AUTH_API_URL}/admin/activate-users"
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {admin_token}"
+    }
+    payload = {
+        "emails": user_emails
+    }
+
+    try:
+        response = requests.post(url, json=payload, headers=headers, timeout=10)
+        http_status = response.status_code
+
+        if http_status == 200:
+            data = response.json()
+            activated = data.get('activated', 0)
+            not_found = data.get('notFound', 0)
+
+            print_success(f"Activated {activated} user(s) via API")
+            if not_found > 0:
+                print_info(f"{not_found} user(s) not found (may have been already activated)")
+            return True
+        elif http_status == 401:
+            print_error("Authentication failed - invalid admin token")
+            return False
+        elif http_status == 403:
+            print_error("Authorization failed - admin access required")
+            return False
+        else:
+            try:
+                error_data = response.json()
+                error_msg = error_data.get('error', response.text)
+                print_error(f"Activation failed: HTTP {http_status} - {error_msg}")
+            except:
+                print_error(f"Activation failed: HTTP {http_status}")
+            return False
+
+    except requests.exceptions.ConnectionError:
+        print_error(f"Connection error - cannot reach {url}")
+        return False
+    except Exception as e:
+        print_error(f"Error activating users: {str(e)}")
+        return False
+
+
+def seed_users_and_speakers(admin_token: Optional[str] = None) -> Tuple[List[Dict], List[Dict], List[str], bool]:
+    """
+    Seed users and speakers
+
+    Returns:
+        Tuple of (speakers list, users list, all_emails list, got_502_errors bool)
+    """
+    speakers = []
+    users = []
+    all_user_emails = []
+    got_502_errors = False
+
+    # Register Speakers
+    print()
+    from .utils import print_header
+    print_header("Step 1: Registering Speakers")
+    print("-" * 50)
+
+    for i in range(1, 6):
+        email = f"speaker{i}@test.com"
+        password = f"Speaker{i}123!"
+        name = f"Speaker {i}"
+
+        success, user_id, status = register_user(email, password, name, "SPEAKER")
+        if status == 502:
+            got_502_errors = True
+        if success:
+            all_user_emails.append(email)
+            # Add to speakers list even if user_id is None (user already exists)
+            speakers.append({"email": email, "user_id": user_id})
+        time.sleep(0.2)
+
+    # Register Regular Users
+    print()
+    print_header("Step 2: Registering Regular Users")
+    print("-" * 50)
+
+    for i in range(1, 11):
+        email = f"user{i}@test.com"
+        password = f"User{i}123!"
+        name = f"User {i}"
+
+        success, user_id, status = register_user(email, password, name, "USER")
+        if status == 502:
+            got_502_errors = True
+        if success:
+            all_user_emails.append(email)
+            # Add to users list even if user_id is None (user already exists)
+            users.append({"email": email, "user_id": user_id})
+        time.sleep(0.2)
+
+    return speakers, users, all_user_emails, got_502_errors
+
diff --git a/scripts/modules/utils.py b/scripts/modules/utils.py
new file mode 100644
index 0000000..f5f9061
--- /dev/null
+++ b/scripts/modules/utils.py
@@ -0,0 +1,41 @@
+"""
+Utility functions for seeding script
+"""
+import os
+from typing import Optional
+
+# Configuration
+AUTH_API_URL = os.getenv('AUTH_API_URL', 'http://localhost/api/auth')
+SPEAKER_API_URL = os.getenv('SPEAKER_API_URL', 'http://localhost/api/speakers')
+EVENT_API_URL = os.getenv('EVENT_API_URL', 'http://localhost/api/event')
+BOOKING_API_URL = os.getenv('BOOKING_API_URL', 'http://localhost/api/booking')
+
+# Admin credentials
+ADMIN_EMAIL = os.getenv('ADMIN_EMAIL', 'admin@eventmanagement.com')
+ADMIN_PASSWORD = os.getenv('ADMIN_PASSWORD', 'Admin123!')
+
+# Colors for terminal output
+class Colors:
+    RED = '\033[0;31m'
+    GREEN = '\033[0;32m'
+    YELLOW = '\033[1;33m'
+    BLUE = '\033[0;34m'
+    MAGENTA = '\033[0;35m'
+    CYAN = '\033[0;36m'
+    RESET = '\033[0m'
+
+def print_success(message: str):
+    print(f"{Colors.GREEN}✅ {message}{Colors.RESET}")
+
+def print_error(message: str):
+    print(f"{Colors.RED}❌ {message}{Colors.RESET}")
+
+def print_info(message: str):
+    print(f"{Colors.YELLOW}ℹ️  {message}{Colors.RESET}")
+
+def print_header(message: str):
+    print(f"{Colors.BLUE}{message}{Colors.RESET}")
+
+def print_step(message: str):
+    print(f"{Colors.CYAN}→ {message}{Colors.RESET}")
+
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
new file mode 100644
index 0000000..6b266af
--- /dev/null
+++ b/scripts/requirements.txt
@@ -0,0 +1,15 @@
+# Requirements for seed.py script
+#
+# Install dependencies:
+#   pip install -r scripts/requirements.txt
+#
+# Or install individually:
+#   pip install requests                # Required for HTTP API calls
+#   pip install faker                   # Required for generating creative event names
+
+# Required: HTTP library for API requests
+requests>=2.28.0
+
+# Required: Library for generating creative event names
+faker>=18.0.0
+
diff --git a/scripts/seed.py b/scripts/seed.py
new file mode 100644
index 0000000..413fc19
--- /dev/null
+++ b/scripts/seed.py
@@ -0,0 +1,218 @@
+#!/usr/bin/env python3
+"""
+Complete Seeding Script for Event Management System
+
+This script seeds:
+1. Users and Speakers (via auth-service)
+2. Activates users (via admin API)
+3. Creates events (via event-service, assigned to speakers)
+4. Creates bookings/registrations (via booking-service)
+
+Usage:
+    python3 scripts/seed.py
+
+    # With custom API URLs
+    AUTH_API_URL=http://localhost:3000/api/auth python3 scripts/seed.py
+"""
+import os
+import sys
+import time
+
+try:
+    import requests
+except ImportError:
+    print("Error: 'requests' library is required but not installed.")
+    print("Please install it using: pip install requests")
+    sys.exit(1)
+
+try:
+    from faker import Faker
+except ImportError:
+    print("Error: 'faker' library is required but not installed.")
+    print("Please install it using: pip install faker")
+    sys.exit(1)
+
+# Import modules
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from modules import utils
+from modules.user_seeding import (
+    login_admin, activate_users_via_api, seed_users_and_speakers
+)
+from modules.event_seeding import seed_events
+from modules.booking_seeding import seed_bookings
+
+
+def test_api_connectivity() -> bool:
+    """Test if the API is reachable before starting"""
+    utils.print_info(f"Testing API connectivity to {utils.AUTH_API_URL}...")
+
+    # Try health endpoint first
+    try:
+        health_url = f"{utils.AUTH_API_URL}/health"
+        response = requests.get(health_url, timeout=5)
+        if response.status_code in [200, 404]:
+            utils.print_success("API is reachable (health check)")
+            return True
+    except:
+        pass
+
+    # Fallback: try register endpoint
+    try:
+        test_url = f"{utils.AUTH_API_URL}/register"
+        response = requests.post(
+            test_url,
+            json={"email": "test@test.com", "password": "test123!", "name": "Test", "role": "USER"},
+            timeout=5
+        )
+        if response.status_code in [201, 400, 500]:
+            utils.print_success("API is reachable (register endpoint accessible)")
+            return True
+        elif response.status_code == 502:
+            utils.print_error("Cannot connect to auth-service (502 Bad Gateway)")
+            return False
+    except requests.exceptions.ConnectionError:
+        utils.print_error(f"Cannot connect to {utils.AUTH_API_URL}")
+        return False
+    except:
+        pass
+
+    utils.print_info("Could not verify API connectivity, but will attempt to proceed...")
+    return True
+
+
+def main():
+    """Main execution function"""
+    utils.print_header("=" * 60)
+    utils.print_header("  Event Management System - Complete Seeding Script")
+    utils.print_header("=" * 60)
+    print()
+
+    # Test connectivity
+    if not test_api_connectivity():
+        print()
+        utils.print_error("API connectivity test failed")
+        print()
+        utils.print_info("Troubleshooting steps:")
+        utils.print_info("  1. Ensure the API server is running")
+        utils.print_info("  2. Check the API URLs are correct")
+        utils.print_info("  3. If using Docker: docker ps | grep -E 'auth-service|event-service|booking-service'")
+        print()
+        response = input("Continue anyway? (y/N): ")
+        if response.lower() != 'y':
+            sys.exit(1)
+        print()
+
+    # Step 0: Verify Admin Login
+    utils.print_header("Step 0: Verifying Admin Credentials")
+    print("-" * 60)
+    utils.print_info("Checking admin credentials before starting...")
+
+    login_success, admin_token, admin_user_id = login_admin()
+    if not login_success or not admin_token or not admin_user_id:
+        utils.print_error("Admin login failed - cannot proceed")
+        print()
+        utils.print_error("Please ensure:")
+        utils.print_error("  1. An admin user exists (seed via: cd ems-services/auth-service && npx prisma db seed)")
+        utils.print_error("  2. ADMIN_EMAIL and ADMIN_PASSWORD are set correctly")
+        print()
+        utils.print_info("Default admin credentials from seed file:")
+        utils.print_info("  Email: admin@eventmanagement.com")
+        utils.print_info("  Password: Admin123!")
+        print()
+        sys.exit(1)
+
+    utils.print_success("Admin credentials verified")
+    print()
+
+    # Step 1-2: Seed Users and Speakers
+    speakers, users, all_user_emails, got_502_errors = seed_users_and_speakers(admin_token)
+
+    if got_502_errors:
+        print()
+        utils.print_error("⚠️  502 Bad Gateway Errors Detected")
+        utils.print_error("The nginx gateway is reachable, but it cannot connect to auth-service.")
+        utils.print_info("Please ensure auth-service is running: docker ps | grep auth-service")
+        print()
+
+    # Step 3: Wait for RabbitMQ Processing
+    utils.print_header("Step 3: Waiting for RabbitMQ Processing")
+    print("-" * 60)
+    utils.print_info("Waiting 5 seconds for RabbitMQ to process speaker profile creation messages...")
+    time.sleep(5)
+
+    # Step 4: Activate Users
+    utils.print_header("Step 4: Activating Users via API")
+    print("-" * 60)
+    if all_user_emails and admin_token:
+        activate_users_via_api(all_user_emails, admin_token)
+    else:
+        if not all_user_emails:
+            utils.print_info("No users created, skipping activation")
+        elif not admin_token:
+            utils.print_error("Cannot activate users - admin token not available")
+
+    # Step 5: Create Events
+    if admin_token and admin_user_id:
+        events = seed_events(admin_token, admin_user_id, num_events=8)
+        # Wait a moment for events to be fully processed
+        time.sleep(2)
+    else:
+        utils.print_error("Cannot create events - admin token or user ID not available")
+        events = []
+
+    # Step 6: Create Bookings
+    if events and users:
+        seed_bookings(events, users)
+    else:
+        if not events:
+            utils.print_info("Skipping bookings - no events created")
+        if not users:
+            utils.print_info("Skipping bookings - no users available")
+
+    # Summary
+    print()
+    utils.print_header("=" * 60)
+    utils.print_success("Seeding Complete!")
+    utils.print_header("=" * 60)
+    print()
+
+    utils.print_info("Summary:")
+    if got_502_errors:
+        utils.print_error("  ⚠️  Some registrations may have failed due to 502 Bad Gateway errors")
+    else:
+        utils.print_success(f"  ✓ {len(speakers)} Speakers registered")
+        utils.print_success(f"  ✓ {len(users)} Users registered")
+        if events:
+            utils.print_success(f"  ✓ {len(events)} Events created and published")
+        if users and events:
+            utils.print_info("  ✓ Users registered for events")
+
+    print()
+    utils.print_info("Important Notes:")
+    if admin_token:
+        utils.print_success("  ✓ Users have been activated via API (emailVerified set, isActive=true)")
+        utils.print_info("  ✓ Users can now login without email verification")
+    utils.print_info("  ✓ Speaker profiles are created automatically via RabbitMQ")
+    utils.print_info("  ✓ Events are auto-published when created by admin")
+    utils.print_info("  ✓ Admin users should be seeded via: cd ems-services/auth-service && npx prisma db seed")
+    print()
+
+    utils.print_info("Credentials Created:")
+    utils.print_info("  Speakers: speaker1@test.com to speaker5@test.com (Password: Speaker[N]123!)")
+    utils.print_info("  Users: user1@test.com to user10@test.com (Password: User[N]123!)")
+    print()
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except KeyboardInterrupt:
+        print()
+        utils.print_error("Script interrupted by user")
+        sys.exit(1)
+    except Exception as e:
+        utils.print_error(f"Unexpected error: {str(e)}")
+        import traceback
+        traceback.print_exc()
+        sys.exit(1)
+