diff --git a/apps/api/bin/docker-entrypoint-api.sh b/apps/api/bin/docker-entrypoint-api.sh
index 5a1da1570..7a6402864 100755
--- a/apps/api/bin/docker-entrypoint-api.sh
+++ b/apps/api/bin/docker-entrypoint-api.sh
@@ -32,4 +32,7 @@ python manage.py create_bucket
 # Clear Cache before starting to remove stale values
 python manage.py clear_cache
 
+# Collect static files
+python manage.py collectstatic --noinput
+
 exec gunicorn -w "$GUNICORN_WORKERS" -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:"${PORT:-8000}" --max-requests 1200 --max-requests-jitter 1000 --access-logfile -
diff --git a/apps/api/plane/settings/common.py b/apps/api/plane/settings/common.py
index a9e9925c2..8f28b9e98 100644
--- a/apps/api/plane/settings/common.py
+++ b/apps/api/plane/settings/common.py
@@ -36,6 +36,7 @@ INSTALLED_APPS = [
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
+    "django.contrib.staticfiles",
     # Inhouse apps
     "plane.analytics",
     "plane.app",
@@ -58,6 +59,7 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "plane.authentication.middleware.session.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
diff --git a/apps/api/plane/static/logos/Logo.png b/apps/api/plane/static/logos/Logo.png
new file mode 100644
index 000000000..385ed57aa
Binary files /dev/null and b/apps/api/plane/static/logos/Logo.png differ
diff --git a/apps/api/requirements/base.txt b/apps/api/requirements/base.txt
index 7f2c64be4..52c18c706 100644
--- a/apps/api/requirements/base.txt
+++ b/apps/api/requirements/base.txt
@@ -21,7 +21,7 @@ celery==5.4.0
 django_celery_beat==2.6.0
 django-celery-results==2.5.1
 # file serve
-whitenoise==6.6.0
+whitenoise==6.11.0
 # fake data
 faker==25.0.0
 # filters
diff --git a/apps/proxy/Caddyfile.ce b/apps/proxy/Caddyfile.ce
index 48a7177eb..ea6bb795a 100644
--- a/apps/proxy/Caddyfile.ce
+++ b/apps/proxy/Caddyfile.ce
@@ -15,6 +15,8 @@
 
 	reverse_proxy /auth/* api:8000
 
+	reverse_proxy /static/* api:8000
+
 	reverse_proxy /{$BUCKET_NAME}/* plane-minio:9000
 
 	reverse_proxy /* web:3000