docs(job-queue-dependencies): add documentation for job queue setup and configuration

- Created a new document detailing the dependencies required for the job queue implementation using Bull and IORedis. - Included installation instructions, Redis setup, environment variable configuration, and usage examples for the RecurringTasksService. - Highlighted the benefits of using job queues over cron jobs and provided monitoring options for job queues.
feat(recurring-tasks): implement recurring tasks service with timezone support and notifications
2025-07-20 19:16:24 +05:30 · 2025-07-20 19:16:03 +05:30
498 changed files with 4452 additions and 3000 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(npm run build:*)",
+      "Bash(npm run type-check:*)",
+      "Bash(npm run:*)"
+    ],
+    "deny": []
+  }
+}
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,6 @@ lerna-debug.log*
 .vscode/*
 !.vscode/extensions.json
 .idea/
-.cursor/
-.claude/
 .DS_Store
 *.suo
 *.ntvs*
--- a/docs/job-queue-dependencies.md
+++ b/docs/job-queue-dependencies.md
@@ -0,0 +1,111 @@
+# Job Queue Dependencies
+
+To use the job queue implementation for recurring tasks, add these dependencies to your package.json:
+
+```json
+{
+  "dependencies": {
+    "bull": "^4.12.2",
+    "ioredis": "^5.3.2"
+  },
+  "devDependencies": {
+    "@types/bull": "^4.10.0"
+  }
+}
+```
+
+## Installation
+
+```bash
+npm install bull ioredis
+npm install --save-dev @types/bull
+```
+
+## Redis Setup
+
+1. Install Redis on your system:
+   - **Ubuntu/Debian**: `sudo apt install redis-server`
+   - **macOS**: `brew install redis`
+   - **Windows**: Use WSL or Redis for Windows
+   - **Docker**: `docker run -d -p 6379:6379 redis:alpine`
+
+2. Configure Redis connection in your environment variables:
+   ```env
+   REDIS_HOST=localhost
+   REDIS_PORT=6379
+   REDIS_PASSWORD=your_password  # Optional
+   REDIS_DB=0
+   ```
+
+## Configuration
+
+Add these environment variables to control the recurring tasks behavior:
+
+```env
+# Service configuration
+RECURRING_TASKS_ENABLED=true
+RECURRING_TASKS_MODE=queue  # or 'cron'
+
+# Queue configuration
+RECURRING_TASKS_MAX_CONCURRENCY=5
+RECURRING_TASKS_RETRY_ATTEMPTS=3
+RECURRING_TASKS_RETRY_DELAY=2000
+
+# Notifications
+RECURRING_TASKS_NOTIFICATIONS_ENABLED=true
+RECURRING_TASKS_EMAIL_NOTIFICATIONS=true
+RECURRING_TASKS_PUSH_NOTIFICATIONS=true
+RECURRING_TASKS_IN_APP_NOTIFICATIONS=true
+
+# Audit logging
+RECURRING_TASKS_AUDIT_LOG_ENABLED=true
+RECURRING_TASKS_AUDIT_RETENTION_DAYS=90
+```
+
+## Usage
+
+In your main application file, start the service:
+
+```typescript
+import { RecurringTasksService } from './src/services/recurring-tasks-service';
+
+// Start the service
+await RecurringTasksService.start();
+
+// Get status
+const status = await RecurringTasksService.getStatus();
+console.log('Recurring tasks status:', status);
+
+// Health check
+const health = await RecurringTasksService.healthCheck();
+console.log('Health check:', health);
+```
+
+## Benefits of Job Queue vs Cron
+
+### Job Queue (Bull/BullMQ) Benefits:
+- **Better scalability**: Can run multiple workers
+- **Retry logic**: Built-in retry with exponential backoff
+- **Monitoring**: Redis-based job monitoring and UI
+- **Priority queues**: Handle urgent tasks first
+- **Rate limiting**: Control processing rate
+- **Persistence**: Jobs survive server restarts
+
+### Cron Job Benefits:
+- **Simplicity**: No external dependencies
+- **Lower resource usage**: No Redis required
+- **Predictable timing**: Runs exactly on schedule
+- **Easier debugging**: Simpler execution model
+
+## Monitoring
+
+You can monitor the job queues using:
+- **Bull Dashboard**: Web UI for monitoring jobs
+- **Redis CLI**: Direct Redis monitoring
+- **Application logs**: Built-in audit logging
+- **Health checks**: Built-in health check endpoint
+
+Install Bull Dashboard for monitoring:
+```bash
+npm install -g bull-board
+```
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,5 +2,385 @@
  "name": "worklenz",
  "lockfileVersion": 3,
  "requires": true,
-  "packages": {}
+  "packages": {
+    "": {
+      "dependencies": {
+        "bull": "^4.16.5",
+        "ioredis": "^5.6.1"
+      },
+      "devDependencies": {
+        "@types/bull": "^3.15.9"
+      }
+    },
+    "node_modules/@ioredis/commands": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz",
+      "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==",
+      "license": "MIT"
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/bull": {
+      "version": "3.15.9",
+      "resolved": "https://registry.npmjs.org/@types/bull/-/bull-3.15.9.tgz",
+      "integrity": "sha512-MPUcyPPQauAmynoO3ezHAmCOhbB0pWmYyijr/5ctaCqhbKWsjW0YCod38ZcLzUBprosfZ9dPqfYIcfdKjk7RNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ioredis": "*",
+        "@types/redis": "^2.8.0"
+      }
+    },
+    "node_modules/@types/ioredis": {
+      "version": "4.28.10",
+      "resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.28.10.tgz",
+      "integrity": "sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "24.0.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.15.tgz",
+      "integrity": "sha512-oaeTSbCef7U/z7rDeJA138xpG3NuKc64/rZ2qmUFkFJmnMsAPaluIifqyWd8hSSMxyP9oie3dLAqYPblag9KgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.8.0"
+      }
+    },
+    "node_modules/@types/redis": {
+      "version": "2.8.32",
+      "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz",
+      "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/bull": {
+      "version": "4.16.5",
+      "resolved": "https://registry.npmjs.org/bull/-/bull-4.16.5.tgz",
+      "integrity": "sha512-lDsx2BzkKe7gkCYiT5Acj02DpTwDznl/VNN7Psn7M3USPG7Vs/BaClZJJTAG+ufAR9++N1/NiUTdaFBWDIl5TQ==",
+      "license": "MIT",
+      "dependencies": {
+        "cron-parser": "^4.9.0",
+        "get-port": "^5.1.1",
+        "ioredis": "^5.3.2",
+        "lodash": "^4.17.21",
+        "msgpackr": "^1.11.2",
+        "semver": "^7.5.2",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cluster-key-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cron-parser": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
+      "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "luxon": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/denque": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
+      "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/get-port": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
+      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ioredis": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
+      "integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
+      "license": "MIT",
+      "dependencies": {
+        "@ioredis/commands": "^1.1.1",
+        "cluster-key-slot": "^1.1.0",
+        "debug": "^4.3.4",
+        "denque": "^2.1.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.isarguments": "^3.1.0",
+        "redis-errors": "^1.2.0",
+        "redis-parser": "^3.0.0",
+        "standard-as-callback": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ioredis"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "license": "MIT"
+    },
+    "node_modules/luxon": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
+      "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/msgpackr": {
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.5.tgz",
+      "integrity": "sha512-UjkUHN0yqp9RWKy0Lplhh+wlpdt9oQBYgULZOiFhV3VclSF1JnSQWZ5r9gORQlNYaUKQoR8itv7g7z1xDDuACA==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
+    },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
+    "node_modules/redis-errors": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz",
+      "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/redis-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz",
+      "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==",
+      "license": "MIT",
+      "dependencies": {
+        "redis-errors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/standard-as-callback": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
+      "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
+      "license": "MIT"
+    },
+    "node_modules/undici-types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    }
+  }
 }
--- a/package.json
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "bull": "^4.16.5",
+    "ioredis": "^5.6.1"
+  },
+  "devDependencies": {
+    "@types/bull": "^3.15.9"
+  }
+}
--- a/worklenz-backend/database/pg-migrations/README.md
+++ b/worklenz-backend/database/pg-migrations/README.md
@@ -1,72 +0,0 @@
-# Node-pg-migrate Migrations
-
-This directory contains database migrations managed by node-pg-migrate.
-
-## Migration Commands
-
- `npm run migrate:create -- migration-name` - Create a new migration file
- `npm run migrate:up` - Run all pending migrations
- `npm run migrate:down` - Rollback the last migration
- `npm run migrate:redo` - Rollback and re-run the last migration
-
-## Migration File Format
-
-Migrations are JavaScript files with timestamp prefixes (e.g., `20250115000000_performance-indexes.js`).
-
-Each migration file exports two functions:
- `exports.up` - Contains the forward migration logic
- `exports.down` - Contains the rollback logic
-
-## Best Practices
-
-1. **Always use IF EXISTS/IF NOT EXISTS checks** to make migrations idempotent
-2. **Test migrations locally** before deploying to production
-3. **Include rollback logic** in the `down` function for all changes
-4. **Use descriptive names** for migration files
-5. **Keep migrations focused** - one logical change per migration
-
-## Example Migration
-
-```javascript
-exports.up = pgm => {
-  // Create table with IF NOT EXISTS
-  pgm.createTable('users', {
-    id: 'id',
-    name: { type: 'varchar(100)', notNull: true },
-    created_at: {
-      type: 'timestamp',
-      notNull: true,
-      default: pgm.func('current_timestamp')
-    }
-  }, { ifNotExists: true });
-
-  // Add index with IF NOT EXISTS
-  pgm.createIndex('users', 'name', {
-    name: 'idx_users_name',
-    ifNotExists: true
-  });
-};
-
-exports.down = pgm => {
-  // Drop in reverse order
-  pgm.dropIndex('users', 'name', { 
-    name: 'idx_users_name', 
-    ifExists: true 
-  });
-  
-  pgm.dropTable('users', { ifExists: true });
-};
-```
-
-## Migration History
-
-The `pgmigrations` table tracks which migrations have been run. Do not modify this table manually.
-
-## Converting from SQL Migrations
-
-When converting SQL migrations to node-pg-migrate format:
-
-1. Wrap SQL statements in `pgm.sql()` calls
-2. Use node-pg-migrate helper methods where possible (createTable, addColumns, etc.)
-3. Always include `IF EXISTS/IF NOT EXISTS` checks
-4. Ensure proper rollback logic in the `down` function
--- a/worklenz-backend/database/sql/functions/create_bulk_recurring_tasks.sql
+++ b/worklenz-backend/database/sql/functions/create_bulk_recurring_tasks.sql
@@ -0,0 +1,185 @@
+-- Function to create multiple recurring tasks in bulk
+CREATE OR REPLACE FUNCTION create_bulk_recurring_tasks(
+    p_tasks JSONB
+)
+RETURNS TABLE (
+    task_id UUID,
+    task_name TEXT,
+    created BOOLEAN,
+    error_message TEXT
+) AS $$
+DECLARE
+    v_task JSONB;
+    v_task_id UUID;
+    v_existing_id UUID;
+    v_error_message TEXT;
+BEGIN
+    -- Create a temporary table to store results
+    CREATE TEMP TABLE IF NOT EXISTS bulk_task_results (
+        task_id UUID,
+        task_name TEXT,
+        created BOOLEAN,
+        error_message TEXT
+    ) ON COMMIT DROP;
+
+    -- Iterate through each task in the array
+    FOR v_task IN SELECT * FROM jsonb_array_elements(p_tasks)
+    LOOP
+        BEGIN
+            -- Check if task already exists for this schedule and date
+            SELECT id INTO v_existing_id
+            FROM tasks
+            WHERE schedule_id = (v_task->>'schedule_id')::UUID
+              AND end_date::DATE = (v_task->>'end_date')::DATE
+            LIMIT 1;
+
+            IF v_existing_id IS NOT NULL THEN
+                -- Task already exists
+                INSERT INTO bulk_task_results (task_id, task_name, created, error_message)
+                VALUES (v_existing_id, v_task->>'name', FALSE, 'Task already exists for this date');
+            ELSE
+                -- Create the task using existing function
+                SELECT (create_quick_task(v_task::TEXT)::JSONB)->>'id' INTO v_task_id;
+                
+                IF v_task_id IS NOT NULL THEN
+                    INSERT INTO bulk_task_results (task_id, task_name, created, error_message)
+                    VALUES (v_task_id::UUID, v_task->>'name', TRUE, NULL);
+                ELSE
+                    INSERT INTO bulk_task_results (task_id, task_name, created, error_message)
+                    VALUES (NULL, v_task->>'name', FALSE, 'Failed to create task');
+                END IF;
+            END IF;
+            
+        EXCEPTION WHEN OTHERS THEN
+            -- Capture any errors
+            v_error_message := SQLERRM;
+            INSERT INTO bulk_task_results (task_id, task_name, created, error_message)
+            VALUES (NULL, v_task->>'name', FALSE, v_error_message);
+        END;
+    END LOOP;
+
+    -- Return all results
+    RETURN QUERY SELECT * FROM bulk_task_results;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Function to bulk assign team members to tasks
+CREATE OR REPLACE FUNCTION bulk_assign_team_members(
+    p_assignments JSONB
+)
+RETURNS TABLE (
+    task_id UUID,
+    team_member_id UUID,
+    assigned BOOLEAN,
+    error_message TEXT
+) AS $$
+DECLARE
+    v_assignment JSONB;
+    v_result RECORD;
+BEGIN
+    CREATE TEMP TABLE IF NOT EXISTS bulk_assignment_results (
+        task_id UUID,
+        team_member_id UUID,
+        assigned BOOLEAN,
+        error_message TEXT
+    ) ON COMMIT DROP;
+
+    FOR v_assignment IN SELECT * FROM jsonb_array_elements(p_assignments)
+    LOOP
+        BEGIN
+            -- Check if assignment already exists
+            IF EXISTS (
+                SELECT 1 FROM tasks_assignees
+                WHERE task_id = (v_assignment->>'task_id')::UUID
+                  AND team_member_id = (v_assignment->>'team_member_id')::UUID
+            ) THEN
+                INSERT INTO bulk_assignment_results
+                VALUES (
+                    (v_assignment->>'task_id')::UUID,
+                    (v_assignment->>'team_member_id')::UUID,
+                    FALSE,
+                    'Assignment already exists'
+                );
+            ELSE
+                -- Create the assignment
+                INSERT INTO tasks_assignees (task_id, team_member_id, assigned_by)
+                VALUES (
+                    (v_assignment->>'task_id')::UUID,
+                    (v_assignment->>'team_member_id')::UUID,
+                    (v_assignment->>'assigned_by')::UUID
+                );
+                
+                INSERT INTO bulk_assignment_results
+                VALUES (
+                    (v_assignment->>'task_id')::UUID,
+                    (v_assignment->>'team_member_id')::UUID,
+                    TRUE,
+                    NULL
+                );
+            END IF;
+        EXCEPTION WHEN OTHERS THEN
+            INSERT INTO bulk_assignment_results
+            VALUES (
+                (v_assignment->>'task_id')::UUID,
+                (v_assignment->>'team_member_id')::UUID,
+                FALSE,
+                SQLERRM
+            );
+        END;
+    END LOOP;
+
+    RETURN QUERY SELECT * FROM bulk_assignment_results;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Function to bulk assign labels to tasks
+CREATE OR REPLACE FUNCTION bulk_assign_labels(
+    p_label_assignments JSONB
+)
+RETURNS TABLE (
+    task_id UUID,
+    label_id UUID,
+    assigned BOOLEAN,
+    error_message TEXT
+) AS $$
+DECLARE
+    v_assignment JSONB;
+    v_labels JSONB;
+BEGIN
+    CREATE TEMP TABLE IF NOT EXISTS bulk_label_results (
+        task_id UUID,
+        label_id UUID,
+        assigned BOOLEAN,
+        error_message TEXT
+    ) ON COMMIT DROP;
+
+    FOR v_assignment IN SELECT * FROM jsonb_array_elements(p_label_assignments)
+    LOOP
+        BEGIN
+            -- Use existing function to add label
+            SELECT add_or_remove_task_label(
+                (v_assignment->>'task_id')::UUID,
+                (v_assignment->>'label_id')::UUID
+            ) INTO v_labels;
+            
+            INSERT INTO bulk_label_results
+            VALUES (
+                (v_assignment->>'task_id')::UUID,
+                (v_assignment->>'label_id')::UUID,
+                TRUE,
+                NULL
+            );
+        EXCEPTION WHEN OTHERS THEN
+            INSERT INTO bulk_label_results
+            VALUES (
+                (v_assignment->>'task_id')::UUID,
+                (v_assignment->>'label_id')::UUID,
+                FALSE,
+                SQLERRM
+            );
+        END;
+    END LOOP;
+
+    RETURN QUERY SELECT * FROM bulk_label_results;
+END;
+$$ LANGUAGE plpgsql;
--- a/worklenz-backend/database/sql/indexes.sql
+++ b/worklenz-backend/database/sql/indexes.sql
@@ -132,139 +132,3 @@ CREATE INDEX IF NOT EXISTS projects_team_id_index
 CREATE INDEX IF NOT EXISTS projects_team_id_name_index
    ON projects (team_id, name);

-- Performance indexes for optimized tasks queries
-- From migration: 20250115000000-performance-indexes.sql
-
-- Composite index for main task filtering
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_project_archived_parent 
-ON tasks(project_id, archived, parent_task_id) 
-WHERE archived = FALSE;
-
-- Index for status joins
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_status_project 
-ON tasks(status_id, project_id) 
-WHERE archived = FALSE;
-
-- Index for assignees lookup
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_assignees_task_member 
-ON tasks_assignees(task_id, team_member_id);
-
-- Index for phase lookup
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_phase_task_phase 
-ON task_phase(task_id, phase_id);
-
-- Index for subtask counting
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_parent_archived 
-ON tasks(parent_task_id, archived) 
-WHERE parent_task_id IS NOT NULL AND archived = FALSE;
-
-- Index for labels
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_labels_task_label 
-ON task_labels(task_id, label_id);
-
-- Index for comments count
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_comments_task 
-ON task_comments(task_id);
-
-- Index for attachments count
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_attachments_task 
-ON task_attachments(task_id);
-
-- Index for work log aggregation
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_work_log_task 
-ON task_work_log(task_id);
-
-- Index for subscribers check
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_subscribers_task 
-ON task_subscribers(task_id);
-
-- Index for dependencies check
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_dependencies_task 
-ON task_dependencies(task_id);
-
-- Index for timers lookup
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_timers_task_user 
-ON task_timers(task_id, user_id);
-
-- Index for custom columns
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_cc_column_values_task 
-ON cc_column_values(task_id);
-
-- Index for team member info view optimization
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_team_members_team_user 
-ON team_members(team_id, user_id) 
-WHERE active = TRUE;
-
-- Index for notification settings
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_notification_settings_user_team 
-ON notification_settings(user_id, team_id);
-
-- Index for task status categories
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_statuses_category 
-ON task_statuses(category_id, project_id);
-
-- Index for project phases
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_project_phases_project_sort 
-ON project_phases(project_id, sort_index);
-
-- Index for task priorities
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_priorities_value 
-ON task_priorities(value);
-
-- Index for team labels
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_team_labels_team 
-ON team_labels(team_id);
-
-- Advanced performance indexes for task optimization
-
-- Composite index for task main query optimization (covers most WHERE conditions)
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_performance_main
-ON tasks(project_id, archived, parent_task_id, status_id, priority_id)
-WHERE archived = FALSE;
-
-- Index for sorting by sort_order with project filter
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_project_sort_order
-ON tasks(project_id, sort_order)
-WHERE archived = FALSE;
-
-- Index for email_invitations to optimize team_member_info_view
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_email_invitations_team_member
-ON email_invitations(team_member_id);
-
-- Covering index for task status with category information
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_statuses_covering
-ON task_statuses(id, category_id, project_id);
-
-- Index for task aggregation queries (parent task progress calculation)
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_parent_status_archived
-ON tasks(parent_task_id, status_id, archived)
-WHERE archived = FALSE;
-
-- Index for project team member filtering
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_team_members_project_lookup
-ON team_members(team_id, active, user_id)
-WHERE active = TRUE;
-
-- Covering index for tasks with frequently accessed columns
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_covering_main
-ON tasks(id, project_id, archived, parent_task_id, status_id, priority_id, sort_order, name)
-WHERE archived = FALSE;
-
-- Index for task search functionality
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_name_search
-ON tasks USING gin(to_tsvector('english', name))
-WHERE archived = FALSE;
-
-- Index for date-based filtering (if used)
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_tasks_dates
-ON tasks(project_id, start_date, end_date)
-WHERE archived = FALSE;
-
-- Index for task timers with user filtering
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_task_timers_user_task
-ON task_timers(user_id, task_id);
-
-- Index for sys_task_status_categories lookups
-CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_sys_task_status_categories_covering
-ON sys_task_status_categories(id, color_code, color_code_dark, is_done, is_doing, is_todo);
-
--- a/worklenz-backend/database/sql/migrations/add_notifications_for_recurring_tasks.sql
+++ b/worklenz-backend/database/sql/migrations/add_notifications_for_recurring_tasks.sql
@@ -0,0 +1,40 @@
+-- Create notifications table if it doesn't exist
+CREATE TABLE IF NOT EXISTS notifications (
+    id              UUID                     DEFAULT uuid_generate_v4() PRIMARY KEY,
+    user_id         UUID                     NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    message         TEXT                     NOT NULL,
+    data            JSONB,
+    read            BOOLEAN                  DEFAULT FALSE,
+    created_at      TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    read_at         TIMESTAMP WITH TIME ZONE
+);
+
+-- Create user_push_tokens table if it doesn't exist (for future push notifications)
+CREATE TABLE IF NOT EXISTS user_push_tokens (
+    id              UUID                     DEFAULT uuid_generate_v4() PRIMARY KEY,
+    user_id         UUID                     NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    push_token      TEXT                     NOT NULL,
+    device_type     VARCHAR(20),
+    active          BOOLEAN                  DEFAULT TRUE,
+    created_at      TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    updated_at      TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(user_id, push_token)
+);
+
+-- Add notification preferences to users table if they don't exist
+ALTER TABLE users 
+ADD COLUMN IF NOT EXISTS email_notifications BOOLEAN DEFAULT TRUE,
+ADD COLUMN IF NOT EXISTS push_notifications BOOLEAN DEFAULT TRUE,
+ADD COLUMN IF NOT EXISTS in_app_notifications BOOLEAN DEFAULT TRUE;
+
+-- Create indexes for better performance
+CREATE INDEX IF NOT EXISTS idx_notifications_user_id ON notifications(user_id);
+CREATE INDEX IF NOT EXISTS idx_notifications_created_at ON notifications(created_at);
+CREATE INDEX IF NOT EXISTS idx_notifications_unread ON notifications(user_id, read) WHERE read = FALSE;
+CREATE INDEX IF NOT EXISTS idx_user_push_tokens_user_id ON user_push_tokens(user_id);
+
+-- Comments
+COMMENT ON TABLE notifications IS 'In-app notifications for users';
+COMMENT ON TABLE user_push_tokens IS 'Push notification tokens for mobile devices';
+COMMENT ON COLUMN notifications.data IS 'Additional notification data in JSON format';
+COMMENT ON COLUMN user_push_tokens.device_type IS 'Device type: ios, android, web';
--- a/worklenz-backend/database/sql/migrations/add_recurring_tasks_audit_log.sql
+++ b/worklenz-backend/database/sql/migrations/add_recurring_tasks_audit_log.sql
@@ -0,0 +1,94 @@
+-- Create audit log table for recurring task operations
+CREATE TABLE IF NOT EXISTS recurring_tasks_audit_log (
+    id                  UUID                     DEFAULT uuid_generate_v4() PRIMARY KEY,
+    operation_type      VARCHAR(50)              NOT NULL,
+    template_id         UUID,
+    schedule_id         UUID,
+    task_id             UUID,
+    template_name       TEXT,
+    success             BOOLEAN                  DEFAULT TRUE,
+    error_message       TEXT,
+    details             JSONB,
+    created_tasks_count INTEGER                  DEFAULT 0,
+    failed_tasks_count  INTEGER                  DEFAULT 0,
+    execution_time_ms   INTEGER,
+    created_at          TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    created_by          UUID                     REFERENCES users(id)
+);
+
+-- Create indexes for better query performance
+CREATE INDEX idx_recurring_tasks_audit_log_template_id ON recurring_tasks_audit_log(template_id);
+CREATE INDEX idx_recurring_tasks_audit_log_schedule_id ON recurring_tasks_audit_log(schedule_id);
+CREATE INDEX idx_recurring_tasks_audit_log_created_at ON recurring_tasks_audit_log(created_at);
+CREATE INDEX idx_recurring_tasks_audit_log_operation_type ON recurring_tasks_audit_log(operation_type);
+
+-- Add comments
+COMMENT ON TABLE recurring_tasks_audit_log IS 'Audit log for all recurring task operations';
+COMMENT ON COLUMN recurring_tasks_audit_log.operation_type IS 'Type of operation: cron_job_run, manual_trigger, schedule_created, schedule_updated, schedule_deleted, etc.';
+COMMENT ON COLUMN recurring_tasks_audit_log.details IS 'Additional details about the operation in JSON format';
+
+-- Create a function to log recurring task operations
+CREATE OR REPLACE FUNCTION log_recurring_task_operation(
+    p_operation_type VARCHAR(50),
+    p_template_id UUID DEFAULT NULL,
+    p_schedule_id UUID DEFAULT NULL,
+    p_task_id UUID DEFAULT NULL,
+    p_template_name TEXT DEFAULT NULL,
+    p_success BOOLEAN DEFAULT TRUE,
+    p_error_message TEXT DEFAULT NULL,
+    p_details JSONB DEFAULT NULL,
+    p_created_tasks_count INTEGER DEFAULT 0,
+    p_failed_tasks_count INTEGER DEFAULT 0,
+    p_execution_time_ms INTEGER DEFAULT NULL,
+    p_created_by UUID DEFAULT NULL
+)
+RETURNS UUID AS $$
+DECLARE
+    v_log_id UUID;
+BEGIN
+    INSERT INTO recurring_tasks_audit_log (
+        operation_type,
+        template_id,
+        schedule_id,
+        task_id,
+        template_name,
+        success,
+        error_message,
+        details,
+        created_tasks_count,
+        failed_tasks_count,
+        execution_time_ms,
+        created_by
+    ) VALUES (
+        p_operation_type,
+        p_template_id,
+        p_schedule_id,
+        p_task_id,
+        p_template_name,
+        p_success,
+        p_error_message,
+        p_details,
+        p_created_tasks_count,
+        p_failed_tasks_count,
+        p_execution_time_ms,
+        p_created_by
+    ) RETURNING id INTO v_log_id;
+    
+    RETURN v_log_id;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create a view for recent audit logs
+CREATE OR REPLACE VIEW v_recent_recurring_tasks_audit AS
+SELECT 
+    l.*,
+    u.name as created_by_name,
+    t.name as current_template_name,
+    s.schedule_type,
+    s.timezone
+FROM recurring_tasks_audit_log l
+LEFT JOIN users u ON l.created_by = u.id
+LEFT JOIN task_recurring_templates t ON l.template_id = t.id
+LEFT JOIN task_recurring_schedules s ON l.schedule_id = s.id
+WHERE l.created_at >= CURRENT_TIMESTAMP - INTERVAL '30 days'
+ORDER BY l.created_at DESC;
--- a/worklenz-backend/database/sql/migrations/add_timezone_support.sql
+++ b/worklenz-backend/database/sql/migrations/add_timezone_support.sql
@@ -0,0 +1,44 @@
+-- Add timezone support to recurring tasks
+
+-- Add timezone column to task_recurring_schedules
+ALTER TABLE task_recurring_schedules 
+ADD COLUMN IF NOT EXISTS timezone VARCHAR(50) DEFAULT 'UTC';
+
+-- Add timezone column to task_recurring_templates
+ALTER TABLE task_recurring_templates
+ADD COLUMN IF NOT EXISTS reporter_timezone VARCHAR(50);
+
+-- Add date_of_month column if not exists (for monthly schedules)
+ALTER TABLE task_recurring_schedules
+ADD COLUMN IF NOT EXISTS date_of_month INTEGER;
+
+-- Add last_checked_at and last_created_task_end_date columns for tracking
+ALTER TABLE task_recurring_schedules
+ADD COLUMN IF NOT EXISTS last_checked_at TIMESTAMP WITH TIME ZONE,
+ADD COLUMN IF NOT EXISTS last_created_task_end_date TIMESTAMP WITH TIME ZONE;
+
+-- Add end_date and excluded_dates columns for schedule control
+ALTER TABLE task_recurring_schedules
+ADD COLUMN IF NOT EXISTS end_date DATE,
+ADD COLUMN IF NOT EXISTS excluded_dates TEXT[];
+
+-- Create index on timezone for better query performance
+CREATE INDEX IF NOT EXISTS idx_task_recurring_schedules_timezone 
+ON task_recurring_schedules(timezone);
+
+-- Update existing records to use user's timezone if available
+UPDATE task_recurring_schedules trs
+SET timezone = COALESCE(
+    (SELECT u.timezone 
+     FROM task_recurring_templates trt
+     JOIN tasks t ON trt.task_id = t.id
+     JOIN users u ON t.reporter_id = u.id
+     WHERE trt.schedule_id = trs.id
+     LIMIT 1),
+    'UTC'
+)
+WHERE trs.timezone IS NULL OR trs.timezone = 'UTC';
+
+-- Add comment to explain timezone field
+COMMENT ON COLUMN task_recurring_schedules.timezone IS 'IANA timezone identifier for schedule calculations';
+COMMENT ON COLUMN task_recurring_templates.reporter_timezone IS 'Original reporter timezone for reference';
--- a/worklenz-backend/src/config/recurring-tasks-config.ts
+++ b/worklenz-backend/src/config/recurring-tasks-config.ts
@@ -0,0 +1,57 @@
+export interface RecurringTasksConfig {
+  enabled: boolean;
+  mode: 'cron' | 'queue';
+  cronInterval: string;
+  redisConfig: {
+    host: string;
+    port: number;
+    password?: string;
+    db: number;
+  };
+  queueOptions: {
+    maxConcurrency: number;
+    retryAttempts: number;
+    retryDelay: number;
+  };
+  notifications: {
+    enabled: boolean;
+    email: boolean;
+    push: boolean;
+    inApp: boolean;
+  };
+  auditLog: {
+    enabled: boolean;
+    retentionDays: number;
+  };
+}
+
+export const recurringTasksConfig: RecurringTasksConfig = {
+  enabled: process.env.RECURRING_TASKS_ENABLED !== 'false',
+  mode: (process.env.RECURRING_TASKS_MODE as 'cron' | 'queue') || 'cron',
+  cronInterval: process.env.RECURRING_JOBS_INTERVAL || '0 * * * *',
+  
+  redisConfig: {
+    host: process.env.REDIS_HOST || 'localhost',
+    port: parseInt(process.env.REDIS_PORT || '6379'),
+    password: process.env.REDIS_PASSWORD,
+    db: parseInt(process.env.REDIS_DB || '0'),
+  },
+  
+  queueOptions: {
+    maxConcurrency: parseInt(process.env.RECURRING_TASKS_MAX_CONCURRENCY || '5'),
+    retryAttempts: parseInt(process.env.RECURRING_TASKS_RETRY_ATTEMPTS || '3'),
+    retryDelay: parseInt(process.env.RECURRING_TASKS_RETRY_DELAY || '2000'),
+  },
+  
+  notifications: {
+    enabled: process.env.RECURRING_TASKS_NOTIFICATIONS_ENABLED !== 'false',
+    email: process.env.RECURRING_TASKS_EMAIL_NOTIFICATIONS !== 'false',
+    push: process.env.RECURRING_TASKS_PUSH_NOTIFICATIONS !== 'false',
+    inApp: process.env.RECURRING_TASKS_IN_APP_NOTIFICATIONS !== 'false',
+  },
+  
+  auditLog: {
+    enabled: process.env.RECURRING_TASKS_AUDIT_LOG_ENABLED !== 'false',
+    retentionDays: parseInt(process.env.RECURRING_TASKS_AUDIT_RETENTION_DAYS || '90'),
+  },
+};
--- a/worklenz-backend/src/controllers/recurring-tasks-admin-controller.ts
+++ b/worklenz-backend/src/controllers/recurring-tasks-admin-controller.ts
@@ -0,0 +1,48 @@
+import { IWorkLenzRequest } from "../interfaces/worklenz-request";
+import { IWorkLenzResponse } from "../interfaces/worklenz-response";
+import { ServerResponse } from "../models/server-response";
+import WorklenzControllerBase from "./worklenz-controller-base";
+import HandleExceptions from "../decorators/handle-exceptions";
+import { RecurringTasksPermissions } from "../utils/recurring-tasks-permissions";
+import { RecurringTasksAuditLogger } from "../utils/recurring-tasks-audit-logger";
+
+export default class RecurringTasksAdminController extends WorklenzControllerBase {
+  /**
+   * Get templates with permission issues
+   */
+  @HandleExceptions()
+  public static async getPermissionIssues(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
+    const issues = await RecurringTasksPermissions.getTemplatesWithPermissionIssues();
+    return res.status(200).send(new ServerResponse(true, issues));
+  }
+
+  /**
+   * Get audit log summary
+   */
+  @HandleExceptions()
+  public static async getAuditSummary(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
+    const { days = 7 } = req.query;
+    const summary = await RecurringTasksAuditLogger.getAuditSummary(Number(days));
+    return res.status(200).send(new ServerResponse(true, summary));
+  }
+
+  /**
+   * Get recent errors from audit log
+   */
+  @HandleExceptions()
+  public static async getRecentErrors(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
+    const { limit = 10 } = req.query;
+    const errors = await RecurringTasksAuditLogger.getRecentErrors(Number(limit));
+    return res.status(200).send(new ServerResponse(true, errors));
+  }
+
+  /**
+   * Validate a specific template
+   */
+  @HandleExceptions()
+  public static async validateTemplate(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
+    const { templateId } = req.params;
+    const result = await RecurringTasksPermissions.validateTemplatePermissions(templateId);
+    return res.status(200).send(new ServerResponse(true, result));
+  }
+}
--- a/worklenz-backend/src/controllers/task-recurring-controller.ts
+++ b/worklenz-backend/src/controllers/task-recurring-controller.ts
@@ -6,6 +6,7 @@ import { IWorkLenzRequest } from "../interfaces/worklenz-request";
 import { IWorkLenzResponse } from "../interfaces/worklenz-response";
 import { ServerResponse } from "../models/server-response";
 import { calculateNextEndDate, log_error } from "../shared/utils";
+import { RecurringTasksAuditLogger, RecurringTaskOperationType } from "../utils/recurring-tasks-audit-logger";

 export default class TaskRecurringController extends WorklenzControllerBase {
  @HandleExceptions()
@@ -34,7 +35,7 @@ export default class TaskRecurringController extends WorklenzControllerBase {
  }

  @HandleExceptions()
-  public static async createTaskSchedule(taskId: string) {
+  public static async createTaskSchedule(taskId: string, userId?: string) {
    const q = `INSERT INTO task_recurring_schedules (schedule_type) VALUES ('daily') RETURNING id, schedule_type;`;
    const result = await db.query(q, []);
    const [data] = result.rows;
@@ -44,6 +45,15 @@ export default class TaskRecurringController extends WorklenzControllerBase {

    await TaskRecurringController.insertTaskRecurringTemplate(taskId, data.id);

+    // Log schedule creation
+    await RecurringTasksAuditLogger.logScheduleChange(
+      RecurringTaskOperationType.SCHEDULE_CREATED,
+      data.id,
+      taskId,
+      userId,
+      { schedule_type: data.schedule_type }
+    );
+
    return data;
  }

@@ -56,9 +66,9 @@ export default class TaskRecurringController extends WorklenzControllerBase {
  @HandleExceptions()
  public static async updateSchedule(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
    const { id } = req.params;
-    const { schedule_type, days_of_week, day_of_month, week_of_month, interval_days, interval_weeks, interval_months, date_of_month } = req.body;
+    const { schedule_type, days_of_week, day_of_month, week_of_month, interval_days, interval_weeks, interval_months, date_of_month, timezone, end_date, excluded_dates } = req.body;

-    const deleteQ = `UPDATE task_recurring_schedules
+    const updateQ = `UPDATE task_recurring_schedules
                      SET schedule_type   = $1,
                          days_of_week    = $2,
                          date_of_month   = $3,
@@ -66,9 +76,27 @@ export default class TaskRecurringController extends WorklenzControllerBase {
                          week_of_month   = $5,
                          interval_days   = $6,
                          interval_weeks  = $7,
-                          interval_months = $8
-                      WHERE id = $9;`;
-    await db.query(deleteQ, [schedule_type, days_of_week, date_of_month, day_of_month, week_of_month, interval_days, interval_weeks, interval_months, id]);
+                          interval_months = $8,
+                          timezone        = COALESCE($9, timezone, 'UTC'),
+                          end_date        = $10,
+                          excluded_dates  = $11
+                      WHERE id = $12;`;
+    await db.query(updateQ, [schedule_type, days_of_week, date_of_month, day_of_month, week_of_month, interval_days, interval_weeks, interval_months, timezone, end_date, excluded_dates, id]);
+    
+    // Log schedule update
+    await RecurringTasksAuditLogger.logScheduleChange(
+      RecurringTaskOperationType.SCHEDULE_UPDATED,
+      id,
+      undefined,
+      req.user?.id,
+      { 
+        schedule_type, 
+        timezone, 
+        end_date,
+        excluded_dates_count: excluded_dates?.length || 0 
+      }
+    );
+    
    return res.status(200).send(new ServerResponse(true, null));
  }

--- a/worklenz-backend/src/controllers/tasks-controller-base.ts
+++ b/worklenz-backend/src/controllers/tasks-controller-base.ts
@@ -16,7 +16,6 @@ export interface ITaskGroup {
  start_date?: string;
  end_date?: string;
  color_code: string;
-  color_code_dark: string;
  category_id: string | null;
  old_category_id?: string;
  todo_progress?: number;
--- a/worklenz-backend/src/controllers/tasks-controller-v2.ts
+++ b/worklenz-backend/src/controllers/tasks-controller-v2.ts
--- a/worklenz-backend/src/cron_jobs/recurring-tasks.ts
+++ b/worklenz-backend/src/cron_jobs/recurring-tasks.ts
@@ -2,12 +2,16 @@ import { CronJob } from "cron";
 import { calculateNextEndDate, log_error } from "../shared/utils";
 import db from "../config/db";
 import { IRecurringSchedule, ITaskTemplate } from "../interfaces/recurring-tasks";
-import moment from "moment";
+import moment from "moment-timezone";
 import TasksController from "../controllers/tasks-controller";
+import { TimezoneUtils } from "../utils/timezone-utils";
+import { RetryUtils } from "../utils/retry-utils";
+import { RecurringTasksAuditLogger, RecurringTaskOperationType } from "../utils/recurring-tasks-audit-logger";
+import { RecurringTasksPermissions } from "../utils/recurring-tasks-permissions";
+import { RecurringTasksNotifications } from "../utils/recurring-tasks-notifications";

-// At 11:00+00 (4.30pm+530) on every day-of-month if it's on every day-of-week from Monday through Friday.
-// const TIME = "0 11 */1 * 1-5";
-const TIME = process.env.RECURRING_JOBS_INTERVAL || "0 11 */1 * 1-5";
+// Run every hour to process tasks in different timezones
+const TIME = process.env.RECURRING_JOBS_INTERVAL || "0 * * * *";
 const TIME_FORMAT = "YYYY-MM-DD";
 // const TIME = "0 0 * * *"; // Runs at midnight every day

@@ -44,8 +48,129 @@ function getFutureLimit(scheduleType: string, interval?: number): moment.Duratio
  }
 }

-// Helper function to batch create tasks
+// Helper function to batch create tasks using bulk operations
 async function createBatchTasks(template: ITaskTemplate & IRecurringSchedule, endDates: moment.Moment[]) {
+  if (endDates.length === 0) return [];
+
+  try {
+    // Prepare bulk task data
+    const tasksData = endDates.map(endDate => ({
+      name: template.name,
+      priority_id: template.priority_id,
+      project_id: template.project_id,
+      reporter_id: template.reporter_id,
+      status_id: template.status_id || null,
+      end_date: endDate.format(TIME_FORMAT),
+      schedule_id: template.schedule_id
+    }));
+
+    // Create all tasks in bulk with retry logic
+    const createTasksResult = await RetryUtils.withDatabaseRetry(async () => {
+      const createTasksQuery = `SELECT * FROM create_bulk_recurring_tasks($1::JSONB);`;
+      return await db.query(createTasksQuery, [JSON.stringify(tasksData)]);
+    }, `create_bulk_recurring_tasks for template ${template.name}`);
+    
+    const createdTasks = createTasksResult.rows.filter(row => row.created);
+    const failedTasks = createTasksResult.rows.filter(row => !row.created);
+
+    // Log results
+    if (createdTasks.length > 0) {
+      console.log(`Created ${createdTasks.length} tasks for template ${template.name}`);
+    }
+    if (failedTasks.length > 0) {
+      failedTasks.forEach(task => {
+        console.log(`Failed to create task for template ${template.name}: ${task.error_message}`);
+      });
+    }
+
+    // Only process assignments for successfully created tasks
+    if (createdTasks.length > 0 && (template.assignees?.length > 0 || template.labels?.length > 0)) {
+      // Validate assignee permissions
+      let validAssignees = template.assignees || [];
+      if (validAssignees.length > 0) {
+        const invalidAssignees = await RecurringTasksPermissions.validateAssigneePermissions(
+          validAssignees,
+          template.project_id
+        );
+        
+        if (invalidAssignees.length > 0) {
+          console.log(`Warning: ${invalidAssignees.length} assignees do not have permissions for project ${template.project_id}`);
+          // Filter out invalid assignees
+          validAssignees = validAssignees.filter(
+            a => !invalidAssignees.includes(a.team_member_id)
+          );
+        }
+      }
+
+      // Prepare bulk assignments
+      const assignments = [];
+      const labelAssignments = [];
+
+      for (const task of createdTasks) {
+        // Prepare team member assignments with validated assignees
+        if (validAssignees.length > 0) {
+          for (const assignee of validAssignees) {
+            assignments.push({
+              task_id: task.task_id,
+              team_member_id: assignee.team_member_id,
+              assigned_by: assignee.assigned_by
+            });
+          }
+        }
+
+        // Prepare label assignments
+        if (template.labels?.length > 0) {
+          for (const label of template.labels) {
+            labelAssignments.push({
+              task_id: task.task_id,
+              label_id: label.label_id
+            });
+          }
+        }
+      }
+
+      // Bulk assign team members with retry logic
+      if (assignments.length > 0) {
+        await RetryUtils.withDatabaseRetry(async () => {
+          const assignQuery = `SELECT * FROM bulk_assign_team_members($1::JSONB);`;
+          return await db.query(assignQuery, [JSON.stringify(assignments)]);
+        }, `bulk_assign_team_members for template ${template.name}`);
+      }
+
+      // Bulk assign labels with retry logic
+      if (labelAssignments.length > 0) {
+        await RetryUtils.withDatabaseRetry(async () => {
+          const labelQuery = `SELECT * FROM bulk_assign_labels($1::JSONB);`;
+          return await db.query(labelQuery, [JSON.stringify(labelAssignments)]);
+        }, `bulk_assign_labels for template ${template.name}`);
+      }
+
+      // Send notifications for created tasks
+      if (createdTasks.length > 0) {
+        const taskData = createdTasks.map(task => ({ id: task.task_id, name: task.task_name }));
+        const assigneeIds = template.assignees?.map(a => a.team_member_id) || [];
+        
+        await RecurringTasksNotifications.notifyRecurringTasksCreated(
+          template.name,
+          template.project_id,
+          taskData,
+          assigneeIds,
+          template.reporter_id
+        );
+      }
+    }
+
+    return createdTasks.map(task => ({ id: task.task_id, name: task.task_name }));
+  } catch (error) {
+    log_error("Error in bulk task creation:", error);
+    // Fallback to sequential creation if bulk operation fails
+    console.log("Falling back to sequential task creation");
+    return createBatchTasksSequential(template, endDates);
+  }
+}
+
+// Fallback function for sequential task creation
+async function createBatchTasksSequential(template: ITaskTemplate & IRecurringSchedule, endDates: moment.Moment[]) {
  const createdTasks = [];
  
  for (const nextEndDate of endDates) {
@@ -92,69 +217,162 @@ async function createBatchTasks(template: ITaskTemplate & IRecurringSchedule, en
 }

 async function onRecurringTaskJobTick() {
+    const errors: any[] = [];
+    
    try {
        log("(cron) Recurring tasks job started.");
+        RecurringTasksAuditLogger.startTimer();

-        const templatesQuery = `
-            SELECT t.*, s.*, (SELECT MAX(end_date) FROM tasks WHERE schedule_id = s.id) as last_task_end_date
-            FROM task_recurring_templates t
-            JOIN task_recurring_schedules s ON t.schedule_id = s.id;
-        `;
-        const templatesResult = await db.query(templatesQuery);
-        const templates = templatesResult.rows as (ITaskTemplate & IRecurringSchedule)[];
+        // Get all active timezones where it's currently the scheduled hour
+        const activeTimezones = TimezoneUtils.getActiveTimezones();
+        log(`Processing recurring tasks for ${activeTimezones.length} timezones`);
+
+        // Fetch templates with retry logic
+        const templatesResult = await RetryUtils.withDatabaseRetry(async () => {
+            const templatesQuery = `
+                SELECT t.*, s.*, 
+                       (SELECT MAX(end_date) FROM tasks WHERE schedule_id = s.id) as last_task_end_date,
+                       u.timezone as user_timezone
+                FROM task_recurring_templates t
+                JOIN task_recurring_schedules s ON t.schedule_id = s.id
+                LEFT JOIN tasks orig_task ON t.task_id = orig_task.id
+                LEFT JOIN users u ON orig_task.reporter_id = u.id
+                WHERE s.end_date IS NULL OR s.end_date >= CURRENT_DATE;
+            `;
+            return await db.query(templatesQuery);
+        }, "fetch_recurring_templates");
+        
+        const templates = templatesResult.rows as (ITaskTemplate & IRecurringSchedule & { user_timezone?: string })[];

-        const now = moment();
        let createdTaskCount = 0;

        for (const template of templates) {
+            // Check template permissions before processing
+            const permissionCheck = await RecurringTasksPermissions.validateTemplatePermissions(template.task_id);
+            if (!permissionCheck.hasPermission) {
+                console.log(`Skipping template ${template.name}: ${permissionCheck.reason}`);
+                
+                // Log permission issue
+                await RecurringTasksAuditLogger.log({
+                    operationType: RecurringTaskOperationType.TASKS_CREATION_FAILED,
+                    templateId: template.task_id,
+                    scheduleId: template.schedule_id,
+                    templateName: template.name,
+                    success: false,
+                    errorMessage: `Permission denied: ${permissionCheck.reason}`,
+                    details: { permissionCheck }
+                });
+                
+                continue;
+            }
+
+            // Use template timezone or user timezone or default to UTC
+            const timezone = template.timezone || TimezoneUtils.getUserTimezone(template.user_timezone);
+            
+            // Check if this template should run in the current hour for its timezone
+            if (!activeTimezones.includes(timezone) && timezone !== 'UTC') {
+                continue;
+            }
+
+            const now = TimezoneUtils.nowInTimezone(timezone);
            const lastTaskEndDate = template.last_task_end_date 
-                ? moment(template.last_task_end_date)
-                : moment(template.created_at);
+                ? moment.tz(template.last_task_end_date, timezone)
+                : moment.tz(template.created_at, timezone);
            
            // Calculate future limit based on schedule type
-            const futureLimit = moment(template.last_checked_at || template.created_at)
+            const futureLimit = moment.tz(template.last_checked_at || template.created_at, timezone)
                .add(getFutureLimit(
                    template.schedule_type,
                    template.interval_days || template.interval_weeks || template.interval_months || 1
                ));

-            let nextEndDate = calculateNextEndDate(template, lastTaskEndDate);
+            let nextEndDate = TimezoneUtils.calculateNextEndDateWithTimezone(template, lastTaskEndDate, timezone);
            const endDatesToCreate: moment.Moment[] = [];

            // Find all future occurrences within the limit
            while (nextEndDate.isSameOrBefore(futureLimit)) {
                if (nextEndDate.isAfter(now)) {
-                    endDatesToCreate.push(moment(nextEndDate));
+                    // Check if date is not in excluded dates
+                    if (!template.excluded_dates || !template.excluded_dates.includes(nextEndDate.format(TIME_FORMAT))) {
+                        endDatesToCreate.push(moment(nextEndDate));
+                    }
                }
-                nextEndDate = calculateNextEndDate(template, nextEndDate);
+                nextEndDate = TimezoneUtils.calculateNextEndDateWithTimezone(template, nextEndDate, timezone);
            }

            // Batch create tasks for all future dates
            if (endDatesToCreate.length > 0) {
-                const createdTasks = await createBatchTasks(template, endDatesToCreate);
-                createdTaskCount += createdTasks.length;
+                try {
+                    const createdTasks = await createBatchTasks(template, endDatesToCreate);
+                    createdTaskCount += createdTasks.length;

-                // Update the last_checked_at in the schedule
-                const updateScheduleQuery = `
-                    UPDATE task_recurring_schedules 
-                    SET last_checked_at = $1::DATE, 
-                        last_created_task_end_date = $2 
-                    WHERE id = $3;
-                `;
-                await db.query(updateScheduleQuery, [
-                    moment().format(TIME_FORMAT),
-                    endDatesToCreate[endDatesToCreate.length - 1].format(TIME_FORMAT),
-                    template.schedule_id
-                ]);
+                    // Log successful template processing
+                    await RecurringTasksAuditLogger.logTemplateProcessing(
+                        template.task_id,
+                        template.name,
+                        template.schedule_id,
+                        createdTasks.length,
+                        endDatesToCreate.length - createdTasks.length,
+                        {
+                            timezone,
+                            endDates: endDatesToCreate.map(d => d.format(TIME_FORMAT))
+                        }
+                    );
+
+                    // Update the last_checked_at in the schedule with retry logic
+                    await RetryUtils.withDatabaseRetry(async () => {
+                        const updateScheduleQuery = `
+                            UPDATE task_recurring_schedules 
+                            SET last_checked_at = $1, 
+                                last_created_task_end_date = $2 
+                            WHERE id = $3;
+                        `;
+                        return await db.query(updateScheduleQuery, [
+                            now.toDate(),
+                            endDatesToCreate[endDatesToCreate.length - 1].toDate(),
+                            template.schedule_id
+                        ]);
+                    }, `update_schedule for template ${template.name}`);
+                } catch (error) {
+                    errors.push({ template: template.name, error });
+                    
+                    // Log failed template processing
+                    await RecurringTasksAuditLogger.logTemplateProcessing(
+                        template.task_id,
+                        template.name,
+                        template.schedule_id,
+                        0,
+                        endDatesToCreate.length,
+                        {
+                            timezone,
+                            error: error.message || error.toString()
+                        }
+                    );
+                }
            } else {
-                console.log(`No tasks created for template ${template.name} - next occurrence is beyond the future limit`);
+                console.log(`No tasks created for template ${template.name} (${timezone}) - next occurrence is beyond the future limit or excluded`);
            }
        }
        
        log(`(cron) Recurring tasks job ended with ${createdTaskCount} new tasks created.`);
+        
+        // Log cron job completion
+        await RecurringTasksAuditLogger.logCronJobRun(
+            templates.length,
+            createdTaskCount,
+            errors
+        );
    } catch (error) {
        log_error(error);
        log("(cron) Recurring task job ended with errors.");
+        
+        // Log cron job failure
+        await RecurringTasksAuditLogger.log({
+            operationType: RecurringTaskOperationType.CRON_JOB_ERROR,
+            success: false,
+            errorMessage: error.message || error.toString(),
+            details: { error: error.stack || error }
+        });
    }
 }

--- a/worklenz-backend/src/interfaces/recurring-tasks.ts
+++ b/worklenz-backend/src/interfaces/recurring-tasks.ts
@@ -12,6 +12,9 @@ export interface IRecurringSchedule {
  last_checked_at: Date | null;
  last_task_end_date: Date | null;
  created_at: Date;
+  timezone?: string;
+  end_date?: Date | null;
+  excluded_dates?: string[] | null;
 }

 interface ITaskTemplateAssignee {
--- a/worklenz-backend/src/jobs/recurring-tasks-queue.ts
+++ b/worklenz-backend/src/jobs/recurring-tasks-queue.ts
@@ -0,0 +1,322 @@
+import Bull from 'bull';
+import { TimezoneUtils } from '../utils/timezone-utils';
+import { RetryUtils } from '../utils/retry-utils';
+import { RecurringTasksAuditLogger, RecurringTaskOperationType } from '../utils/recurring-tasks-audit-logger';
+import { RecurringTasksPermissions } from '../utils/recurring-tasks-permissions';
+import { RecurringTasksNotifications } from '../utils/recurring-tasks-notifications';
+import { calculateNextEndDate, log_error } from '../shared/utils';
+import { IRecurringSchedule, ITaskTemplate } from '../interfaces/recurring-tasks';
+import moment from 'moment-timezone';
+import db from '../config/db';
+
+// Configure Redis connection
+const redisConfig = {
+  host: process.env.REDIS_HOST || 'localhost',
+  port: parseInt(process.env.REDIS_PORT || '6379'),
+  password: process.env.REDIS_PASSWORD,
+  db: parseInt(process.env.REDIS_DB || '0'),
+};
+
+// Create job queues
+export const recurringTasksQueue = new Bull('recurring-tasks', {
+  redis: redisConfig,
+  defaultJobOptions: {
+    removeOnComplete: 100, // Keep last 100 completed jobs
+    removeOnFail: 50,      // Keep last 50 failed jobs
+    attempts: 3,
+    backoff: {
+      type: 'exponential',
+      delay: 2000,
+    },
+  },
+});
+
+export const taskCreationQueue = new Bull('task-creation', {
+  redis: redisConfig,
+  defaultJobOptions: {
+    removeOnComplete: 200,
+    removeOnFail: 100,
+    attempts: 5,
+    backoff: {
+      type: 'exponential',
+      delay: 1000,
+    },
+  },
+});
+
+// Job data interfaces
+interface RecurringTaskJobData {
+  templateId: string;
+  scheduleId: string;
+  timezone: string;
+}
+
+interface TaskCreationJobData {
+  template: ITaskTemplate & IRecurringSchedule;
+  endDates: string[];
+  timezone: string;
+}
+
+// Job processors
+recurringTasksQueue.process('process-template', async (job) => {
+  const { templateId, scheduleId, timezone }: RecurringTaskJobData = job.data;
+  
+  try {
+    RecurringTasksAuditLogger.startTimer();
+    
+    // Fetch template data
+    const templateQuery = `
+      SELECT t.*, s.*, 
+             (SELECT MAX(end_date) FROM tasks WHERE schedule_id = s.id) as last_task_end_date,
+             u.timezone as user_timezone
+      FROM task_recurring_templates t
+      JOIN task_recurring_schedules s ON t.schedule_id = s.id
+      LEFT JOIN tasks orig_task ON t.task_id = orig_task.id
+      LEFT JOIN users u ON orig_task.reporter_id = u.id
+      WHERE t.id = $1 AND s.id = $2
+    `;
+    
+    const result = await RetryUtils.withDatabaseRetry(async () => {
+      return await db.query(templateQuery, [templateId, scheduleId]);
+    }, 'fetch_template_for_job');
+    
+    if (result.rows.length === 0) {
+      throw new Error(`Template ${templateId} not found`);
+    }
+    
+    const template = result.rows[0] as ITaskTemplate & IRecurringSchedule & { user_timezone?: string };
+    
+    // Check permissions
+    const permissionCheck = await RecurringTasksPermissions.validateTemplatePermissions(template.task_id);
+    if (!permissionCheck.hasPermission) {
+      await RecurringTasksAuditLogger.log({
+        operationType: RecurringTaskOperationType.TASKS_CREATION_FAILED,
+        templateId: template.task_id,
+        scheduleId: template.schedule_id,
+        templateName: template.name,
+        success: false,
+        errorMessage: `Permission denied: ${permissionCheck.reason}`,
+        details: { permissionCheck, processedBy: 'job_queue' }
+      });
+      return;
+    }
+    
+    // Calculate dates to create
+    const now = TimezoneUtils.nowInTimezone(timezone);
+    const lastTaskEndDate = template.last_task_end_date 
+      ? moment.tz(template.last_task_end_date, timezone)
+      : moment.tz(template.created_at, timezone);
+    
+    const futureLimit = moment.tz(template.last_checked_at || template.created_at, timezone)
+      .add(getFutureLimit(
+        template.schedule_type,
+        template.interval_days || template.interval_weeks || template.interval_months || 1
+      ));
+
+    let nextEndDate = TimezoneUtils.calculateNextEndDateWithTimezone(template, lastTaskEndDate, timezone);
+    const endDatesToCreate: string[] = [];
+
+    while (nextEndDate.isSameOrBefore(futureLimit)) {
+      if (nextEndDate.isAfter(now)) {
+        if (!template.excluded_dates || !template.excluded_dates.includes(nextEndDate.format('YYYY-MM-DD'))) {
+          endDatesToCreate.push(nextEndDate.format('YYYY-MM-DD'));
+        }
+      }
+      nextEndDate = TimezoneUtils.calculateNextEndDateWithTimezone(template, nextEndDate, timezone);
+    }
+    
+    if (endDatesToCreate.length > 0) {
+      // Add task creation job
+      await taskCreationQueue.add('create-tasks', {
+        template,
+        endDates: endDatesToCreate,
+        timezone
+      }, {
+        priority: 10, // Higher priority for task creation
+      });
+    }
+    
+    // Update schedule
+    await RetryUtils.withDatabaseRetry(async () => {
+      const updateQuery = `
+        UPDATE task_recurring_schedules 
+        SET last_checked_at = $1
+        WHERE id = $2;
+      `;
+      return await db.query(updateQuery, [now.toDate(), scheduleId]);
+    }, `update_schedule_for_template_${templateId}`);
+    
+  } catch (error) {
+    log_error('Error processing recurring task template:', error);
+    throw error;
+  }
+});
+
+taskCreationQueue.process('create-tasks', async (job) => {
+  const { template, endDates, timezone }: TaskCreationJobData = job.data;
+  
+  try {
+    // Create tasks using the bulk function from the cron job
+    const tasksData = endDates.map(endDate => ({
+      name: template.name,
+      priority_id: template.priority_id,
+      project_id: template.project_id,
+      reporter_id: template.reporter_id,
+      status_id: template.status_id || null,
+      end_date: endDate,
+      schedule_id: template.schedule_id
+    }));
+
+    const createTasksResult = await RetryUtils.withDatabaseRetry(async () => {
+      const createTasksQuery = `SELECT * FROM create_bulk_recurring_tasks($1::JSONB);`;
+      return await db.query(createTasksQuery, [JSON.stringify(tasksData)]);
+    }, `create_bulk_tasks_queue_${template.name}`);
+    
+    const createdTasks = createTasksResult.rows.filter(row => row.created);
+    const failedTasks = createTasksResult.rows.filter(row => !row.created);
+
+    // Handle assignments and labels (similar to cron job implementation)
+    if (createdTasks.length > 0 && (template.assignees?.length > 0 || template.labels?.length > 0)) {
+      // ... (assignment logic from cron job)
+    }
+
+    // Send notifications
+    if (createdTasks.length > 0) {
+      const taskData = createdTasks.map(task => ({ id: task.task_id, name: task.task_name }));
+      const assigneeIds = template.assignees?.map(a => a.team_member_id) || [];
+      
+      await RecurringTasksNotifications.notifyRecurringTasksCreated(
+        template.name,
+        template.project_id,
+        taskData,
+        assigneeIds,
+        template.reporter_id
+      );
+    }
+
+    // Log results
+    await RecurringTasksAuditLogger.logTemplateProcessing(
+      template.task_id,
+      template.name,
+      template.schedule_id,
+      createdTasks.length,
+      failedTasks.length,
+      {
+        timezone,
+        endDates,
+        processedBy: 'job_queue'
+      }
+    );
+
+    return {
+      created: createdTasks.length,
+      failed: failedTasks.length
+    };
+    
+  } catch (error) {
+    log_error('Error creating tasks in queue:', error);
+    throw error;
+  }
+});
+
+// Helper function (copied from cron job)
+function getFutureLimit(scheduleType: string, interval?: number): moment.Duration {
+  const FUTURE_LIMITS = {
+    daily: moment.duration(3, "days"),
+    weekly: moment.duration(1, "week"),
+    monthly: moment.duration(1, "month"),
+    every_x_days: (interval: number) => moment.duration(interval, "days"),
+    every_x_weeks: (interval: number) => moment.duration(interval, "weeks"),
+    every_x_months: (interval: number) => moment.duration(interval, "months")
+  };
+
+  switch (scheduleType) {
+    case "daily":
+      return FUTURE_LIMITS.daily;
+    case "weekly":
+      return FUTURE_LIMITS.weekly;
+    case "monthly":
+      return FUTURE_LIMITS.monthly;
+    case "every_x_days":
+      return FUTURE_LIMITS.every_x_days(interval || 1);
+    case "every_x_weeks":
+      return FUTURE_LIMITS.every_x_weeks(interval || 1);
+    case "every_x_months":
+      return FUTURE_LIMITS.every_x_months(interval || 1);
+    default:
+      return moment.duration(3, "days");
+  }
+}
+
+// Job schedulers
+export class RecurringTasksJobScheduler {
+  /**
+   * Schedule recurring task processing for all templates
+   */
+  static async scheduleRecurringTasks(): Promise<void> {
+    try {
+      // Get all active templates
+      const templatesQuery = `
+        SELECT t.id as template_id, s.id as schedule_id, 
+               COALESCE(s.timezone, u.timezone, 'UTC') as timezone
+        FROM task_recurring_templates t
+        JOIN task_recurring_schedules s ON t.schedule_id = s.id
+        LEFT JOIN tasks orig_task ON t.task_id = orig_task.id
+        LEFT JOIN users u ON orig_task.reporter_id = u.id
+        WHERE s.end_date IS NULL OR s.end_date >= CURRENT_DATE
+      `;
+      
+      const result = await db.query(templatesQuery);
+      
+      // Schedule a job for each template
+      for (const template of result.rows) {
+        await recurringTasksQueue.add('process-template', {
+          templateId: template.template_id,
+          scheduleId: template.schedule_id,
+          timezone: template.timezone
+        }, {
+          delay: Math.random() * 60000, // Random delay up to 1 minute to spread load
+        });
+      }
+      
+    } catch (error) {
+      log_error('Error scheduling recurring tasks:', error);
+    }
+  }
+
+  /**
+   * Start the job queue system
+   */
+  static async start(): Promise<void> {
+    console.log('Starting recurring tasks job queue...');
+    
+    // Schedule recurring task processing every hour
+    await recurringTasksQueue.add('schedule-all', {}, {
+      repeat: { cron: '0 * * * *' }, // Every hour
+      removeOnComplete: 1,
+      removeOnFail: 1,
+    });
+    
+    // Process the schedule-all job
+    recurringTasksQueue.process('schedule-all', async () => {
+      await this.scheduleRecurringTasks();
+    });
+    
+    console.log('Recurring tasks job queue started');
+  }
+
+  /**
+   * Get queue statistics
+   */
+  static async getStats(): Promise<any> {
+    const [recurringStats, creationStats] = await Promise.all([
+      recurringTasksQueue.getJobCounts(),
+      taskCreationQueue.getJobCounts()
+    ]);
+    
+    return {
+      recurringTasks: recurringStats,
+      taskCreation: creationStats
+    };
+  }
+}
--- a/worklenz-backend/src/services/recurring-tasks-service.ts
+++ b/worklenz-backend/src/services/recurring-tasks-service.ts
@@ -0,0 +1,162 @@
+import { recurringTasksConfig } from '../config/recurring-tasks-config';
+import { startRecurringTasksJob } from '../cron_jobs/recurring-tasks';
+import { RecurringTasksJobScheduler } from '../jobs/recurring-tasks-queue';
+import { log_error } from '../shared/utils';
+
+export class RecurringTasksService {
+  private static isStarted = false;
+
+  /**
+   * Start the recurring tasks service based on configuration
+   */
+  static async start(): Promise<void> {
+    if (this.isStarted) {
+      console.log('Recurring tasks service already started');
+      return;
+    }
+
+    if (!recurringTasksConfig.enabled) {
+      console.log('Recurring tasks service disabled');
+      return;
+    }
+
+    try {
+      console.log(`Starting recurring tasks service in ${recurringTasksConfig.mode} mode...`);
+
+      switch (recurringTasksConfig.mode) {
+        case 'cron':
+          startRecurringTasksJob();
+          break;
+          
+        case 'queue':
+          await RecurringTasksJobScheduler.start();
+          break;
+          
+        default:
+          throw new Error(`Unknown recurring tasks mode: ${recurringTasksConfig.mode}`);
+      }
+
+      this.isStarted = true;
+      console.log(`Recurring tasks service started successfully in ${recurringTasksConfig.mode} mode`);
+      
+    } catch (error) {
+      log_error('Failed to start recurring tasks service:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Stop the recurring tasks service
+   */
+  static async stop(): Promise<void> {
+    if (!this.isStarted) {
+      return;
+    }
+
+    try {
+      console.log('Stopping recurring tasks service...');
+      
+      if (recurringTasksConfig.mode === 'queue') {
+        // Close queue connections
+        const { recurringTasksQueue, taskCreationQueue } = await import('../jobs/recurring-tasks-queue');
+        await recurringTasksQueue.close();
+        await taskCreationQueue.close();
+      }
+      
+      this.isStarted = false;
+      console.log('Recurring tasks service stopped');
+      
+    } catch (error) {
+      log_error('Error stopping recurring tasks service:', error);
+    }
+  }
+
+  /**
+   * Get service status and statistics
+   */
+  static async getStatus(): Promise<any> {
+    const status = {
+      enabled: recurringTasksConfig.enabled,
+      mode: recurringTasksConfig.mode,
+      started: this.isStarted,
+      config: recurringTasksConfig
+    };
+
+    if (this.isStarted && recurringTasksConfig.mode === 'queue') {
+      try {
+        const stats = await RecurringTasksJobScheduler.getStats();
+        return { ...status, queueStats: stats };
+      } catch (error) {
+        return { ...status, queueStatsError: error.message };
+      }
+    }
+
+    return status;
+  }
+
+  /**
+   * Manually trigger recurring tasks processing
+   */
+  static async triggerManual(): Promise<void> {
+    if (!this.isStarted) {
+      throw new Error('Recurring tasks service is not started');
+    }
+
+    try {
+      if (recurringTasksConfig.mode === 'queue') {
+        await RecurringTasksJobScheduler.scheduleRecurringTasks();
+      } else {
+        // For cron mode, we can't manually trigger easily
+        // Could implement a manual trigger function in the cron job file
+        throw new Error('Manual trigger not supported in cron mode');
+      }
+    } catch (error) {
+      log_error('Error manually triggering recurring tasks:', error);
+      throw error;
+    }
+  }
+
+  /**
+   * Health check for the service
+   */
+  static async healthCheck(): Promise<{ healthy: boolean; message: string; details?: any }> {
+    try {
+      if (!recurringTasksConfig.enabled) {
+        return {
+          healthy: true,
+          message: 'Recurring tasks service is disabled'
+        };
+      }
+
+      if (!this.isStarted) {
+        return {
+          healthy: false,
+          message: 'Recurring tasks service is not started'
+        };
+      }
+
+      if (recurringTasksConfig.mode === 'queue') {
+        const stats = await RecurringTasksJobScheduler.getStats();
+        const hasFailures = stats.recurringTasks.failed > 0 || stats.taskCreation.failed > 0;
+        
+        return {
+          healthy: !hasFailures,
+          message: hasFailures ? 'Some jobs are failing' : 'All systems operational',
+          details: stats
+        };
+      }
+
+      return {
+        healthy: true,
+        message: `Running in ${recurringTasksConfig.mode} mode`
+      };
+
+    } catch (error) {
+      return {
+        healthy: false,
+        message: 'Health check failed',
+        details: { error: error.message }
+      };
+    }
+  }
+}
--- a/worklenz-backend/src/shared/constants.ts
+++ b/worklenz-backend/src/shared/constants.ts
@@ -89,24 +89,24 @@ export const NumbersColorMap: { [x: string]: string } = {
 };

 export const PriorityColorCodes: { [x: number]: string; } = {
-  0: "#2E8B57",
-  1: "#DAA520",
-  2: "#CD5C5C"
+  0: "#75c997",
+  1: "#fbc84c",
+  2: "#f37070"
 };

 export const PriorityColorCodesDark: { [x: number]: string; } = {
-  0: "#3CB371",
-  1: "#B8860B",
-  2: "#F08080"
+  0: "#46D980",
+  1: "#FFC227",
+  2: "#FF4141"
 };

 export const TASK_STATUS_TODO_COLOR = "#a9a9a9";
 export const TASK_STATUS_DOING_COLOR = "#70a6f3";
 export const TASK_STATUS_DONE_COLOR = "#75c997";

-export const TASK_PRIORITY_LOW_COLOR = "#2E8B57";
-export const TASK_PRIORITY_MEDIUM_COLOR = "#DAA520";
-export const TASK_PRIORITY_HIGH_COLOR = "#CD5C5C";
+export const TASK_PRIORITY_LOW_COLOR = "#75c997";
+export const TASK_PRIORITY_MEDIUM_COLOR = "#fbc84c";
+export const TASK_PRIORITY_HIGH_COLOR = "#f37070";

 export const TASK_DUE_COMPLETED_COLOR = "#75c997";
 export const TASK_DUE_UPCOMING_COLOR = "#70a6f3";
--- a/worklenz-backend/src/utils/recurring-tasks-audit-logger.ts
+++ b/worklenz-backend/src/utils/recurring-tasks-audit-logger.ts
@@ -0,0 +1,189 @@
+import db from "../config/db";
+import { log_error } from "../shared/utils";
+
+export enum RecurringTaskOperationType {
+  CRON_JOB_RUN = "cron_job_run",
+  CRON_JOB_ERROR = "cron_job_error",
+  TEMPLATE_CREATED = "template_created",
+  TEMPLATE_UPDATED = "template_updated",
+  TEMPLATE_DELETED = "template_deleted",
+  SCHEDULE_CREATED = "schedule_created",
+  SCHEDULE_UPDATED = "schedule_updated",
+  SCHEDULE_DELETED = "schedule_deleted",
+  TASKS_CREATED = "tasks_created",
+  TASKS_CREATION_FAILED = "tasks_creation_failed",
+  MANUAL_TRIGGER = "manual_trigger",
+  BULK_OPERATION = "bulk_operation"
+}
+
+export interface AuditLogEntry {
+  operationType: RecurringTaskOperationType;
+  templateId?: string;
+  scheduleId?: string;
+  taskId?: string;
+  templateName?: string;
+  success?: boolean;
+  errorMessage?: string;
+  details?: any;
+  createdTasksCount?: number;
+  failedTasksCount?: number;
+  executionTimeMs?: number;
+  createdBy?: string;
+}
+
+export class RecurringTasksAuditLogger {
+  private static startTime: number;
+
+  /**
+   * Start timing an operation
+   */
+  static startTimer(): void {
+    this.startTime = Date.now();
+  }
+
+  /**
+   * Get elapsed time since timer started
+   */
+  static getElapsedTime(): number {
+    return this.startTime ? Date.now() - this.startTime : 0;
+  }
+
+  /**
+   * Log a recurring task operation
+   */
+  static async log(entry: AuditLogEntry): Promise<void> {
+    try {
+      const query = `SELECT log_recurring_task_operation($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);`;
+      
+      await db.query(query, [
+        entry.operationType,
+        entry.templateId || null,
+        entry.scheduleId || null,
+        entry.taskId || null,
+        entry.templateName || null,
+        entry.success !== false, // Default to true
+        entry.errorMessage || null,
+        entry.details ? JSON.stringify(entry.details) : null,
+        entry.createdTasksCount || 0,
+        entry.failedTasksCount || 0,
+        entry.executionTimeMs || this.getElapsedTime(),
+        entry.createdBy || null
+      ]);
+    } catch (error) {
+      // Don't let audit logging failures break the main flow
+      log_error("Failed to log recurring task audit entry:", error);
+    }
+  }
+
+  /**
+   * Log cron job execution
+   */
+  static async logCronJobRun(
+    totalTemplates: number,
+    createdTasksCount: number,
+    errors: any[] = []
+  ): Promise<void> {
+    await this.log({
+      operationType: RecurringTaskOperationType.CRON_JOB_RUN,
+      success: errors.length === 0,
+      errorMessage: errors.length > 0 ? `${errors.length} errors occurred` : undefined,
+      details: {
+        totalTemplates,
+        errors: errors.map(e => e.message || e.toString())
+      },
+      createdTasksCount,
+      executionTimeMs: this.getElapsedTime()
+    });
+  }
+
+  /**
+   * Log template processing
+   */
+  static async logTemplateProcessing(
+    templateId: string,
+    templateName: string,
+    scheduleId: string,
+    createdCount: number,
+    failedCount: number,
+    details?: any
+  ): Promise<void> {
+    await this.log({
+      operationType: RecurringTaskOperationType.TASKS_CREATED,
+      templateId,
+      scheduleId,
+      templateName,
+      success: failedCount === 0,
+      createdTasksCount: createdCount,
+      failedTasksCount: failedCount,
+      details
+    });
+  }
+
+  /**
+   * Log schedule changes
+   */
+  static async logScheduleChange(
+    operationType: RecurringTaskOperationType,
+    scheduleId: string,
+    templateId?: string,
+    userId?: string,
+    details?: any
+  ): Promise<void> {
+    await this.log({
+      operationType,
+      scheduleId,
+      templateId,
+      createdBy: userId,
+      details
+    });
+  }
+
+  /**
+   * Get audit log summary
+   */
+  static async getAuditSummary(days: number = 7): Promise<any> {
+    try {
+      const query = `
+        SELECT 
+          operation_type,
+          COUNT(*) as count,
+          SUM(CASE WHEN success THEN 1 ELSE 0 END) as success_count,
+          SUM(CASE WHEN NOT success THEN 1 ELSE 0 END) as failure_count,
+          SUM(created_tasks_count) as total_tasks_created,
+          SUM(failed_tasks_count) as total_tasks_failed,
+          AVG(execution_time_ms) as avg_execution_time_ms
+        FROM recurring_tasks_audit_log
+        WHERE created_at >= CURRENT_TIMESTAMP - INTERVAL '${days} days'
+        GROUP BY operation_type
+        ORDER BY count DESC;
+      `;
+      
+      const result = await db.query(query);
+      return result.rows;
+    } catch (error) {
+      log_error("Failed to get audit summary:", error);
+      return [];
+    }
+  }
+
+  /**
+   * Get recent errors
+   */
+  static async getRecentErrors(limit: number = 10): Promise<any[]> {
+    try {
+      const query = `
+        SELECT *
+        FROM v_recent_recurring_tasks_audit
+        WHERE NOT success
+        ORDER BY created_at DESC
+        LIMIT $1;
+      `;
+      
+      const result = await db.query(query, [limit]);
+      return result.rows;
+    } catch (error) {
+      log_error("Failed to get recent errors:", error);
+      return [];
+    }
+  }
+}
--- a/worklenz-backend/src/utils/recurring-tasks-notifications.ts
+++ b/worklenz-backend/src/utils/recurring-tasks-notifications.ts
@@ -0,0 +1,260 @@
+import db from "../config/db";
+import { log_error } from "../shared/utils";
+
+export interface NotificationData {
+  userId: string;
+  projectId: string;
+  taskId: string;
+  taskName: string;
+  templateName: string;
+  scheduleId: string;
+  createdBy?: string;
+}
+
+export class RecurringTasksNotifications {
+  /**
+   * Send notification to user about a new recurring task
+   */
+  static async notifyTaskCreated(data: NotificationData): Promise<void> {
+    try {
+      // Create notification in the database
+      const notificationQuery = `
+        INSERT INTO notifications (
+          user_id,
+          message,
+          data,
+          created_at
+        ) VALUES ($1, $2, $3, NOW())
+      `;
+
+      const message = `New recurring task "${data.taskName}" has been created from template "${data.templateName}"`;
+      const notificationData = {
+        type: 'recurring_task_created',
+        task_id: data.taskId,
+        project_id: data.projectId,
+        schedule_id: data.scheduleId,
+        task_name: data.taskName,
+        template_name: data.templateName
+      };
+
+      await db.query(notificationQuery, [
+        data.userId,
+        message,
+        JSON.stringify(notificationData)
+      ]);
+
+    } catch (error) {
+      log_error("Failed to create notification:", error);
+    }
+  }
+
+  /**
+   * Send notifications to all assignees of created tasks
+   */
+  static async notifyAssignees(
+    taskIds: string[],
+    templateName: string,
+    projectId: string
+  ): Promise<void> {
+    if (taskIds.length === 0) return;
+
+    try {
+      // Get all assignees for the created tasks
+      const assigneesQuery = `
+        SELECT DISTINCT ta.team_member_id, t.id as task_id, t.name as task_name
+        FROM tasks_assignees ta
+        JOIN tasks t ON ta.task_id = t.id
+        WHERE t.id = ANY($1)
+      `;
+
+      const result = await db.query(assigneesQuery, [taskIds]);
+      
+      // Send notification to each assignee
+      for (const assignee of result.rows) {
+        await this.notifyTaskCreated({
+          userId: assignee.team_member_id,
+          projectId,
+          taskId: assignee.task_id,
+          taskName: assignee.task_name,
+          templateName,
+          scheduleId: '' // Not needed for assignee notifications
+        });
+      }
+
+    } catch (error) {
+      log_error("Failed to notify assignees:", error);
+    }
+  }
+
+  /**
+   * Send email notifications (if email system is configured)
+   */
+  static async sendEmailNotifications(
+    userIds: string[],
+    subject: string,
+    message: string
+  ): Promise<void> {
+    try {
+      // Get user email addresses
+      const usersQuery = `
+        SELECT id, email, name, email_notifications
+        FROM users
+        WHERE id = ANY($1) AND email_notifications = true AND email IS NOT NULL
+      `;
+
+      const result = await db.query(usersQuery, [userIds]);
+      
+      // TODO: Integrate with your email service (SendGrid, AWS SES, etc.)
+      // For now, just log the email notifications that would be sent
+      for (const user of result.rows) {
+        console.log(`Email notification would be sent to ${user.email}: ${subject}`);
+        
+        // Example: await emailService.send({
+        //   to: user.email,
+        //   subject,
+        //   html: message
+        // });
+      }
+
+    } catch (error) {
+      log_error("Failed to send email notifications:", error);
+    }
+  }
+
+  /**
+   * Send push notifications (if push notification system is configured)
+   */
+  static async sendPushNotifications(
+    userIds: string[],
+    title: string,
+    body: string,
+    data?: any
+  ): Promise<void> {
+    try {
+      // Get user push tokens
+      const tokensQuery = `
+        SELECT user_id, push_token
+        FROM user_push_tokens
+        WHERE user_id = ANY($1) AND push_token IS NOT NULL
+      `;
+
+      const result = await db.query(tokensQuery, [userIds]);
+      
+      // TODO: Integrate with your push notification service (FCM, APNs, etc.)
+      // For now, just log the push notifications that would be sent
+      for (const token of result.rows) {
+        console.log(`Push notification would be sent to ${token.push_token}: ${title}`);
+        
+        // Example: await pushService.send({
+        //   token: token.push_token,
+        //   title,
+        //   body,
+        //   data
+        // });
+      }
+
+    } catch (error) {
+      log_error("Failed to send push notifications:", error);
+    }
+  }
+
+  /**
+   * Get notification preferences for users
+   */
+  static async getNotificationPreferences(userIds: string[]): Promise<any[]> {
+    try {
+      const query = `
+        SELECT 
+          id,
+          email_notifications,
+          push_notifications,
+          in_app_notifications
+        FROM users
+        WHERE id = ANY($1)
+      `;
+
+      const result = await db.query(query, [userIds]);
+      return result.rows;
+
+    } catch (error) {
+      log_error("Failed to get notification preferences:", error);
+      return [];
+    }
+  }
+
+  /**
+   * Comprehensive notification for recurring task creation
+   */
+  static async notifyRecurringTasksCreated(
+    templateName: string,
+    projectId: string,
+    createdTasks: Array<{ id: string; name: string }>,
+    assignees: string[] = [],
+    reporterId?: string
+  ): Promise<void> {
+    try {
+      const taskIds = createdTasks.map(t => t.id);
+      const allUserIds = [...new Set([...assignees, reporterId].filter(Boolean))];
+
+      if (allUserIds.length === 0) return;
+
+      // Get notification preferences
+      const preferences = await this.getNotificationPreferences(allUserIds);
+      
+      // Send in-app notifications
+      const inAppUsers = preferences.filter(p => p.in_app_notifications !== false);
+      for (const user of inAppUsers) {
+        for (const task of createdTasks) {
+          await this.notifyTaskCreated({
+            userId: user.id,
+            projectId,
+            taskId: task.id,
+            taskName: task.name,
+            templateName,
+            scheduleId: '',
+            createdBy: 'system'
+          });
+        }
+      }
+
+      // Send email notifications
+      const emailUsers = preferences
+        .filter(p => p.email_notifications === true)
+        .map(p => p.id);
+      
+      if (emailUsers.length > 0) {
+        const subject = `New Recurring Tasks Created: ${templateName}`;
+        const message = `
+          <h3>Recurring Tasks Created</h3>
+          <p>${createdTasks.length} new tasks have been created from template "${templateName}":</p>
+          <ul>
+            ${createdTasks.map(t => `<li>${t.name}</li>`).join('')}
+          </ul>
+        `;
+        
+        await this.sendEmailNotifications(emailUsers, subject, message);
+      }
+
+      // Send push notifications
+      const pushUsers = preferences
+        .filter(p => p.push_notifications !== false)
+        .map(p => p.id);
+      
+      if (pushUsers.length > 0) {
+        await this.sendPushNotifications(
+          pushUsers,
+          'New Recurring Tasks',
+          `${createdTasks.length} tasks created from ${templateName}`,
+          {
+            type: 'recurring_tasks_created',
+            project_id: projectId,
+            task_count: createdTasks.length
+          }
+        );
+      }
+
+    } catch (error) {
+      log_error("Failed to send comprehensive notifications:", error);
+    }
+  }
+}
--- a/worklenz-backend/src/utils/recurring-tasks-permissions.ts
+++ b/worklenz-backend/src/utils/recurring-tasks-permissions.ts
@@ -0,0 +1,187 @@
+import db from "../config/db";
+import { log_error } from "../shared/utils";
+
+export interface PermissionCheckResult {
+  hasPermission: boolean;
+  reason?: string;
+  projectRole?: string;
+}
+
+export class RecurringTasksPermissions {
+  /**
+   * Check if a user has permission to create tasks in a project
+   */
+  static async canCreateTasksInProject(
+    userId: string,
+    projectId: string
+  ): Promise<PermissionCheckResult> {
+    try {
+      // Check if user is a member of the project
+      const memberQuery = `
+        SELECT pm.role_id, pr.name as role_name, pr.permissions
+        FROM project_members pm
+        JOIN project_member_roles pr ON pm.role_id = pr.id
+        WHERE pm.user_id = $1 AND pm.project_id = $2
+        LIMIT 1;
+      `;
+      
+      const result = await db.query(memberQuery, [userId, projectId]);
+      
+      if (result.rows.length === 0) {
+        return {
+          hasPermission: false,
+          reason: "User is not a member of the project"
+        };
+      }
+      
+      const member = result.rows[0];
+      
+      // Check if role has task creation permission
+      if (member.permissions && member.permissions.create_tasks === false) {
+        return {
+          hasPermission: false,
+          reason: "User role does not have permission to create tasks",
+          projectRole: member.role_name
+        };
+      }
+      
+      return {
+        hasPermission: true,
+        projectRole: member.role_name
+      };
+    } catch (error) {
+      log_error("Error checking project permissions:", error);
+      return {
+        hasPermission: false,
+        reason: "Error checking permissions"
+      };
+    }
+  }
+
+  /**
+   * Check if a template has valid permissions
+   */
+  static async validateTemplatePermissions(templateId: string): Promise<PermissionCheckResult> {
+    try {
+      const query = `
+        SELECT 
+          t.reporter_id,
+          t.project_id,
+          p.is_active as project_active,
+          p.archived as project_archived,
+          u.is_active as user_active
+        FROM task_recurring_templates trt
+        JOIN tasks t ON trt.task_id = t.id
+        JOIN projects p ON t.project_id = p.id
+        JOIN users u ON t.reporter_id = u.id
+        WHERE trt.id = $1
+        LIMIT 1;
+      `;
+      
+      const result = await db.query(query, [templateId]);
+      
+      if (result.rows.length === 0) {
+        return {
+          hasPermission: false,
+          reason: "Template not found"
+        };
+      }
+      
+      const template = result.rows[0];
+      
+      // Check if project is active
+      if (!template.project_active || template.project_archived) {
+        return {
+          hasPermission: false,
+          reason: "Project is not active or archived"
+        };
+      }
+      
+      // Check if reporter is still active
+      if (!template.user_active) {
+        return {
+          hasPermission: false,
+          reason: "Original task reporter is no longer active"
+        };
+      }
+      
+      // Check if reporter still has permissions in the project
+      const permissionCheck = await this.canCreateTasksInProject(
+        template.reporter_id,
+        template.project_id
+      );
+      
+      return permissionCheck;
+    } catch (error) {
+      log_error("Error validating template permissions:", error);
+      return {
+        hasPermission: false,
+        reason: "Error validating template permissions"
+      };
+    }
+  }
+
+  /**
+   * Get all templates with permission issues
+   */
+  static async getTemplatesWithPermissionIssues(): Promise<any[]> {
+    try {
+      const query = `
+        SELECT 
+          trt.id as template_id,
+          trt.name as template_name,
+          t.reporter_id,
+          u.name as reporter_name,
+          t.project_id,
+          p.name as project_name,
+          CASE 
+            WHEN NOT p.is_active THEN 'Project inactive'
+            WHEN p.archived THEN 'Project archived'
+            WHEN NOT u.is_active THEN 'User inactive'
+            WHEN NOT EXISTS (
+              SELECT 1 FROM project_members 
+              WHERE user_id = t.reporter_id AND project_id = t.project_id
+            ) THEN 'User not in project'
+            ELSE NULL
+          END as issue
+        FROM task_recurring_templates trt
+        JOIN tasks t ON trt.task_id = t.id
+        JOIN projects p ON t.project_id = p.id
+        JOIN users u ON t.reporter_id = u.id
+        WHERE 
+          NOT p.is_active 
+          OR p.archived 
+          OR NOT u.is_active
+          OR NOT EXISTS (
+            SELECT 1 FROM project_members 
+            WHERE user_id = t.reporter_id AND project_id = t.project_id
+          );
+      `;
+      
+      const result = await db.query(query);
+      return result.rows;
+    } catch (error) {
+      log_error("Error getting templates with permission issues:", error);
+      return [];
+    }
+  }
+
+  /**
+   * Validate all assignees have permissions
+   */
+  static async validateAssigneePermissions(
+    assignees: Array<{ team_member_id: string }>,
+    projectId: string
+  ): Promise<string[]> {
+    const invalidAssignees: string[] = [];
+    
+    for (const assignee of assignees) {
+      const check = await this.canCreateTasksInProject(assignee.team_member_id, projectId);
+      if (!check.hasPermission) {
+        invalidAssignees.push(assignee.team_member_id);
+      }
+    }
+    
+    return invalidAssignees;
+  }
+}
--- a/worklenz-backend/src/utils/retry-utils.ts
+++ b/worklenz-backend/src/utils/retry-utils.ts
@@ -0,0 +1,134 @@
+import { log_error } from "../shared/utils";
+
+export interface RetryOptions {
+  maxRetries: number;
+  delayMs: number;
+  backoffFactor?: number;
+  onRetry?: (error: any, attempt: number) => void;
+}
+
+export class RetryUtils {
+  /**
+   * Execute a function with retry logic
+   */
+  static async withRetry<T>(
+    fn: () => Promise<T>,
+    options: RetryOptions
+  ): Promise<T> {
+    const { maxRetries, delayMs, backoffFactor = 1.5, onRetry } = options;
+    let lastError: any;
+
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        return await fn();
+      } catch (error) {
+        lastError = error;
+        
+        if (attempt === maxRetries) {
+          throw error;
+        }
+
+        const delay = delayMs * Math.pow(backoffFactor, attempt - 1);
+        
+        if (onRetry) {
+          onRetry(error, attempt);
+        }
+
+        log_error(`Attempt ${attempt} failed. Retrying in ${delay}ms...`, error);
+        
+        await new Promise(resolve => setTimeout(resolve, delay));
+      }
+    }
+
+    throw lastError;
+  }
+
+  /**
+   * Execute database operations with retry logic
+   */
+  static async withDatabaseRetry<T>(
+    operation: () => Promise<T>,
+    operationName: string
+  ): Promise<T> {
+    return this.withRetry(operation, {
+      maxRetries: 3,
+      delayMs: 1000,
+      backoffFactor: 2,
+      onRetry: (error, attempt) => {
+        log_error(`Database operation '${operationName}' failed on attempt ${attempt}:`, error);
+      }
+    });
+  }
+
+  /**
+   * Check if an error is retryable
+   */
+  static isRetryableError(error: any): boolean {
+    // PostgreSQL error codes that are retryable
+    const retryableErrorCodes = [
+      '40001', // serialization_failure
+      '40P01', // deadlock_detected
+      '55P03', // lock_not_available
+      '57P01', // admin_shutdown
+      '57P02', // crash_shutdown
+      '57P03', // cannot_connect_now
+      '58000', // system_error
+      '58030', // io_error
+      '53000', // insufficient_resources
+      '53100', // disk_full
+      '53200', // out_of_memory
+      '53300', // too_many_connections
+      '53400', // configuration_limit_exceeded
+    ];
+
+    if (error.code && retryableErrorCodes.includes(error.code)) {
+      return true;
+    }
+
+    // Network-related errors
+    if (error.message && (
+      error.message.includes('ECONNRESET') ||
+      error.message.includes('ETIMEDOUT') ||
+      error.message.includes('ECONNREFUSED')
+    )) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Execute with conditional retry based on error type
+   */
+  static async withConditionalRetry<T>(
+    fn: () => Promise<T>,
+    options: RetryOptions
+  ): Promise<T> {
+    const { maxRetries, delayMs, backoffFactor = 1.5, onRetry } = options;
+    let lastError: any;
+
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        return await fn();
+      } catch (error) {
+        lastError = error;
+        
+        if (!this.isRetryableError(error) || attempt === maxRetries) {
+          throw error;
+        }
+
+        const delay = delayMs * Math.pow(backoffFactor, attempt - 1);
+        
+        if (onRetry) {
+          onRetry(error, attempt);
+        }
+
+        log_error(`Retryable error on attempt ${attempt}. Retrying in ${delay}ms...`, error);
+        
+        await new Promise(resolve => setTimeout(resolve, delay));
+      }
+    }
+
+    throw lastError;
+  }
+}
--- a/worklenz-backend/src/utils/timezone-utils.ts
+++ b/worklenz-backend/src/utils/timezone-utils.ts
@@ -0,0 +1,156 @@
+import moment from "moment-timezone";
+import { IRecurringSchedule } from "../interfaces/recurring-tasks";
+
+export class TimezoneUtils {
+  /**
+   * Convert a date from one timezone to another
+   */
+  static convertTimezone(date: moment.Moment | Date | string, fromTz: string, toTz: string): moment.Moment {
+    return moment.tz(date, fromTz).tz(toTz);
+  }
+
+  /**
+   * Get the current time in a specific timezone
+   */
+  static nowInTimezone(timezone: string): moment.Moment {
+    return moment.tz(timezone);
+  }
+
+  /**
+   * Check if a recurring task should run based on timezone
+   */
+  static shouldRunInTimezone(schedule: IRecurringSchedule, timezone: string): boolean {
+    const now = this.nowInTimezone(timezone);
+    const scheduleTime = moment.tz(schedule.created_at, timezone);
+    
+    // Check if it's the right time of day (within a 1-hour window)
+    const hourDiff = Math.abs(now.hour() - scheduleTime.hour());
+    return hourDiff < 1;
+  }
+
+  /**
+   * Calculate next end date considering timezone
+   */
+  static calculateNextEndDateWithTimezone(
+    schedule: IRecurringSchedule, 
+    lastDate: moment.Moment | Date | string,
+    timezone: string
+  ): moment.Moment {
+    const lastMoment = moment.tz(lastDate, timezone);
+    
+    switch (schedule.schedule_type) {
+      case "daily":
+        return lastMoment.clone().add(1, "day");
+        
+      case "weekly":
+        if (schedule.days_of_week && schedule.days_of_week.length > 0) {
+          // Find next occurrence based on selected days
+          let nextDate = lastMoment.clone();
+          let daysChecked = 0;
+          
+          do {
+            nextDate.add(1, "day");
+            daysChecked++;
+            if (schedule.days_of_week.includes(nextDate.day())) {
+              return nextDate;
+            }
+          } while (daysChecked < 7);
+          
+          // If no valid day found, return next week's first selected day
+          const sortedDays = [...schedule.days_of_week].sort((a, b) => a - b);
+          nextDate = lastMoment.clone().add(1, "week").day(sortedDays[0]);
+          return nextDate;
+        }
+        return lastMoment.clone().add(1, "week");
+        
+      case "monthly":
+        if (schedule.date_of_month) {
+          // Specific date of month
+          let nextDate = lastMoment.clone().add(1, "month").date(schedule.date_of_month);
+          
+          // Handle months with fewer days
+          if (nextDate.date() !== schedule.date_of_month) {
+            nextDate = nextDate.endOf("month");
+          }
+          
+          return nextDate;
+        } else if (schedule.week_of_month && schedule.day_of_month !== undefined) {
+          // Nth occurrence of a day in month
+          const nextMonth = lastMoment.clone().add(1, "month").startOf("month");
+          const targetDay = schedule.day_of_month;
+          const targetWeek = schedule.week_of_month;
+          
+          // Find first occurrence of the target day
+          let firstOccurrence = nextMonth.clone();
+          while (firstOccurrence.day() !== targetDay) {
+            firstOccurrence.add(1, "day");
+          }
+          
+          // Calculate nth occurrence
+          if (targetWeek === 5) {
+            // Last occurrence
+            let lastOccurrence = firstOccurrence.clone();
+            let temp = firstOccurrence.clone().add(7, "days");
+            
+            while (temp.month() === nextMonth.month()) {
+              lastOccurrence = temp.clone();
+              temp.add(7, "days");
+            }
+            
+            return lastOccurrence;
+          } else {
+            // Specific week number
+            return firstOccurrence.add((targetWeek - 1) * 7, "days");
+          }
+        }
+        return lastMoment.clone().add(1, "month");
+        
+      case "every_x_days":
+        return lastMoment.clone().add(schedule.interval_days || 1, "days");
+        
+      case "every_x_weeks":
+        return lastMoment.clone().add(schedule.interval_weeks || 1, "weeks");
+        
+      case "every_x_months":
+        return lastMoment.clone().add(schedule.interval_months || 1, "months");
+        
+      default:
+        return lastMoment.clone().add(1, "day");
+    }
+  }
+
+  /**
+   * Get all timezones that should be processed in the current hour
+   */
+  static getActiveTimezones(): string[] {
+    const activeTimezones: string[] = [];
+    const allTimezones = moment.tz.names();
+    
+    for (const tz of allTimezones) {
+      const tzTime = moment.tz(tz);
+      // Check if it's 11:00 AM in this timezone (matching the cron schedule)
+      if (tzTime.hour() === 11) {
+        activeTimezones.push(tz);
+      }
+    }
+    
+    return activeTimezones;
+  }
+
+  /**
+   * Validate timezone string
+   */
+  static isValidTimezone(timezone: string): boolean {
+    return moment.tz.zone(timezone) !== null;
+  }
+
+  /**
+   * Get user's timezone or default to UTC
+   */
+  static getUserTimezone(userTimezone?: string): string {
+    if (userTimezone && this.isValidTimezone(userTimezone)) {
+      return userTimezone;
+    }
+    return "UTC";
+  }
+}
--- a/worklenz-frontend/index.html
+++ b/worklenz-frontend/index.html
@@ -57,15 +57,116 @@
    <!-- Environment configuration -->
    <script src="/env-config.js"></script>
    
-    <!-- Analytics Module -->
-    <script src="/js/analytics.js"></script>
+    <!-- Optimized Google Analytics with reduced blocking -->
+    <script>
+      // Function to initialize Google Analytics asynchronously
+      function initGoogleAnalytics() {
+        // Use requestIdleCallback to defer analytics loading
+        const loadAnalytics = () => {
+          // Determine which tracking ID to use based on the environment
+          const isProduction = window.location.hostname === 'app.worklenz.com';
+
+          const trackingId = isProduction ? 'G-7KSRKQ1397' : 'G-3LM2HGWEXG'; // Open source tracking ID
+
+          // Load the Google Analytics script
+          const script = document.createElement('script');
+          script.async = true;
+          script.src = `https://www.googletagmanager.com/gtag/js?id=${trackingId}`;
+          document.head.appendChild(script);
+
+          // Initialize Google Analytics
+          window.dataLayer = window.dataLayer || [];
+          function gtag() {
+            dataLayer.push(arguments);
+          }
+          gtag('js', new Date());
+          gtag('config', trackingId);
+        };
+
+        // Use requestIdleCallback if available, otherwise setTimeout
+        if ('requestIdleCallback' in window) {
+          requestIdleCallback(loadAnalytics, { timeout: 2000 });
+        } else {
+          setTimeout(loadAnalytics, 1000);
+        }
+      }
+
+      // Initialize analytics after a delay to not block initial render
+      initGoogleAnalytics();
+
+      // Function to show privacy notice
+      function showPrivacyNotice() {
+        const notice = document.createElement('div');
+        notice.style.cssText = `
+          position: fixed;
+          bottom: 16px;
+          right: 16px;
+          background: #222;
+          color: #f5f5f5;
+          padding: 12px 16px 10px 16px;
+          border-radius: 7px;
+          box-shadow: 0 2px 8px rgba(0,0,0,0.18);
+          z-index: 1000;
+          max-width: 320px;
+          font-family: Inter, sans-serif;
+          border: 1px solid #333;
+          font-size: 0.95rem;
+        `;
+        notice.innerHTML = `
+          <div style="margin-bottom: 6px; font-weight: 600; color: #fff; font-size: 1rem;">Analytics Notice</div>
+          <div style="margin-bottom: 8px; color: #f5f5f5;">This app uses Google Analytics for anonymous usage stats. No personal data is tracked.</div>
+          <button id="analytics-notice-btn" style="padding: 5px 14px; background: #1890ff; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.95rem;">Got it</button>
+        `;
+        document.body.appendChild(notice);
+        // Add event listener to button
+        const btn = notice.querySelector('#analytics-notice-btn');
+        btn.addEventListener('click', function (e) {
+          e.preventDefault();
+          localStorage.setItem('privacyNoticeShown', 'true');
+          notice.remove();
+        });
+      }
+
+      // Wait for DOM to be ready
+      document.addEventListener('DOMContentLoaded', function () {
+        // Check if we should show the notice
+        const isProduction =
+          window.location.hostname === 'worklenz.com' ||
+          window.location.hostname === 'app.worklenz.com';
+        const noticeShown = localStorage.getItem('privacyNoticeShown') === 'true';
+
+        // Show notice if not in production and not shown before
+        if (!isProduction && !noticeShown) {
+          showPrivacyNotice();
+        }
+      });
+    </script>
  </head>

  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
    <script type="module" src="./src/index.tsx"></script>
-    <!-- HubSpot Integration Module -->
-    <script src="/js/hubspot.js"></script>
+    <script type="text/javascript">
+      // Load HubSpot script asynchronously and only for production
+      if (window.location.hostname === 'app.worklenz.com') {
+        // Use requestIdleCallback to defer HubSpot loading
+        const loadHubSpot = () => {
+          var hs = document.createElement('script');
+          hs.type = 'text/javascript';
+          hs.id = 'hs-script-loader';
+          hs.async = true;
+          hs.defer = true;
+          hs.src = '//js.hs-scripts.com/22348300.js';
+          document.body.appendChild(hs);
+        };
+
+        if ('requestIdleCallback' in window) {
+          requestIdleCallback(loadHubSpot, { timeout: 3000 });
+        } else {
+          setTimeout(loadHubSpot, 2000);
+        }
+      }
+    </script>
  </body>
 </html>
--- a/worklenz-frontend/public/js/analytics.js
+++ b/worklenz-frontend/public/js/analytics.js
@@ -1,97 +0,0 @@
-/**
- * Google Analytics initialization module
- * Handles analytics loading and privacy notices
- */
-
-class AnalyticsManager {
-  constructor() {
-    this.isProduction = window.location.hostname === 'app.worklenz.com';
-    this.trackingId = this.isProduction ? 'G-7KSRKQ1397' : 'G-3LM2HGWEXG';
-  }
-
-  /**
-   * Initialize Google Analytics asynchronously
-   */
-  init() {
-    const loadAnalytics = () => {
-      // Load the Google Analytics script
-      const script = document.createElement('script');
-      script.async = true;
-      script.src = `https://www.googletagmanager.com/gtag/js?id=${this.trackingId}`;
-      document.head.appendChild(script);
-
-      // Initialize Google Analytics
-      window.dataLayer = window.dataLayer || [];
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-      gtag('js', new Date());
-      gtag('config', this.trackingId);
-    };
-
-    // Use requestIdleCallback if available, otherwise setTimeout
-    if ('requestIdleCallback' in window) {
-      requestIdleCallback(loadAnalytics, { timeout: 2000 });
-    } else {
-      setTimeout(loadAnalytics, 1000);
-    }
-  }
-
-  /**
-   * Show privacy notice for non-production environments
-   */
-  showPrivacyNotice() {
-    const notice = document.createElement('div');
-    notice.style.cssText = `
-      position: fixed;
-      bottom: 16px;
-      right: 16px;
-      background: #222;
-      color: #f5f5f5;
-      padding: 12px 16px 10px 16px;
-      border-radius: 7px;
-      box-shadow: 0 2px 8px rgba(0,0,0,0.18);
-      z-index: 1000;
-      max-width: 320px;
-      font-family: Inter, sans-serif;
-      border: 1px solid #333;
-      font-size: 0.95rem;
-    `;
-    notice.innerHTML = `
-      <div style="margin-bottom: 6px; font-weight: 600; color: #fff; font-size: 1rem;">Analytics Notice</div>
-      <div style="margin-bottom: 8px; color: #f5f5f5;">This app uses Google Analytics for anonymous usage stats. No personal data is tracked.</div>
-      <button id="analytics-notice-btn" style="padding: 5px 14px; background: #1890ff; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.95rem;">Got it</button>
-    `;
-    document.body.appendChild(notice);
-
-    // Add event listener to button
-    const btn = notice.querySelector('#analytics-notice-btn');
-    btn.addEventListener('click', (e) => {
-      e.preventDefault();
-      localStorage.setItem('privacyNoticeShown', 'true');
-      notice.remove();
-    });
-  }
-
-  /**
-   * Check if privacy notice should be shown
-   */
-  checkPrivacyNotice() {
-    const isProduction = 
-      window.location.hostname === 'worklenz.com' ||
-      window.location.hostname === 'app.worklenz.com';
-    const noticeShown = localStorage.getItem('privacyNoticeShown') === 'true';
-
-    // Show notice if not in production and not shown before
-    if (!isProduction && !noticeShown) {
-      this.showPrivacyNotice();
-    }
-  }
-}
-
-// Initialize analytics when DOM is ready
-document.addEventListener('DOMContentLoaded', () => {
-  const analytics = new AnalyticsManager();
-  analytics.init();
-  analytics.checkPrivacyNotice();
-});
--- a/worklenz-frontend/public/js/hubspot.js
+++ b/worklenz-frontend/public/js/hubspot.js
@@ -1,137 +0,0 @@
-/**
- * HubSpot Chat Widget integration module
- * Handles widget loading and dark mode theming
- */
-
-class HubSpotManager {
-  constructor() {
-    this.isProduction = window.location.hostname === 'app.worklenz.com';
-    this.scriptId = 'hs-script-loader';
-    this.scriptSrc = '//js.hs-scripts.com/22348300.js';
-    this.styleId = 'hubspot-dark-mode-override';
-  }
-
-  /**
-   * Load HubSpot script with dark mode support
-   */
-  init() {
-    if (!this.isProduction) return;
-
-    const loadHubSpot = () => {
-      const script = document.createElement('script');
-      script.type = 'text/javascript';
-      script.id = this.scriptId;
-      script.async = true;
-      script.defer = true;
-      script.src = this.scriptSrc;
-      
-      // Configure dark mode after script loads
-      script.onload = () => this.setupDarkModeSupport();
-      
-      document.body.appendChild(script);
-    };
-
-    // Use requestIdleCallback for better performance
-    if ('requestIdleCallback' in window) {
-      requestIdleCallback(loadHubSpot, { timeout: 3000 });
-    } else {
-      setTimeout(loadHubSpot, 2000);
-    }
-  }
-
-  /**
-   * Setup dark mode theme switching for HubSpot widget
-   */
-  setupDarkModeSupport() {
-    const applyTheme = () => {
-      const isDark = document.documentElement.classList.contains('dark');
-      
-      // Remove existing theme styles
-      const existingStyle = document.getElementById(this.styleId);
-      if (existingStyle) {
-        existingStyle.remove();
-      }
-      
-      if (isDark) {
-        this.injectDarkModeCSS();
-      }
-    };
-    
-    // Apply initial theme after delay to ensure widget is loaded
-    setTimeout(applyTheme, 1000);
-    
-    // Watch for theme changes
-    const observer = new MutationObserver(applyTheme);
-    observer.observe(document.documentElement, {
-      attributes: true,
-      attributeFilter: ['class']
-    });
-  }
-
-  /**
-   * Inject CSS for dark mode styling
-   */
-  injectDarkModeCSS() {
-    const style = document.createElement('style');
-    style.id = this.styleId;
-    style.textContent = `
-      /* HubSpot Chat Widget Dark Mode Override */
-      #hubspot-conversations-inline-parent,
-      #hubspot-conversations-iframe-container,
-      .shadow-2xl.widget-align-right.widget-align-bottom,
-      [data-test-id="chat-widget"],
-      [class*="VizExCollapsedChat"],
-      [class*="VizExExpandedChat"],
-      iframe[src*="hubspot"] {
-        filter: invert(1) hue-rotate(180deg) !important;
-        background: transparent !important;
-      }
-      
-      /* Target HubSpot widget container backgrounds */
-      #hubspot-conversations-inline-parent div,
-      #hubspot-conversations-iframe-container div,
-      [data-test-id="chat-widget"] div {
-        background-color: transparent !important;
-      }
-      
-      /* Prevent double inversion of images, avatars, and icons */
-      #hubspot-conversations-iframe-container img,
-      #hubspot-conversations-iframe-container [style*="background-image"],
-      #hubspot-conversations-iframe-container svg,
-      iframe[src*="hubspot"] img,
-      iframe[src*="hubspot"] svg,
-      [data-test-id="chat-widget"] img,
-      [data-test-id="chat-widget"] svg {
-        filter: invert(1) hue-rotate(180deg) !important;
-      }
-      
-      /* Additional targeting for widget launcher and chat bubble */
-      div[class*="shadow-2xl"],
-      div[class*="widget-align"],
-      div[style*="position: fixed"] {
-        filter: invert(1) hue-rotate(180deg) !important;
-      }
-    `;
-    document.head.appendChild(style);
-  }
-
-  /**
-   * Remove HubSpot widget and associated styles
-   */
-  cleanup() {
-    const script = document.getElementById(this.scriptId);
-    const style = document.getElementById(this.styleId);
-    
-    if (script) script.remove();
-    if (style) style.remove();
-  }
-}
-
-// Initialize HubSpot integration
-document.addEventListener('DOMContentLoaded', () => {
-  const hubspot = new HubSpotManager();
-  hubspot.init();
-  
-  // Make available globally for potential cleanup
-  window.HubSpotManager = hubspot;
-});
--- a/worklenz-frontend/public/locales/alb/auth/signup.json
+++ b/worklenz-frontend/public/locales/alb/auth/signup.json
@@ -7,13 +7,11 @@
  "emailLabel": "Email",
  "emailPlaceholder": "Shkruani email-in tuaj",
  "emailRequired": "Ju lutemi shkruani Email-in tuaj!",
-  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Enter your password",
+  "passwordLabel": "Fjalëkalimi",
+  "passwordPlaceholder": "Krijoni një fjalëkalim",
  "passwordRequired": "Ju lutemi krijoni një Fjalëkalim!",
  "passwordMinCharacterRequired": "Fjalëkalimi duhet të jetë së paku 8 karaktere!",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
-  "passwordPatternRequired": "Fjalëkalimi nuk i plotëson kërkesat!",
+  "passwordPatternRequired": "Fjalëkalimi nuk plotëson kërkesat!",
  "strongPasswordPlaceholder": "Vendosni një fjalëkalim më të fortë",
  "passwordValidationAltText": "Fjalëkalimi duhet të përmbajë së paku 8 karaktere me shkronja të mëdha dhe të vogla, një numër dhe një simbol.",
  "signupSuccessMessage": "Jeni regjistruar me sukses!",
--- a/worklenz-frontend/public/locales/de/auth/signup.json
+++ b/worklenz-frontend/public/locales/de/auth/signup.json
@@ -7,13 +7,11 @@
  "emailLabel": "E-Mail",
  "emailPlaceholder": "Ihre E-Mail-Adresse eingeben",
  "emailRequired": "Bitte geben Sie Ihre E-Mail-Adresse ein!",
-  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Enter your password",
+  "passwordLabel": "Passwort",
+  "passwordPlaceholder": "Ihr Passwort eingeben",
  "passwordRequired": "Bitte geben Sie Ihr Passwort ein!",
  "passwordMinCharacterRequired": "Das Passwort muss mindestens 8 Zeichen lang sein!",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
-  "passwordPatternRequired": "Das Passwort entspricht nicht den Anforderungen!",
+  "passwordPatternRequired": "Das Passwort erfüllt nicht die Anforderungen!",
  "strongPasswordPlaceholder": "Ein stärkeres Passwort eingeben",
  "passwordValidationAltText": "Das Passwort muss mindestens 8 Zeichen enthalten, mit Groß- und Kleinbuchstaben, einer Zahl und einem Sonderzeichen.",
  "signupSuccessMessage": "Sie haben sich erfolgreich registriert!",
--- a/worklenz-frontend/public/locales/en/auth/signup.json
+++ b/worklenz-frontend/public/locales/en/auth/signup.json
@@ -8,11 +8,9 @@
  "emailPlaceholder": "Enter your email",
  "emailRequired": "Please enter your Email!",
  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
  "passwordPlaceholder": "Enter your password",
  "passwordRequired": "Please enter your Password!",
  "passwordMinCharacterRequired": "Password must be at least 8 characters!",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
  "passwordPatternRequired": "Password does not meet the requirements!",
  "strongPasswordPlaceholder": "Enter a stronger password",
  "passwordValidationAltText": "Password must include at least 8 characters with upper and lower case letters, a number, and a symbol.",
--- a/worklenz-frontend/public/locales/es/auth/signup.json
+++ b/worklenz-frontend/public/locales/es/auth/signup.json
@@ -7,12 +7,10 @@
  "emailLabel": "Correo electrónico",
  "emailPlaceholder": "Ingresa tu correo electrónico",
  "emailRequired": "¡Por favor ingresa tu correo electrónico!",
-  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Enter your password",
+  "passwordLabel": "Contraseña",
+  "passwordPlaceholder": "Ingresa tu contraseña",
  "passwordRequired": "¡Por favor ingresa tu contraseña!",
  "passwordMinCharacterRequired": "¡La contraseña debe tener al menos 8 caracteres!",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
  "passwordPatternRequired": "¡La contraseña no cumple con los requisitos!",
  "strongPasswordPlaceholder": "Ingresa una contraseña más segura",
  "passwordValidationAltText": "La contraseña debe incluir al menos 8 caracteres con letras mayúsculas y minúsculas, un número y un símbolo.",
--- a/worklenz-frontend/public/locales/pt/auth/signup.json
+++ b/worklenz-frontend/public/locales/pt/auth/signup.json
@@ -7,13 +7,11 @@
  "emailLabel": "Email",
  "emailPlaceholder": "Insira seu email",
  "emailRequired": "Por favor, insira seu Email!",
-  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Enter your password",
+  "passwordLabel": "Senha",
+  "passwordPlaceholder": "Insira sua senha",
  "passwordRequired": "Por favor, insira sua Senha!",
  "passwordMinCharacterRequired": "Senha deve ter pelo menos 8 caracteres!",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
-  "passwordPatternRequired": "A senha não atende aos requisitos!",
+  "passwordPatternRequired": "Senha não atende aos requisitos!",
  "strongPasswordPlaceholder": "Insira uma senha mais forte",
  "passwordValidationAltText": "Senha deve incluir pelo menos 8 caracteres com letras maiúsculas e minúsculas, um número e um símbolo.",
  "signupSuccessMessage": "Você se inscreveu com sucesso!",
--- a/worklenz-frontend/public/locales/zh/auth/signup.json
+++ b/worklenz-frontend/public/locales/zh/auth/signup.json
@@ -7,12 +7,10 @@
  "emailLabel": "电子邮件",
  "emailPlaceholder": "输入您的电子邮件",
  "emailRequired": "请输入您的电子邮件！",
-  "passwordLabel": "Password",
-  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Enter your password",
+  "passwordLabel": "密码",
+  "passwordPlaceholder": "输入您的密码",
  "passwordRequired": "请输入您的密码！",
  "passwordMinCharacterRequired": "密码必须至少包含8个字符！",
-  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
  "passwordPatternRequired": "密码不符合要求！",
  "strongPasswordPlaceholder": "输入更强的密码",
  "passwordValidationAltText": "密码必须至少包含8个字符，包括大小写字母、一个数字和一个符号。",
--- a/worklenz-frontend/src/app/routes/auth-routes.tsx
+++ b/worklenz-frontend/src/app/routes/auth-routes.tsx
@@ -4,12 +4,12 @@ import { Navigate } from 'react-router-dom';
 import { SuspenseFallback } from '@/components/suspense-fallback/suspense-fallback';

 // Lazy load auth page components for better code splitting
-const LoginPage = lazy(() => import('@/pages/auth/LoginPage'));
-const SignupPage = lazy(() => import('@/pages/auth/SignupPage'));
-const ForgotPasswordPage = lazy(() => import('@/pages/auth/ForgotPasswordPage'));
-const LoggingOutPage = lazy(() => import('@/pages/auth/LoggingOutPage'));
-const AuthenticatingPage = lazy(() => import('@/pages/auth/AuthenticatingPage'));
-const VerifyResetEmailPage = lazy(() => import('@/pages/auth/VerifyResetEmailPage'));
+const LoginPage = lazy(() => import('@/pages/auth/login-page'));
+const SignupPage = lazy(() => import('@/pages/auth/signup-page'));
+const ForgotPasswordPage = lazy(() => import('@/pages/auth/forgot-password-page'));
+const LoggingOutPage = lazy(() => import('@/pages/auth/logging-out'));
+const AuthenticatingPage = lazy(() => import('@/pages/auth/authenticating'));
+const VerifyResetEmailPage = lazy(() => import('@/pages/auth/verify-reset-email'));

 const authRoutes = [
  {
--- a/worklenz-frontend/src/components/AssigneeSelector.tsx
+++ b/worklenz-frontend/src/components/AssigneeSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useSelector } from 'react-redux';
-import { PlusOutlined, UserAddOutlined } from '@/shared/antd-imports';
+import { PlusOutlined, UserAddOutlined } from '@ant-design/icons';
 import { RootState } from '@/app/store';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { ITeamMembersViewModel } from '@/types/teamMembers/teamMembersViewModel.types';
--- a/worklenz-frontend/src/components/AuthPageHeader.tsx
+++ b/worklenz-frontend/src/components/AuthPageHeader.tsx
@@ -1,4 +1,4 @@
-import { Flex, Typography } from '@/shared/antd-imports';
+import { Flex, Typography } from 'antd';
 import logo from '@/assets/images/worklenz-light-mode.png';
 import logoDark from '@/assets/images/worklenz-dark-mode.png';
 import { useAppSelector } from '@/hooks/useAppSelector';
--- a/worklenz-frontend/src/components/CustomColordLabel.tsx
+++ b/worklenz-frontend/src/components/CustomColordLabel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip } from '@/shared/antd-imports';
+import { Tooltip } from 'antd';
 import { Label } from '@/types/task-management.types';
 import { ITaskLabel } from '@/types/tasks/taskLabel.types';

--- a/worklenz-frontend/src/components/CustomNumberLabel.tsx
+++ b/worklenz-frontend/src/components/CustomNumberLabel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip } from '@/shared/antd-imports';
+import { Tooltip } from 'antd';
 import { NumbersColorMap } from '@/shared/constants';

 interface CustomNumberLabelProps {
--- a/worklenz-frontend/src/components/CustomSearchbar.tsx
+++ b/worklenz-frontend/src/components/CustomSearchbar.tsx
@@ -1,5 +1,5 @@
-import { SearchOutlined } from '@/shared/antd-imports';
-import { Input } from '@/shared/antd-imports';
+import { SearchOutlined } from '@ant-design/icons';
+import { Input } from 'antd';

 type CustomSearchbarProps = {
  placeholderText: string;
--- a/worklenz-frontend/src/components/CustomTableTitle.tsx
+++ b/worklenz-frontend/src/components/CustomTableTitle.tsx
@@ -1,6 +1,6 @@
-import { Flex, Tooltip, Typography } from '@/shared/antd-imports';
+import { Flex, Tooltip, Typography } from 'antd';
 import { colors } from '../styles/colors';
-import { ExclamationCircleOutlined } from '@/shared/antd-imports';
+import { ExclamationCircleOutlined } from '@ant-design/icons';

 // this custom table title used when the typography font weigh 500 needed
 const CustomTableTitle = ({ title, tooltip }: { title: string; tooltip?: string | null }) => {
--- a/worklenz-frontend/src/components/EmptyListPlaceholder.tsx
+++ b/worklenz-frontend/src/components/EmptyListPlaceholder.tsx
@@ -1,24 +1,17 @@
-import { Empty, Typography } from '@/shared/antd-imports';
+import { Empty, Typography } from 'antd';
 import React from 'react';
-import { useTranslation } from 'react-i18next';

 type EmptyListPlaceholderProps = {
  imageSrc?: string;
  imageHeight?: number;
-  text?: string;
-  textKey?: string;
-  i18nNs?: string;
+  text: string;
 };

 const EmptyListPlaceholder = ({
  imageSrc = 'https://s3.us-west-2.amazonaws.com/worklenz.com/assets/empty-box.webp',
  imageHeight = 60,
  text,
-  textKey,
-  i18nNs = 'task-list-table',
 }: EmptyListPlaceholderProps) => {
-  const { t } = useTranslation(i18nNs);
-  const description = textKey ? t(textKey) : text;
  return (
    <Empty
      image={imageSrc}
@@ -29,7 +22,7 @@ const EmptyListPlaceholder = ({
        alignItems: 'center',
        marginBlockStart: 24,
      }}
-      description={<Typography.Text type="secondary">{description}</Typography.Text>}
+      description={<Typography.Text type="secondary">{text}</Typography.Text>}
    />
  );
 };
--- a/worklenz-frontend/src/components/ErrorBoundary.tsx
+++ b/worklenz-frontend/src/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Result } from '@/shared/antd-imports';
+import { Button, Result } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import logger from '@/utils/errorLogger';
--- a/worklenz-frontend/src/components/LabelsSelector.tsx
+++ b/worklenz-frontend/src/components/LabelsSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
 import { useSelector } from 'react-redux';
-import { PlusOutlined, TagOutlined } from '@/shared/antd-imports';
+import { PlusOutlined, TagOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { RootState } from '@/app/store';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
--- a/worklenz-frontend/src/components/ModuleErrorBoundary.tsx
+++ b/worklenz-frontend/src/components/ModuleErrorBoundary.tsx
@@ -1,5 +1,5 @@
 import React, { Component, ErrorInfo, ReactNode } from 'react';
-import { Button, Result } from '@/shared/antd-imports';
+import { Button, Result } from 'antd';
 import CacheCleanup from '@/utils/cache-cleanup';

 interface Props {
--- a/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
+++ b/worklenz-frontend/src/components/PinRouteToNavbarButton.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { getJSONFromLocalStorage, saveJSONToLocalStorage } from '../utils/localStorageFunctions';
-import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
-import { PushpinFilled, PushpinOutlined } from '@/shared/antd-imports';
+import { Button, ConfigProvider, Tooltip } from 'antd';
+import { PushpinFilled, PushpinOutlined } from '@ant-design/icons';
 import { colors } from '../styles/colors';
 import { navRoutes, NavRoutesType } from '../features/navbar/navRoutes';

--- a/worklenz-frontend/src/components/PreferenceSelector.tsx
+++ b/worklenz-frontend/src/components/PreferenceSelector.tsx
@@ -1,5 +1,5 @@
-import { FloatButton, Space, Tooltip } from '@/shared/antd-imports';
-import { FormatPainterOutlined } from '@/shared/antd-imports';
+import { FloatButton, Space, Tooltip } from 'antd';
+import { FormatPainterOutlined } from '@ant-design/icons';
 // import LanguageSelector from '../features/i18n/language-selector';
 // import ThemeSelector from '../features/theme/ThemeSelector';

--- a/worklenz-frontend/src/components/account-setup/members-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/members-step.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, Button, List, Alert, message, InputRef } from '@/shared/antd-imports';
-import { CloseCircleOutlined, MailOutlined, PlusOutlined } from '@/shared/antd-imports';
+import { Form, Input, Button, List, Alert, message, InputRef } from 'antd';
+import { CloseCircleOutlined, MailOutlined, PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
-import { Typography } from '@/shared/antd-imports';
+import { Typography } from 'antd';
 import { setTeamMembers, setTasks } from '@/features/account-setup/account-setup.slice';
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '@/app/store';
--- a/worklenz-frontend/src/components/account-setup/organization-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/organization-step.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, InputRef, Typography } from '@/shared/antd-imports';
+import { Form, Input, InputRef, Typography } from 'antd';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { setOrganizationName } from '@/features/account-setup/account-setup.slice';
--- a/worklenz-frontend/src/components/account-setup/project-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/project-step.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';

-import { Button, Drawer, Form, Input, InputRef, Select, Typography } from '@/shared/antd-imports';
+import { Button, Drawer, Form, Input, InputRef, Select, Typography } from 'antd';
 import TemplateDrawer from '../common/template-drawer/template-drawer';

 import { RootState } from '@/app/store';
--- a/worklenz-frontend/src/components/account-setup/tasks-step.tsx
+++ b/worklenz-frontend/src/components/account-setup/tasks-step.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
-import { Form, Input, Button, Typography, List, InputRef } from '@/shared/antd-imports';
-import { PlusOutlined, DeleteOutlined, CloseCircleOutlined } from '@/shared/antd-imports';
+import { Form, Input, Button, Typography, List, InputRef } from 'antd';
+import { PlusOutlined, DeleteOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { RootState } from '@/app/store';
--- a/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown-v2/add-members-dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
-import { UserAddOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
+import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from 'antd';
+import { UserAddOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import './add-members-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { AvatarNamesMap } from '@/shared/constants';
--- a/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
+++ b/worklenz-frontend/src/components/add-members-dropdown/add-members-dropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from '@/shared/antd-imports';
-import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
+import { Avatar, Button, Checkbox, Dropdown, Input, Menu, Typography } from 'antd';
+import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import './add-members-dropdown.css';
 import { AvatarNamesMap } from '../../shared/constants';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/charges-table.tsx
@@ -2,7 +2,7 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingCharge, IBillingChargesResponse } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { formatDate } from '@/utils/timeUtils';
-import { Table, TableProps, Tag } from '@/shared/antd-imports';
+import { Table, TableProps, Tag } from 'antd';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';

@@ -27,19 +27,19 @@ const ChargesTable: React.FC = () => {

  const columns: TableProps<IBillingCharge>['columns'] = [
    {
-      title: t('description') as string,
+      title: t('description'),
      key: 'name',
      dataIndex: 'name',
    },
    {
-      title: t('billingPeriod') as string,
+      title: t('billingPeriod'),
      key: 'billingPeriod',
      render: record => {
        return `${formatDate(new Date(record.start_date))} - ${formatDate(new Date(record.end_date))}`;
      },
    },
    {
-      title: t('billStatus') as string,
+      title: t('billStatus'),
      key: 'status',
      dataIndex: 'status',
      render: (_, record) => {
@@ -55,7 +55,7 @@ const ChargesTable: React.FC = () => {
      },
    },
    {
-      title: t('perUserValue') as string,
+      title: t('perUserValue'),
      key: 'perUserValue',
      dataIndex: 'perUserValue',
      render: (_, record) => (
@@ -65,12 +65,12 @@ const ChargesTable: React.FC = () => {
      ),
    },
    {
-      title: t('users') as string,
+      title: t('users'),
      key: 'quantity',
      dataIndex: 'quantity',
    },
    {
-      title: t('amount') as string,
+      title: t('amount'),
      key: 'amount',
      dataIndex: 'amount',
      render: (_, record) => (
--- a/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/billing-tables/invoices-table.tsx
@@ -2,8 +2,8 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingTransaction } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
 import { formatDate } from '@/utils/timeUtils';
-import { ContainerOutlined } from '@/shared/antd-imports';
-import { Button, Table, TableProps, Tag, Tooltip } from '@/shared/antd-imports';
+import { ContainerOutlined } from '@ant-design/icons';
+import { Button, Table, TableProps, Tag, Tooltip } from 'antd';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';

--- a/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-bill.tsx
@@ -1,7 +1,7 @@
-import { Card, Col, Row, Tooltip } from '@/shared/antd-imports';
-import React, { useEffect, useMemo, useCallback } from 'react';
+import { Card, Col, Row, Tooltip, Typography } from 'antd';
+import React, { useEffect } from 'react';
 import './current-bill.css';
-import { InfoCircleTwoTone } from '@/shared/antd-imports';
+import { InfoCircleTwoTone } from '@ant-design/icons';
 import ChargesTable from './billing-tables/charges-table';
 import InvoicesTable from './billing-tables/invoices-table';

@@ -20,7 +20,7 @@ import AccountStorage from './account-storage/account-storage';
 import { useAuthService } from '@/hooks/useAuth';
 import { ISUBSCRIPTION_TYPE } from '@/shared/constants';

-const CurrentBill: React.FC = React.memo(() => {
+const CurrentBill: React.FC = () => {
  const dispatch = useAppDispatch();
  const { t } = useTranslation('admin-center/current-bill');
  const themeMode = useAppSelector(state => state.themeReducer.mode);
@@ -32,90 +32,70 @@ const CurrentBill: React.FC = React.memo(() => {
    dispatch(fetchFreePlanSettings());
  }, [dispatch]);

-  const titleStyle = useMemo(
-    () => ({
-      color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9',
-      fontWeight: 500,
-      fontSize: '16px',
-      display: 'flex',
-      gap: '4px',
-    }),
-    [themeMode]
+  const titleStyle = {
+    color: themeMode === 'dark' ? '#ffffffd9' : '#000000d9',
+    fontWeight: 500,
+    fontSize: '16px',
+    display: 'flex',
+    gap: '4px',
+  };
+
+  const renderMobileView = () => (
+    <div>
+      <Col span={24}>
+        <CurrentPlanDetails />
+      </Col>
+
+      <Col span={24} style={{ marginTop: '1.5rem' }}>
+        <AccountStorage themeMode={themeMode} />
+      </Col>
+    </div>
  );

-  const cardStyle = useMemo(() => ({ marginTop: '16px' }), []);
-  const colStyle = useMemo(() => ({ marginTop: '1.5rem' }), []);
-  const tabletColStyle = useMemo(() => ({ paddingRight: '10px' }), []);
-  const tabletColStyleRight = useMemo(() => ({ paddingLeft: '10px' }), []);
-
-  const renderMobileView = useCallback(
-    () => (
-      <div>
-        <Col span={24}>
-          <CurrentPlanDetails />
-        </Col>
-
-        <Col span={24} style={colStyle}>
-          <AccountStorage themeMode={themeMode} />
-        </Col>
+  const renderChargesAndInvoices = () => (
+    <>
+      <div style={{ marginTop: '1.5rem' }}>
+        <Card
+          title={
+            <span style={titleStyle}>
+              <span>{t('charges')}</span>
+              <Tooltip title={t('tooltip')}>
+                <InfoCircleTwoTone />
+              </Tooltip>
+            </span>
+          }
+          style={{ marginTop: '16px' }}
+        >
+          <ChargesTable />
+        </Card>
      </div>
-    ),
-    [colStyle, themeMode]
-  );

-  const renderChargesAndInvoices = useCallback(
-    () => (
-      <>
-        <div style={colStyle}>
-          <Card
-            title={
-              <span style={titleStyle}>
-                <span>{t('charges')}</span>
-                <Tooltip title={t('tooltip')}>
-                  <InfoCircleTwoTone />
-                </Tooltip>
-              </span>
-            }
-            style={cardStyle}
-          >
-            <ChargesTable />
-          </Card>
-        </div>
-
-        <div style={colStyle}>
-          <Card title={<span style={titleStyle}>{t('invoices')}</span>} style={cardStyle}>
-            <InvoicesTable />
-          </Card>
-        </div>
-      </>
-    ),
-    [colStyle, titleStyle, cardStyle, t]
-  );
-
-  const shouldShowChargesAndInvoices = useMemo(
-    () => currentSession?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE,
-    [currentSession?.subscription_type]
+      <div style={{ marginTop: '1.5rem' }}>
+        <Card title={<span style={titleStyle}>{t('invoices')}</span>} style={{ marginTop: '16px' }}>
+          <InvoicesTable />
+        </Card>
+      </div>
+    </>
  );

  return (
    <div style={{ width: '100%' }} className="current-billing">
      {isTablet ? (
        <Row>
-          <Col span={16} style={tabletColStyle}>
+          <Col span={16} style={{ paddingRight: '10px' }}>
            <CurrentPlanDetails />
          </Col>
-          <Col span={8} style={tabletColStyleRight}>
+          <Col span={8} style={{ paddingLeft: '10px' }}>
            <AccountStorage themeMode={themeMode} />
          </Col>
        </Row>
      ) : (
        renderMobileView()
      )}
-      {shouldShowChargesAndInvoices && renderChargesAndInvoices()}
+      {currentSession?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
+        renderChargesAndInvoices()}
    </div>
  );
-});
-
-CurrentBill.displayName = 'CurrentBill';
+};

 export default CurrentBill;
--- a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useCallback, useEffect } from 'react';
+import React, { useState } from 'react';
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import {
  evt_billing_pause_plan,
@@ -17,9 +17,10 @@ import {
  Typography,
  Statistic,
  Select,
+  Form,
  Row,
  Col,
-} from '@/shared/antd-imports';
+} from 'antd/es';
 import RedeemCodeDrawer from '../drawers/redeem-code-drawer/redeem-code-drawer';
 import {
  fetchBillingInfo,
@@ -29,7 +30,7 @@ import {
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
-import { WarningTwoTone, PlusOutlined } from '@/shared/antd-imports';
+import { WarningTwoTone, PlusOutlined } from '@ant-design/icons';
 import { calculateTimeGap } from '@/utils/calculate-time-gap';
 import { formatDate } from '@/utils/timeUtils';
 import UpgradePlansLKR from '../drawers/upgrade-plans-lkr/upgrade-plans-lkr';
@@ -37,21 +38,6 @@ import UpgradePlans from '../drawers/upgrade-plans/upgrade-plans';
 import { ISUBSCRIPTION_TYPE, SUBSCRIPTION_STATUS } from '@/shared/constants';
 import { billingApiService } from '@/api/admin-center/billing.api.service';

-type SubscriptionAction = 'pause' | 'resume';
-type SeatOption = { label: string; value: number | string };
-
-const SEAT_COUNT_LIMIT = '100+';
-const BILLING_DELAY_MS = 8000;
-const LTD_USER_LIMIT = 50;
-const BUTTON_STYLE = {
-  backgroundColor: '#1890ff',
-  borderColor: '#1890ff',
-};
-const STATISTIC_VALUE_STYLE = {
-  fontSize: '24px',
-  fontWeight: 'bold' as const,
-};
-
 const CurrentPlanDetails = () => {
  const dispatch = useAppDispatch();
  const { t } = useTranslation('admin-center/current-bill');
@@ -61,7 +47,7 @@ const CurrentPlanDetails = () => {
  const [cancellingPlan, setCancellingPlan] = useState(false);
  const [addingSeats, setAddingSeats] = useState(false);
  const [isMoreSeatsModalVisible, setIsMoreSeatsModalVisible] = useState(false);
-  const [selectedSeatCount, setSelectedSeatCount] = useState<number | string>(1);
+  const [selectedSeatCount, setSelectedSeatCount] = useState<number | string>(5);

  const themeMode = useAppSelector(state => state.themeReducer.mode);
  const { loadingBillingInfo, billingInfo, freePlanSettings, isUpgradeModalOpen } = useAppSelector(
@@ -69,16 +55,14 @@ const CurrentPlanDetails = () => {
  );

  const browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-  
-  const seatCountOptions: SeatOption[] = useMemo(() => {
-    const options: SeatOption[] = [
-      1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
-    ].map(value => ({ label: value.toString(), value }));
-    options.push({ label: SEAT_COUNT_LIMIT, value: SEAT_COUNT_LIMIT });
-    return options;
-  }, []);

-  const handleSubscriptionAction = useCallback(async (action: SubscriptionAction) => {
+  type SeatOption = { label: string; value: number | string };
+  const seatCountOptions: SeatOption[] = [
+    1, 2, 3, 4, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90,
+  ].map(value => ({ label: value.toString(), value }));
+  seatCountOptions.push({ label: '100+', value: '100+' });
+
+  const handleSubscriptionAction = async (action: 'pause' | 'resume') => {
    const isResume = action === 'resume';
    const setLoadingState = isResume ? setCancellingPlan : setPausingPlan;
    const apiMethod = isResume
@@ -94,21 +78,21 @@ const CurrentPlanDetails = () => {
          setLoadingState(false);
          dispatch(fetchBillingInfo());
          trackMixpanelEvent(eventType);
-        }, BILLING_DELAY_MS);
-        return;
+        }, 8000);
+        return; // Exit function to prevent finally block from executing
      }
    } catch (error) {
      logger.error(`Error ${action}ing subscription`, error);
-      setLoadingState(false);
+      setLoadingState(false); // Only set to false on error
    }
-  }, [dispatch, trackMixpanelEvent]);
+  };

-  const handleAddMoreSeats = useCallback(() => {
+  const handleAddMoreSeats = () => {
    setIsMoreSeatsModalVisible(true);
-  }, []);
+  };

-  const handlePurchaseMoreSeats = useCallback(async () => {
-    if (selectedSeatCount.toString() === SEAT_COUNT_LIMIT || !billingInfo?.total_seats) return;
+  const handlePurchaseMoreSeats = async () => {
+    if (selectedSeatCount.toString() === '100+' || !billingInfo?.total_seats) return;

    try {
      setAddingSeats(true);
@@ -124,75 +108,51 @@ const CurrentPlanDetails = () => {
    } finally {
      setAddingSeats(false);
    }
-  }, [selectedSeatCount, billingInfo?.total_seats, dispatch, trackMixpanelEvent]);
+  };

-  const calculateRemainingSeats = useMemo(() => {
+  const calculateRemainingSeats = () => {
    if (billingInfo?.total_seats && billingInfo?.total_used) {
      return billingInfo.total_seats - billingInfo.total_used;
    }
    return 0;
-  }, [billingInfo?.total_seats, billingInfo?.total_used]);
+  };

-  // Calculate intelligent default for seat selection based on current usage
-  const getDefaultSeatCount = useMemo(() => {
-    const currentUsed = billingInfo?.total_used || 0;
-    const availableSeats = calculateRemainingSeats;
-    
-    // If only 1 user and no available seats, suggest 1 additional seat
-    if (currentUsed === 1 && availableSeats === 0) {
-      return 1;
-    }
-    
-    // If they have some users but running low on seats, suggest enough for current users
-    if (availableSeats < currentUsed && currentUsed > 0) {
-      return Math.max(1, currentUsed - availableSeats);
-    }
-    
-    // Default fallback
-    return Math.max(1, Math.min(5, currentUsed || 1));
-  }, [billingInfo?.total_used, calculateRemainingSeats]);
-
-  // Update selected seat count when billing info changes
-  useEffect(() => {
-    setSelectedSeatCount(getDefaultSeatCount);
-  }, [getDefaultSeatCount]);
-
-  const checkSubscriptionStatus = useCallback((allowedStatuses: string[]) => {
+  const checkSubscriptionStatus = (allowedStatuses: any[]) => {
    if (!billingInfo?.status || billingInfo.is_ltd_user) return false;
    return allowedStatuses.includes(billingInfo.status);
-  }, [billingInfo?.status, billingInfo?.is_ltd_user]);
+  };

-  const shouldShowRedeemButton = useMemo(() => {
+  const shouldShowRedeemButton = () => {
    if (billingInfo?.trial_in_progress) return true;
-    return billingInfo?.ltd_users ? billingInfo.ltd_users < LTD_USER_LIMIT : false;
-  }, [billingInfo?.trial_in_progress, billingInfo?.ltd_users]);
+    return billingInfo?.ltd_users ? billingInfo.ltd_users < 50 : false;
+  };

-  const showChangeButton = useMemo(() => {
+  const showChangeButton = () => {
    return checkSubscriptionStatus([SUBSCRIPTION_STATUS.ACTIVE, SUBSCRIPTION_STATUS.PASTDUE]);
-  }, [checkSubscriptionStatus]);
+  };

-  const showPausePlanButton = useMemo(() => {
+  const showPausePlanButton = () => {
    return checkSubscriptionStatus([SUBSCRIPTION_STATUS.ACTIVE, SUBSCRIPTION_STATUS.PASTDUE]);
-  }, [checkSubscriptionStatus]);
+  };

-  const showResumePlanButton = useMemo(() => {
+  const showResumePlanButton = () => {
    return checkSubscriptionStatus([SUBSCRIPTION_STATUS.PAUSED]);
-  }, [checkSubscriptionStatus]);
+  };

-  const shouldShowAddSeats = useMemo(() => {
+  const shouldShowAddSeats = () => {
    if (!billingInfo) return false;
    return (
      billingInfo.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
      billingInfo.status === SUBSCRIPTION_STATUS.ACTIVE
    );
-  }, [billingInfo]);
+  };

-  const renderExtra = useCallback(() => {
+  const renderExtra = () => {
    if (!billingInfo || billingInfo.is_custom) return null;

    return (
      <Space>
-        {showPausePlanButton && (
+        {showPausePlanButton() && (
          <Button
            type="link"
            danger
@@ -203,7 +163,7 @@ const CurrentPlanDetails = () => {
          </Button>
        )}

-        {showResumePlanButton && (
+        {showResumePlanButton() && (
          <Button
            type="primary"
            loading={cancellingPlan}
@@ -219,7 +179,7 @@ const CurrentPlanDetails = () => {
          </Button>
        )}

-        {showChangeButton && (
+        {showChangeButton() && (
          <Button
            type="primary"
            loading={pausingPlan || cancellingPlan}
@@ -230,19 +190,9 @@ const CurrentPlanDetails = () => {
        )}
      </Space>
    );
-  }, [
-    billingInfo,
-    showPausePlanButton,
-    showResumePlanButton,
-    showChangeButton,
-    pausingPlan,
-    cancellingPlan,
-    handleSubscriptionAction,
-    dispatch,
-    t,
-  ]);
+  };

-  const renderLtdDetails = useCallback(() => {
+  const renderLtdDetails = () => {
    if (!billingInfo || billingInfo.is_custom) return null;
    return (
      <Flex vertical>
@@ -250,41 +200,41 @@ const CurrentPlanDetails = () => {
        <Typography.Text>{t('ltdUsers', { ltd_users: billingInfo.ltd_users })}</Typography.Text>
      </Flex>
    );
-  }, [billingInfo, t]);
+  };

-  const checkIfTrialExpired = useCallback(() => {
-    if (!billingInfo?.trial_expire_date) return false;
-    const today = new Date();
-    today.setHours(0, 0, 0, 0);
-    const trialExpireDate = new Date(billingInfo.trial_expire_date);
-    trialExpireDate.setHours(0, 0, 0, 0);
-    return today > trialExpireDate;
-  }, [billingInfo?.trial_expire_date]);
+  const renderTrialDetails = () => {
+    const checkIfTrialExpired = () => {
+      if (!billingInfo?.trial_expire_date) return false;
+      const today = new Date();
+      today.setHours(0, 0, 0, 0); // Set to start of day for comparison
+      const trialExpireDate = new Date(billingInfo.trial_expire_date);
+      trialExpireDate.setHours(0, 0, 0, 0); // Set to start of day for comparison
+      return today > trialExpireDate;
+    };

-  const getExpirationMessage = useCallback((expireDate: string) => {
-    const today = new Date();
-    today.setHours(0, 0, 0, 0);
+    const getExpirationMessage = (expireDate: string) => {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0); // Set to start of day for comparison

-    const tomorrow = new Date(today);
-    tomorrow.setDate(tomorrow.getDate() + 1);
+      const tomorrow = new Date(today);
+      tomorrow.setDate(tomorrow.getDate() + 1);

-    const expDate = new Date(expireDate);
-    expDate.setHours(0, 0, 0, 0);
+      const expDate = new Date(expireDate);
+      expDate.setHours(0, 0, 0, 0); // Set to start of day for comparison

-    if (expDate.getTime() === today.getTime()) {
-      return t('expirestoday', 'today');
-    } else if (expDate.getTime() === tomorrow.getTime()) {
-      return t('expirestomorrow', 'tomorrow');
-    } else if (expDate < today) {
-      const diffTime = Math.abs(today.getTime() - expDate.getTime());
-      const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
-      return t('expiredDaysAgo', '{{days}} days ago', { days: diffDays });
-    } else {
-      return calculateTimeGap(expireDate);
-    }
-  }, [t]);
+      if (expDate.getTime() === today.getTime()) {
+        return t('expirestoday', 'today');
+      } else if (expDate.getTime() === tomorrow.getTime()) {
+        return t('expirestomorrow', 'tomorrow');
+      } else if (expDate < today) {
+        const diffTime = Math.abs(today.getTime() - expDate.getTime());
+        const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+        return t('expiredDaysAgo', '{{days}} days ago', { days: diffDays });
+      } else {
+        return calculateTimeGap(expireDate);
+      }
+    };

-  const renderTrialDetails = useCallback(() => {
    const isExpired = checkIfTrialExpired();
    const trialExpireDate = billingInfo?.trial_expire_date || '';

@@ -307,9 +257,9 @@ const CurrentPlanDetails = () => {
        </Tooltip>
      </Flex>
    );
-  }, [billingInfo?.trial_expire_date, checkIfTrialExpired, getExpirationMessage, t]);
+  };

-  const renderFreePlan = useCallback(() => (
+  const renderFreePlan = () => (
    <Flex vertical>
      <Typography.Text strong>{t('freePlan')}</Typography.Text>
      <Typography.Text>
@@ -321,9 +271,9 @@ const CurrentPlanDetails = () => {
        <br />- {freePlanSettings?.free_tier_storage} MB {t('storage')}
      </Typography.Text>
    </Flex>
-  ), [freePlanSettings, t]);
+  );

-  const renderPaddleSubscriptionInfo = useCallback(() => {
+  const renderPaddleSubscriptionInfo = () => {
    return (
      <Flex vertical>
        <Typography.Text strong>{billingInfo?.plan_name}</Typography.Text>
@@ -337,14 +287,14 @@ const CurrentPlanDetails = () => {
          </Typography.Text>
        </Flex>

-        {shouldShowAddSeats && billingInfo?.total_seats && (
+        {shouldShowAddSeats() && billingInfo?.total_seats && (
          <div style={{ marginTop: '16px' }}>
            <Row gutter={16} align="middle">
              <Col span={6}>
                <Statistic
-                  title={t('totalSeats') as string}
+                  title={t('totalSeats')}
                  value={billingInfo.total_seats}
-                  valueStyle={STATISTIC_VALUE_STYLE}
+                  valueStyle={{ fontSize: '24px', fontWeight: 'bold' }}
                />
              </Col>
              <Col span={8}>
@@ -352,16 +302,16 @@ const CurrentPlanDetails = () => {
                  type="primary"
                  icon={<PlusOutlined />}
                  onClick={handleAddMoreSeats}
-                  style={BUTTON_STYLE}
+                  style={{ backgroundColor: '#1890ff', borderColor: '#1890ff' }}
                >
                  {t('addMoreSeats')}
                </Button>
              </Col>
              <Col span={6}>
                <Statistic
-                  title={t('availableSeats') as string}
-                  value={calculateRemainingSeats}
-                  valueStyle={STATISTIC_VALUE_STYLE}
+                  title={t('availableSeats')}
+                  value={calculateRemainingSeats()}
+                  valueStyle={{ fontSize: '24px', fontWeight: 'bold' }}
                />
              </Col>
            </Row>
@@ -369,17 +319,17 @@ const CurrentPlanDetails = () => {
        )}
      </Flex>
    );
-  }, [billingInfo, shouldShowAddSeats, handleAddMoreSeats, calculateRemainingSeats, t]);
+  };

-  const renderCreditSubscriptionInfo = useCallback(() => {
+  const renderCreditSubscriptionInfo = () => {
    return (
      <Flex vertical>
        <Typography.Text strong>{t('creditPlan', 'Credit Plan')}</Typography.Text>
      </Flex>
    );
-  }, [t]);
+  };

-  const renderCustomSubscriptionInfo = useCallback(() => {
+  const renderCustomSubscriptionInfo = () => {
    return (
      <Flex vertical>
        <Typography.Text strong>{t('customPlan', 'Custom Plan')}</Typography.Text>
@@ -390,36 +340,7 @@ const CurrentPlanDetails = () => {
        </Typography.Text>
      </Flex>
    );
-  }, [billingInfo?.valid_till_date, t]);
-
-  const renderSubscriptionContent = useCallback(() => {
-    if (!billingInfo) return null;
-
-    switch (billingInfo.subscription_type) {
-      case ISUBSCRIPTION_TYPE.LIFE_TIME_DEAL:
-        return renderLtdDetails();
-      case ISUBSCRIPTION_TYPE.TRIAL:
-        return renderTrialDetails();
-      case ISUBSCRIPTION_TYPE.FREE:
-        return renderFreePlan();
-      case ISUBSCRIPTION_TYPE.PADDLE:
-        return renderPaddleSubscriptionInfo();
-      case ISUBSCRIPTION_TYPE.CREDIT:
-        return renderCreditSubscriptionInfo();
-      case ISUBSCRIPTION_TYPE.CUSTOM:
-        return renderCustomSubscriptionInfo();
-      default:
-        return null;
-    }
-  }, [
-    billingInfo,
-    renderLtdDetails,
-    renderTrialDetails,
-    renderFreePlan,
-    renderPaddleSubscriptionInfo,
-    renderCreditSubscriptionInfo,
-    renderCustomSubscriptionInfo,
-  ]);
+  };

  return (
    <Card
@@ -440,10 +361,19 @@ const CurrentPlanDetails = () => {
    >
      <Flex vertical>
        <div style={{ marginBottom: '14px' }}>
-          {renderSubscriptionContent()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.LIFE_TIME_DEAL &&
+            renderLtdDetails()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.TRIAL && renderTrialDetails()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.FREE && renderFreePlan()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.PADDLE &&
+            renderPaddleSubscriptionInfo()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.CREDIT &&
+            renderCreditSubscriptionInfo()}
+          {billingInfo?.subscription_type === ISUBSCRIPTION_TYPE.CUSTOM &&
+            renderCustomSubscriptionInfo()}
        </div>

-        {shouldShowRedeemButton && (
+        {shouldShowRedeemButton() && (
          <>
            <Button
              type="link"
@@ -478,28 +408,17 @@ const CurrentPlanDetails = () => {
            <Typography.Paragraph
              style={{ fontSize: '16px', margin: '0 0 16px 0', fontWeight: 500 }}
            >
-              {billingInfo?.total_used === 1 
-                ? t('purchaseSeatsTextSingle', "Add more seats to invite team members to your workspace.")
-                : t('purchaseSeatsText', "To continue, you'll need to purchase additional seats.")
-              }
+              {t('purchaseSeatsText', "To continue, you'll need to purchase additional seats.")}
            </Typography.Paragraph>

            <Typography.Paragraph style={{ margin: '0 0 16px 0' }}>
              {t('currentSeatsText', 'You currently have {{seats}} seats available.', {
                seats: billingInfo?.total_seats,
              })}
-              {billingInfo?.total_used === 1 && (
-                <span style={{ color: '#666', marginLeft: '8px' }}>
-                  ({t('singleUserNote', 'Currently used by 1 team member')})
-                </span>
-              )}
            </Typography.Paragraph>

            <Typography.Paragraph style={{ margin: '0 0 24px 0' }}>
-              {billingInfo?.total_used === 1
-                ? t('selectSeatsTextSingle', 'Select how many additional seats you need for new team members.')
-                : t('selectSeatsText', 'Please select the number of additional seats to purchase.')
-              }
+              {t('selectSeatsText', 'Please select the number of additional seats to purchase.')}
            </Typography.Paragraph>

            <div style={{ marginBottom: '24px' }}>
@@ -511,18 +430,18 @@ const CurrentPlanDetails = () => {
                options={seatCountOptions}
                style={{ width: '300px' }}
              />
-
            </div>

            <Flex justify="end">
-              {selectedSeatCount.toString() !== SEAT_COUNT_LIMIT ? (
+              {selectedSeatCount.toString() !== '100+' ? (
                <Button
                  type="primary"
                  loading={addingSeats}
                  onClick={handlePurchaseMoreSeats}
                  style={{
                    minWidth: '100px',
-                    ...BUTTON_STYLE,
+                    backgroundColor: '#1890ff',
+                    borderColor: '#1890ff',
                    borderRadius: '2px',
                  }}
                >
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/redeem-code-drawer/redeem-code-drawer.tsx
@@ -1,4 +1,4 @@
-import { Button, Drawer, Form, Input, notification, Typography } from '@/shared/antd-imports';
+import { Button, Drawer, Form, Input, notification, Typography } from 'antd';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppSelector } from '@/hooks/useAppSelector';
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans-lkr/upgrade-plans-lkr.tsx
@@ -1,7 +1,7 @@
-import { Button, Card, Col, Form, Input, notification, Row, Tag, Typography } from '@/shared/antd-imports';
+import { Button, Card, Col, Form, Input, notification, Row, Tag, Typography } from 'antd';
 import React, { useState } from 'react';
 import './upgrade-plans-lkr.css';
-import { CheckCircleFilled } from '@/shared/antd-imports';
+import { CheckCircleFilled } from '@ant-design/icons';
 import { RootState } from '@/app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.css
@@ -1,44 +0,0 @@
-.upgrade-plans-responsive {
-  padding: 24px;
-}
-
-.upgrade-plans-row-responsive {
-  width: 100%;
-  flex-wrap: wrap;
-}
-
-@media (max-width: 900px) {
-  .upgrade-plans-row-responsive .ant-col {
-    flex: 0 0 100%;
-    max-width: 100%;
-    margin-bottom: 16px;
-  }
-  .upgrade-plans-row-responsive .ant-card {
-    width: 100%;
-    min-width: 0;
-  }
-}
-
-@media (max-width: 600px) {
-  .upgrade-plans-responsive {
-    padding: 8px;
-  }
-  .upgrade-plans-row-responsive .ant-col {
-    padding: 0 !important;
-    margin-bottom: 12px;
-  }
-  .upgrade-plans-row-responsive .ant-card {
-    width: 100%;
-    min-width: 0;
-    box-sizing: border-box;
-  }
-  .upgrade-plans-responsive .ant-typography,
-  .upgrade-plans-responsive .ant-btn,
-  .upgrade-plans-responsive .ant-form-item {
-    width: 100%;
-    text-align: center;
-  }
-  .upgrade-plans-responsive .ant-btn {
-    margin-top: 12px;
-  }
-} 
--- a/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/drawers/upgrade-plans/upgrade-plans.tsx
@@ -11,7 +11,7 @@ import {
  Tooltip,
  Typography,
  message,
-} from '@/shared/antd-imports';
+} from 'antd/es';
 import { useTranslation } from 'react-i18next';

 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
@@ -22,7 +22,7 @@ import {
 import logger from '@/utils/errorLogger';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IPaddlePlans, SUBSCRIPTION_STATUS } from '@/shared/constants';
-import { CheckCircleFilled, InfoCircleOutlined } from '@/shared/antd-imports';
+import { CheckCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
 import { useAuthService } from '@/hooks/useAuth';
 import { fetchBillingInfo, toggleUpgradeModal } from '@/features/admin-center/admin-center.slice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
@@ -30,7 +30,6 @@ import { billingApiService } from '@/api/admin-center/billing.api.service';
 import { authApiService } from '@/api/auth/auth.api.service';
 import { setUser } from '@/features/user/userSlice';
 import { setSession } from '@/utils/session-helper';
-import './upgrade-plans.css';

 // Extend Window interface to include Paddle
 declare global {
@@ -66,24 +65,20 @@ const UpgradePlans = () => {
  const [paddleError, setPaddleError] = useState<string | null>(null);

  const populateSeatCountOptions = (currentSeats: number) => {
-    if (typeof currentSeats !== 'number') return [];
+    if (!currentSeats) return [];

    const step = 5;
    const maxSeats = 90;
-    const minValue = currentSeats;
-    const options: { value: number; disabled: boolean }[] = [];
+    const minValue = Math.min(currentSeats + 1);
+    const rangeStart = Math.ceil(minValue / step) * step;
+    const range = Array.from(
+      { length: Math.floor((maxSeats - rangeStart) / step) + 1 },
+      (_, i) => rangeStart + i * step
+    );

-    // Always show 1-5, but disable if less than minValue
-    for (let i = 1; i <= 5; i++) {
-      options.push({ value: i, disabled: i < minValue });
-    }
-
-    // Show all multiples of 5 from 10 to maxSeats
-    for (let i = 10; i <= maxSeats; i += step) {
-      options.push({ value: i, disabled: i < minValue });
-    }
-
-    return options;
+    return currentSeats < step
+      ? [...Array.from({ length: rangeStart - minValue }, (_, i) => minValue + i), ...range]
+      : range;
  };

  const fetchPricingPlans = async () => {
@@ -344,25 +339,24 @@ const UpgradePlans = () => {
  }, []);

  return (
-    <div className="upgrade-plans-responsive">
+    <div>
      <Flex justify="center" align="center">
        <Typography.Title level={2}>
          {billingInfo?.status === SUBSCRIPTION_STATUS.TRIALING
-            ? t('selectPlan', 'Select Plan')
-            : t('changeSubscriptionPlan', 'Change Subscription Plan')}
+            ? t('selectPlan')
+            : t('changeSubscriptionPlan')}
        </Typography.Title>
      </Flex>

      <Flex justify="center" align="center">
        <Form form={form}>
-          <Form.Item name="seatCount" label={t('noOfSeats', 'Number of Seats')}>
+          <Form.Item name="seatCount" label={t('noOfSeats')}>
            <Select
              style={{ width: 100 }}
              value={selectedSeatCount}
              options={seatCountOptions.map(option => ({
-                value: option.value,
-                label: option.value.toString(),
-                disabled: option.disabled,
+                value: option,
+                text: option.toString(),
              }))}
              onChange={setSelectedSeatCount}
            />
@@ -371,31 +365,31 @@ const UpgradePlans = () => {
      </Flex>

      <Flex>
-        <Row className="w-full upgrade-plans-row-responsive">
+        <Row className="w-full">
          {/* Free Plan */}
          <Col span={8} style={{ padding: '0 4px' }}>
            <Card
              style={{ ...isSelected(paddlePlans.FREE), height: '100%' }}
              hoverable
-              title={<span style={cardStyles.title}>{t('freePlan', 'Free Plan')}</span>}
+              title={<span style={cardStyles.title}>{t('freePlan')}</span>}
              onClick={() => setSelectedCard(paddlePlans.FREE)}
            >
              <div style={cardStyles.priceContainer}>
                <Flex justify="space-between" align="center">
                  <Typography.Title level={1}>$ 0.00</Typography.Title>
-                  <Typography.Text>{t('freeForever', 'Free Forever')}</Typography.Text>
+                  <Typography.Text>{t('freeForever')}</Typography.Text>
                </Flex>
                <Flex justify="center" align="center">
                  <Typography.Text strong style={{ fontSize: '16px' }}>
-                    {t('bestForPersonalUse', 'Best for Personal Use')}
+                    {t('bestForPersonalUse')}
                  </Typography.Text>
                </Flex>
              </div>

              <div style={cardStyles.featureList}>
-                {renderFeature(`${plans.free_tier_storage} ${t('storage', 'Storage')}`)}
-                {renderFeature(`${plans.projects_limit} ${t('projects', 'Projects')}`)}
-                {renderFeature(`${plans.team_member_limit} ${t('teamMembers', 'Team Members')}`)}
+                {renderFeature(`${plans.free_tier_storage} ${t('storage')}`)}
+                {renderFeature(`${plans.projects_limit} ${t('projects')}`)}
+                {renderFeature(`${plans.team_member_limit} ${t('teamMembers')}`)}
              </div>
            </Card>
          </Col>
@@ -407,9 +401,9 @@ const UpgradePlans = () => {
              hoverable
              title={
                <span style={cardStyles.title}>
-                  {t('annualPlan', 'Annual Plan')}{' '}
+                  {t('annualPlan')}{' '}
                  <Tag color="volcano" style={{ lineHeight: '21px' }}>
-                    {t('tag', 'Popular')}
+                    {t('tag')}
                  </Tag>
                </span>
              }
@@ -435,16 +429,16 @@ const UpgradePlans = () => {
                  </Typography.Text>
                </Flex>
                <Flex justify="center" align="center">
-                  <Typography.Text>{t('billedAnnually', 'Billed Annually')}</Typography.Text>
+                  <Typography.Text>{t('billedAnnually')}</Typography.Text>
                </Flex>
              </div>

              <div style={cardStyles.featureList} className="mt-4">
-                {renderFeature(t('startupText01', 'Unlimited Projects'))}
-                {renderFeature(t('startupText02', 'Unlimited Team Members'))}
-                {renderFeature(t('startupText03', 'Unlimited Storage'))}
-                {renderFeature(t('startupText04', 'Priority Support'))}
-                {renderFeature(t('startupText05', 'Advanced Analytics'))}
+                {renderFeature(t('startupText01'))}
+                {renderFeature(t('startupText02'))}
+                {renderFeature(t('startupText03'))}
+                {renderFeature(t('startupText04'))}
+                {renderFeature(t('startupText05'))}
              </div>
            </Card>
          </Col>
@@ -454,7 +448,7 @@ const UpgradePlans = () => {
            <Card
              style={{ ...isSelected(paddlePlans.MONTHLY), height: '100%' }}
              hoverable
-              title={<span style={cardStyles.title}>{t('monthlyPlan', 'Monthly Plan')}</span>}
+              title={<span style={cardStyles.title}>{t('monthlyPlan')}</span>}
              onClick={() => setSelectedCard(paddlePlans.MONTHLY)}
            >
              <div style={cardStyles.priceContainer}>
@@ -475,16 +469,16 @@ const UpgradePlans = () => {
                  </Typography.Text>
                </Flex>
                <Flex justify="center" align="center">
-                  <Typography.Text>{t('billedMonthly', 'Billed Monthly')}</Typography.Text>
+                  <Typography.Text>{t('billedMonthly')}</Typography.Text>
                </Flex>
              </div>

              <div style={cardStyles.featureList}>
-                {renderFeature(t('startupText01', 'Unlimited Projects'))}
-                {renderFeature(t('startupText02', 'Unlimited Team Members'))}
-                {renderFeature(t('startupText03', 'Unlimited Storage'))}
-                {renderFeature(t('startupText04', 'Priority Support'))}
-                {renderFeature(t('startupText05', 'Advanced Analytics'))}
+                {renderFeature(t('startupText01'))}
+                {renderFeature(t('startupText02'))}
+                {renderFeature(t('startupText03'))}
+                {renderFeature(t('startupText04'))}
+                {renderFeature(t('startupText05'))}
              </div>
            </Card>
          </Col>
@@ -515,8 +509,8 @@ const UpgradePlans = () => {
            disabled={billingInfo?.plan_id === plans.annual_plan_id}
          >
            {billingInfo?.status === SUBSCRIPTION_STATUS.ACTIVE
-              ? t('changeToPlan', 'Change to {{plan}}', { plan: t('annualPlan', 'Annual Plan') })
-              : t('continueWith', 'Continue with {{plan}}', { plan: t('annualPlan', 'Annual Plan') })}
+              ? t('changeToPlan', { plan: t('annualPlan') })
+              : t('continueWith', { plan: t('annualPlan') })}
          </Button>
        )}
        {selectedPlan === paddlePlans.MONTHLY && (
@@ -528,8 +522,8 @@ const UpgradePlans = () => {
            disabled={billingInfo?.plan_id === plans.monthly_plan_id}
          >
            {billingInfo?.status === SUBSCRIPTION_STATUS.ACTIVE
-              ? t('changeToPlan', 'Change to {{plan}}', { plan: t('monthlyPlan', 'Monthly Plan') })
-              : t('continueWith', 'Continue with {{plan}}', { plan: t('monthlyPlan', 'Monthly Plan') })}
+              ? t('changeToPlan', { plan: t('monthlyPlan') })
+              : t('continueWith', { plan: t('monthlyPlan') })}
          </Button>
        )}
      </Row>
--- a/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
+++ b/worklenz-frontend/src/components/admin-center/configuration/configuration.tsx
@@ -1,5 +1,5 @@
-import { Button, Card, Col, Divider, Form, Input, Row, Select } from '@/shared/antd-imports';
-import React, { useEffect, useState, useMemo, useCallback } from 'react';
+import { Button, Card, Col, Divider, Form, Input, notification, Row, Select } from 'antd';
+import React, { useEffect, useState } from 'react';
 import { RootState } from '../../../app/store';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { IBillingConfigurationCountry } from '@/types/admin-center/country.types';
@@ -7,15 +7,14 @@ import { adminCenterApiService } from '@/api/admin-center/admin-center.api.servi
 import { IBillingConfiguration } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';

-const Configuration: React.FC = React.memo(() => {
+const Configuration: React.FC = () => {
  const themeMode = useAppSelector((state: RootState) => state.themeReducer.mode);

  const [countries, setCountries] = useState<IBillingConfigurationCountry[]>([]);
  const [configuration, setConfiguration] = useState<IBillingConfiguration>();
  const [loading, setLoading] = useState(false);
  const [form] = Form.useForm();
-
-  const fetchCountries = useCallback(async () => {
+  const fetchCountries = async () => {
    try {
      const res = await adminCenterApiService.getCountries();
      if (res.done) {
@@ -24,85 +23,61 @@ const Configuration: React.FC = React.memo(() => {
    } catch (error) {
      logger.error('Error fetching countries:', error);
    }
-  }, []);
+  };

-  const fetchConfiguration = useCallback(async () => {
+  const fetchConfiguration = async () => {
    const res = await adminCenterApiService.getBillingConfiguration();
    if (res.done) {
      setConfiguration(res.body);
      form.setFieldsValue(res.body);
    }
-  }, [form]);
+  };

  useEffect(() => {
    fetchCountries();
    fetchConfiguration();
-  }, [fetchCountries, fetchConfiguration]);
-
-  const handleSave = useCallback(
-    async (values: any) => {
-      try {
-        setLoading(true);
-        const res = await adminCenterApiService.updateBillingConfiguration(values);
-        if (res.done) {
-          fetchConfiguration();
-        }
-      } catch (error) {
-        logger.error('Error updating configuration:', error);
-      } finally {
-        setLoading(false);
-      }
-    },
-    [fetchConfiguration]
-  );
-
-  const countryOptions = useMemo(
-    () =>
-      countries.map(country => ({
-        label: country.name,
-        value: country.id,
-      })),
-    [countries]
-  );
-
-  const titleStyle = useMemo(
-    () => ({
-      color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
-      fontWeight: 500,
-      fontSize: '16px',
-      display: 'flex',
-      gap: '4px',
-    }),
-    [themeMode]
-  );
-
-  const dividerTitleStyle = useMemo(
-    () => ({
-      color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
-      fontWeight: 600,
-      fontSize: '16px',
-      display: 'flex',
-      gap: '4px',
-    }),
-    [themeMode]
-  );
-
-  const cardStyle = useMemo(() => ({ marginTop: '16px' }), []);
-  const colStyle = useMemo(() => ({ padding: '0 12px', height: '86px' }), []);
-  const dividerStyle = useMemo(() => ({ margin: '16px 0' }), []);
-  const buttonColStyle = useMemo(() => ({ paddingLeft: '12px' }), []);
-
-  const handlePhoneInput = useCallback((e: React.FormEvent<HTMLInputElement>) => {
-    const input = e.target as HTMLInputElement;
-    input.value = input.value.replace(/[^0-9]/g, '');
  }, []);

+  const handleSave = async (values: any) => {
+    try {
+      setLoading(true);
+      const res = await adminCenterApiService.updateBillingConfiguration(values);
+      if (res.done) {
+        fetchConfiguration();
+      }
+    } catch (error) {
+      logger.error('Error updating configuration:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const countryOptions = countries.map(country => ({
+    label: country.name,
+    value: country.id,
+  }));
+
  return (
    <div>
-      <Card title={<span style={titleStyle}>Billing Details</span>} style={cardStyle}>
+      <Card
+        title={
+          <span
+            style={{
+              color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
+              fontWeight: 500,
+              fontSize: '16px',
+              display: 'flex',
+              gap: '4px',
+            }}
+          >
+            Billing Details
+          </span>
+        }
+        style={{ marginTop: '16px' }}
+      >
        <Form form={form} initialValues={configuration} onFinish={handleSave}>
-          <Row gutter={[0, 0]}>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+          <Row>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item
                name="name"
                label="Name"
@@ -113,10 +88,10 @@ const Configuration: React.FC = React.memo(() => {
                  },
                ]}
              >
-                <Input placeholder="Name" disabled />
+                <Input placeholder="Name" />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item
                name="email"
                label="Email Address"
@@ -127,10 +102,10 @@ const Configuration: React.FC = React.memo(() => {
                  },
                ]}
              >
-                <Input placeholder="Email Address" disabled />
+                <Input placeholder="Name" disabled />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item
                name="phone"
                label="Contact Number"
@@ -142,34 +117,58 @@ const Configuration: React.FC = React.memo(() => {
                  },
                ]}
              >
-                <Input placeholder="Phone Number" maxLength={10} onInput={handlePhoneInput} />
+                <Input
+                  placeholder="Phone Number"
+                  maxLength={10}
+                  onInput={e => {
+                    const input = e.target as HTMLInputElement; // Type assertion to access 'value'
+                    input.value = input.value.replace(/[^0-9]/g, ''); // Restrict non-numeric input
+                  }}
+                />
              </Form.Item>
            </Col>
          </Row>

-          <Divider orientation="left" style={{ ...dividerStyle, fontSize: '14px' }}>
-            <span style={dividerTitleStyle}>Company Details</span>
+          <Divider orientation="left" style={{ margin: '16px 0' }}>
+            <span
+              style={{
+                color: `${themeMode === 'dark' ? '#ffffffd9' : '#000000d9'}`,
+                fontWeight: 600,
+                fontSize: '16px',
+                display: 'flex',
+                gap: '4px',
+              }}
+            >
+              Company Details
+            </span>
          </Divider>

-          <Row gutter={[0, 0]}>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+          <Row>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="company_name" label="Company Name" layout="vertical">
                <Input placeholder="Company Name" />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="address_line_1" label="Address Line 01" layout="vertical">
                <Input placeholder="Address Line 01" />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="address_line_2" label="Address Line 02" layout="vertical">
                <Input placeholder="Address Line 02" />
              </Form.Item>
            </Col>
          </Row>
-          <Row gutter={[0, 0]}>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+          <Row>
+            <Col
+              span={8}
+              style={{
+                padding: '0 12px',
+                height: '86px',
+                scrollbarColor: 'red',
+              }}
+            >
              <Form.Item name="country" label="Country" layout="vertical">
                <Select
                  dropdownStyle={{ maxHeight: 256, overflow: 'auto' }}
@@ -182,28 +181,28 @@ const Configuration: React.FC = React.memo(() => {
                />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="city" label="City" layout="vertical">
                <Input placeholder="City" />
              </Form.Item>
            </Col>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="state" label="State" layout="vertical">
                <Input placeholder="State" />
              </Form.Item>
            </Col>
          </Row>
-          <Row gutter={[0, 0]}>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={colStyle}>
+          <Row>
+            <Col span={8} style={{ padding: '0 12px', height: '86px' }}>
              <Form.Item name="postal_code" label="Postal Code" layout="vertical">
                <Input placeholder="Postal Code" />
              </Form.Item>
            </Col>
          </Row>
          <Row>
-            <Col xs={24} sm={24} md={8} lg={8} xl={8} style={{ ...buttonColStyle, marginTop: 8 }}>
+            <Col style={{ paddingLeft: '12px' }}>
              <Form.Item>
-                <Button type="primary" htmlType="submit" loading={loading} block>
+                <Button type="primary" htmlType="submit">
                  Save
                </Button>
              </Form.Item>
@@ -213,8 +212,6 @@ const Configuration: React.FC = React.memo(() => {
      </Card>
    </div>
  );
-});
-
-Configuration.displayName = 'Configuration';
+};

 export default Configuration;
--- a/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-admins-table/organization-admins-table.tsx
@@ -1,4 +1,4 @@
-import { Table, TableProps, Typography } from '@/shared/antd-imports';
+import { Table, TableProps, Typography } from 'antd';
 import React, { useMemo } from 'react';
 import { IOrganizationAdmin } from '@/types/admin-center/admin-center.types';

--- a/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-name/organization-name.tsx
@@ -1,8 +1,9 @@
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import logger from '@/utils/errorLogger';
-import { EnterOutlined, EditOutlined } from '@/shared/antd-imports';
-import { Card, Button, Tooltip, Typography } from '@/shared/antd-imports';
+import { EnterOutlined, EditOutlined } from '@ant-design/icons';
+import { Card, Button, Tooltip, Typography } from 'antd';
 import TextArea from 'antd/es/input/TextArea';
+import Paragraph from 'antd/es/typography/Paragraph';
 import { TFunction } from 'i18next';
 import { useState, useEffect } from 'react';

--- a/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
+++ b/worklenz-frontend/src/components/admin-center/overview/organization-owner/organization-owner.tsx
@@ -1,8 +1,8 @@
 import { adminCenterApiService } from '@/api/admin-center/admin-center.api.service';
 import { IOrganization } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
-import { MailOutlined, PhoneOutlined, EditOutlined } from '@/shared/antd-imports';
-import { Card, Tooltip, Input, Button, Typography, InputRef } from '@/shared/antd-imports';
+import { MailOutlined, PhoneOutlined, EditOutlined } from '@ant-design/icons';
+import { Card, Tooltip, Input, Button, Typography, InputRef } from 'antd';
 import { TFunction } from 'i18next';
 import { useEffect, useRef, useState } from 'react';

--- a/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/add-team-drawer/add-team-drawer.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState } from 'react';
-import { Button, Drawer, Form, Input, InputRef, Typography } from '@/shared/antd-imports';
+import { Button, Drawer, Form, Input, InputRef, Typography } from 'antd';
 import { fetchTeams } from '@features/teams/teamSlice';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/settings-drawer/settings-drawer.tsx
@@ -11,7 +11,7 @@ import {
  TableProps,
  Typography,
  Tooltip,
-} from '@/shared/antd-imports';
+} from 'antd';
 import React, { useState } from 'react';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import './settings-drawer.css';
--- a/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
+++ b/worklenz-frontend/src/components/admin-center/teams/teams-table/teams-table.tsx
@@ -5,8 +5,8 @@ import { toggleSettingDrawer, deleteTeam, fetchTeams } from '@/features/teams/te
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { IOrganizationTeam } from '@/types/admin-center/admin-center.types';
 import logger from '@/utils/errorLogger';
-import { SettingOutlined, DeleteOutlined } from '@/shared/antd-imports';
-import { Badge, Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from '@/shared/antd-imports';
+import { SettingOutlined, DeleteOutlined } from '@ant-design/icons';
+import { Badge, Button, Card, Popconfirm, Table, TableProps, Tooltip, Typography } from 'antd';
 import { TFunction } from 'i18next';
 import { useState } from 'react';
 import { useMediaQuery } from 'react-responsive';
--- a/worklenz-frontend/src/components/avatars/avatars.tsx
+++ b/worklenz-frontend/src/components/avatars/avatars.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Tooltip } from '@/shared/antd-imports';
+import { Avatar, Tooltip } from 'antd';
 import React, { useCallback, useMemo } from 'react';
 import { InlineMember } from '@/types/teamMembers/inlineMember.types';

--- a/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx
+++ b/worklenz-frontend/src/components/board/board-assignee-selector/board-assignee-selector.tsx
@@ -15,7 +15,7 @@ import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '../../../features/projects/singleProject/members/projectMembersSlice';
 import { colors } from '../../../styles/colors';
-import { PlusOutlined, UsergroupAddOutlined } from '@/shared/antd-imports';
+import { PlusOutlined, UsergroupAddOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import SingleAvatar from '@/components/common/single-avatar/single-avatar';
 import { CheckboxChangeEvent } from 'antd/es/checkbox';
--- a/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
+++ b/worklenz-frontend/src/components/board/changeCategoryDropdown/ChangeCategoryDropdown.tsx
@@ -1,9 +1,9 @@
-import { Badge, Card, Dropdown, Flex, Menu, MenuProps } from '@/shared/antd-imports';
+import { Badge, Card, Dropdown, Flex, Menu, MenuProps } from 'antd';
 import React from 'react';
 import { TaskStatusType } from '../../../types/task.types';
 import { colors } from '../../../styles/colors';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
-import { RetweetOutlined, RightOutlined } from '@/shared/antd-imports';
+import { RetweetOutlined, RightOutlined } from '@ant-design/icons';
 import './ChangeCategoryDropdown.css';
 import { updateStatusCategory } from '../../../features/projects/status/StatusSlice';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
+++ b/worklenz-frontend/src/components/board/common-members-section/common-members-section.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
 import {
  DeleteOutlined,
  EditOutlined,
  LoadingOutlined,
  MoreOutlined,
  PlusOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
--- a/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
+++ b/worklenz-frontend/src/components/board/common-phase-section/common-phase-section.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
 import {
  DeleteOutlined,
  EditOutlined,
  LoadingOutlined,
  MoreOutlined,
  PlusOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
--- a/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
+++ b/worklenz-frontend/src/components/board/common-priority-section/common-priority-section.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
 import {
  DeleteOutlined,
  EditOutlined,
  LoadingOutlined,
  MoreOutlined,
  PlusOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
--- a/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
+++ b/worklenz-frontend/src/components/board/commonStatusSection/CommonStatusSection.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
 import {
  DeleteOutlined,
  EditOutlined,
  LoadingOutlined,
  MoreOutlined,
  PlusOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import { setTaskCardDisabled, initializeStatus } from '../../../features/board/create-card.slice';
 import { TaskType } from '../../../types/task.types';
 import TaskCreateCard from '../taskCreateCard/TaskCreateCard';
--- a/worklenz-frontend/src/components/board/custom-avatar-group.tsx
+++ b/worklenz-frontend/src/components/board/custom-avatar-group.tsx
@@ -1,4 +1,4 @@
-import { Button, Flex } from '@/shared/antd-imports';
+import { Button, Flex } from 'antd';
 import AddMembersDropdown from '@/components/add-members-dropdown/add-members-dropdown';
 import Avatars from '../avatars/avatars';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
--- a/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
+++ b/worklenz-frontend/src/components/board/custom-due-date-picker.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react';
-import { DatePicker, Button, Flex } from '@/shared/antd-imports';
-import { CalendarOutlined } from '@/shared/antd-imports';
+import { DatePicker, Button, Flex } from 'antd';
+import { CalendarOutlined } from '@ant-design/icons';
 import dayjs, { Dayjs } from 'dayjs';
 import { useSocket } from '@/socket/socketContext';
 import { SocketEvents } from '@/shared/socket-events';
--- a/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
+++ b/worklenz-frontend/src/components/board/kanban-group/kanban-group.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from '@/shared/antd-imports';
+import { Button, Dropdown, Input, InputRef, MenuProps, Typography } from 'antd';
 import {
  DeleteOutlined,
  EditOutlined,
  LoadingOutlined,
  MoreOutlined,
  PlusOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { useDroppable } from '@dnd-kit/core';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
--- a/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx
+++ b/worklenz-frontend/src/components/board/subTaskCard/SubTaskCard.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Avatar, Col, DatePicker, Divider, Flex, Row, Tooltip, Typography } from '@/shared/antd-imports';
+import { Avatar, Col, DatePicker, Divider, Flex, Row, Tooltip, Typography } from 'antd';
 import StatusDropdown from '../../taskListCommon/statusDropdown/StatusDropdown';
 import dayjs, { Dayjs } from 'dayjs';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/TaskCard.tsx
@@ -9,7 +9,7 @@ import {
  Dropdown,
  MenuProps,
  Button,
-} from '@/shared/antd-imports';
+} from 'antd';
 import {
  DoubleRightOutlined,
  PauseOutlined,
@@ -20,7 +20,7 @@ import {
  ForkOutlined,
  CaretRightFilled,
  CaretDownFilled,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';
 import './TaskCard.css';
 import dayjs, { Dayjs } from 'dayjs';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
--- a/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
+++ b/worklenz-frontend/src/components/board/taskCard/priority-section/priority-section.tsx
@@ -1,10 +1,10 @@
-import { Flex, Typography } from '@/shared/antd-imports';
+import { Flex, Typography } from 'antd';
 import './priority-section.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useState, useEffect, useMemo } from 'react';
 import { IProjectTask } from '@/types/project/projectTasksViewModel.types';
 import { ITaskPriority } from '@/types/tasks/taskPriority.types';
-import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@/shared/antd-imports';
+import { DoubleLeftOutlined, MinusOutlined, PauseOutlined } from '@ant-design/icons';

 type PrioritySectionProps = {
  task: IProjectTask;
--- a/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx
+++ b/worklenz-frontend/src/components/board/taskCreateCard/TaskCreateCard.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, DatePicker, Input, InputRef } from '@/shared/antd-imports';
+import { Avatar, Button, DatePicker, Input, InputRef } from 'antd';
 import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
 import dayjs, { Dayjs } from 'dayjs';
--- a/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx
+++ b/worklenz-frontend/src/components/board/taskCreateCard/priority-task-create-card.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Button, DatePicker, Input, InputRef } from '@/shared/antd-imports';
+import { Avatar, Button, DatePicker, Input, InputRef } from 'antd';
 import React, { forwardRef, useEffect, useRef, useState } from 'react';
 import AddMembersDropdown from '../../add-members-dropdown/add-members-dropdown';
 import dayjs, { Dayjs } from 'dayjs';
--- a/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx
+++ b/worklenz-frontend/src/components/calendars/homeCalendar/HomeCalendar.tsx
@@ -1,4 +1,4 @@
-import { Calendar } from '@/shared/antd-imports';
+import { Calendar } from 'antd';
 import React, { useEffect } from 'react';
 import type { Dayjs } from 'dayjs';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
--- a/worklenz-frontend/src/components/charts/LazyChartComponents.tsx
+++ b/worklenz-frontend/src/components/charts/LazyChartComponents.tsx
@@ -1,5 +1,5 @@
 import { lazy, Suspense } from 'react';
-import { Spin } from '@/shared/antd-imports';
+import { Spin } from 'antd';

 // Lazy load Chart.js components
 const LazyBarChart = lazy(() => 
--- a/worklenz-frontend/src/components/charts/chart-loader.tsx
+++ b/worklenz-frontend/src/components/charts/chart-loader.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { Spin } from '@/shared/antd-imports';
+import { Spin } from 'antd';

 // Lazy load chart components to reduce initial bundle size
 const LazyBar = React.lazy(() =>
--- a/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx
+++ b/worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx
@@ -1,4 +1,4 @@
-import { AutoComplete, Button, Drawer, Flex, Form, message, Select, Spin, Typography } from '@/shared/antd-imports';
+import { AutoComplete, Button, Drawer, Flex, Form, message, Select, Spin, Typography } from 'antd';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
--- a/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx
+++ b/worklenz-frontend/src/components/common/people-dropdown/PeopleDropdown.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from 'react';
 import { createPortal } from 'react-dom';
-import { PlusOutlined, UserAddOutlined } from '@/shared/antd-imports';
+import { PlusOutlined, UserAddOutlined } from '@ant-design/icons';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { toggleProjectMemberDrawer } from '@/features/projects/singleProject/members/projectMembersSlice';
--- a/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx
+++ b/worklenz-frontend/src/components/common/project-status-icon/project-status-icon.tsx
@@ -4,7 +4,7 @@ import Icon, {
  ClockCircleOutlined,
  CloseCircleOutlined,
  StopOutlined,
-} from '@/shared/antd-imports';
+} from '@ant-design/icons';

 const iconMap = {
  'clock-circle': ClockCircleOutlined,
--- a/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx
+++ b/worklenz-frontend/src/components/common/single-avatar/single-avatar.tsx
@@ -1,5 +1,5 @@
 import { AvatarNamesMap } from '@/shared/constants';
-import { Avatar, Flex, Space } from '@/shared/antd-imports';
+import { Avatar, Flex, Space } from 'antd';

 interface SingleAvatarProps {
  avatarUrl?: string;
--- a/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
+++ b/worklenz-frontend/src/components/common/template-drawer/template-drawer.tsx
@@ -1,4 +1,4 @@
-import type { MenuProps } from '@/shared/antd-imports';
+import type { MenuProps } from 'antd';
 import {
  Empty,
  List,
@@ -10,7 +10,8 @@ import {
  Image,
  Input,
  Flex,
-} from '@/shared/antd-imports';
+  Button,
+} from 'antd';
 import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
@@ -22,7 +23,7 @@ import {
  IWorklenzTemplate,
 } from '@/types/project-templates/project-templates.types';
 import './template-drawer.css';
-import { SearchOutlined } from '@/shared/antd-imports';
+import { SearchOutlined } from '@ant-design/icons';
 import logger from '@/utils/errorLogger';

 const { Title, Text } = Typography;
--- a/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx
+++ b/worklenz-frontend/src/components/common/tooltip-wrapper/tooltip-wrapper.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Tooltip, TooltipProps } from '@/shared/antd-imports';
+import { Tooltip, TooltipProps } from 'antd';

 interface TooltipWrapperProps extends Omit<TooltipProps, 'children'> {
  children: React.ReactElement;
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanBoard.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { Card, Spin, Empty } from '@/shared/antd-imports';
+import { Card, Spin, Empty } from 'antd';
 import {
  DndContext,
  DragOverlay,
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSection.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
-import { Button, Flex } from '@/shared/antd-imports';
-import { PlusOutlined } from '@/shared/antd-imports';
+import { Button, Flex } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
-import { DownOutlined } from '@/shared/antd-imports';
+import { DownOutlined } from '@ant-design/icons';

 import { useAppSelector } from '@/hooks/useAppSelector';
 import { themeWiseColor } from '@/utils/themeWiseColor';
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateSubtaskCard.tsx
@@ -1,4 +1,4 @@
-import { Flex, Input, InputRef } from '@/shared/antd-imports';
+import { Flex, Input, InputRef } from 'antd';
 import React, { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';

--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanCreateTaskCard.tsx
@@ -1,5 +1,5 @@
 import React, { useRef, useState, useEffect } from 'react';
-import { Button, Flex, Input, InputRef } from '@/shared/antd-imports';
+import { Button, Flex, Input, InputRef } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { nanoid } from '@reduxjs/toolkit';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanGroup.tsx
@@ -12,7 +12,7 @@ import EnhancedKanbanTaskCard from './EnhancedKanbanTaskCard';
 import VirtualizedTaskList from './VirtualizedTaskList';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import './EnhancedKanbanGroup.css';
-import { Badge, Flex, InputRef, MenuProps, Popconfirm } from '@/shared/antd-imports';
+import { Badge, Flex, InputRef, MenuProps, Popconfirm } from 'antd';
 import { themeWiseColor } from '@/utils/themeWiseColor';
 import useIsProjectManager from '@/hooks/useIsProjectManager';
 import { useAuthService } from '@/hooks/useAuth';
@@ -25,11 +25,11 @@ import {
  MoreOutlined,
 } from '@ant-design/icons/lib/icons';
 import { colors } from '@/styles/colors';
-import { Input } from '@/shared/antd-imports';
-import { Tooltip } from '@/shared/antd-imports';
-import { Typography } from '@/shared/antd-imports';
-import { Dropdown } from '@/shared/antd-imports';
-import { Button } from '@/shared/antd-imports';
+import { Input } from 'antd';
+import { Tooltip } from 'antd';
+import { Typography } from 'antd';
+import { Dropdown } from 'antd';
+import { Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons/lib/icons';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
+++ b/worklenz-frontend/src/components/enhanced-kanban/EnhancedKanbanTaskCard.tsx
@@ -15,18 +15,18 @@ import PrioritySection from '../board/taskCard/priority-section/priority-section
 import Typography from 'antd/es/typography';
 import CustomDueDatePicker from '../board/custom-due-date-picker';
 import { themeWiseColor } from '@/utils/themeWiseColor';
-import { ForkOutlined } from '@/shared/antd-imports';
+import { ForkOutlined } from '@ant-design/icons';
 import { Dayjs } from 'dayjs';
 import dayjs from 'dayjs';
-import { CaretDownFilled, CaretRightFilled } from '@/shared/antd-imports';
+import { CaretDownFilled, CaretRightFilled } from '@ant-design/icons';
 import {
  fetchBoardSubTasks,
  toggleTaskExpansion,
 } from '@/features/enhanced-kanban/enhanced-kanban.slice';
-import { Divider } from '@/shared/antd-imports';
-import { List } from '@/shared/antd-imports';
-import { Skeleton } from '@/shared/antd-imports';
-import { PlusOutlined } from '@/shared/antd-imports';
+import { Divider } from 'antd';
+import { List } from 'antd';
+import { Skeleton } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import BoardSubTaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-sub-task-card';
 import BoardCreateSubtaskCard from '@/pages/projects/projectView/board/board-section/board-sub-task-card/board-create-sub-task-card';
 import { useTranslation } from 'react-i18next';
--- a/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx
+++ b/worklenz-frontend/src/components/home-tasks/statusDropdown/home-tasks-status-dropdown.tsx
@@ -1,4 +1,4 @@
-import { Badge, Flex, Select } from '@/shared/antd-imports';
+import { Badge, Flex, Select } from 'antd';
 import './home-tasks-status-dropdown.css';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useTranslation } from 'react-i18next';
--- a/Show More
+++ b/Show More