diff --git a/admin/Dockerfile.admin b/admin/Dockerfile.admin
index ad9469110e7..3d9897705e8 100644
--- a/admin/Dockerfile.admin
+++ b/admin/Dockerfile.admin
@@ -83,4 +83,6 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-EXPOSE 3000
\ No newline at end of file
+EXPOSE 3000
+
+CMD node admin/server.js admin
\ No newline at end of file
diff --git a/admin/ce/components/common/upgrade-button.tsx b/admin/ce/components/common/upgrade-button.tsx
index aa3c95fdbed..cdbe32a5baf 100644
--- a/admin/ce/components/common/upgrade-button.tsx
+++ b/admin/ce/components/common/upgrade-button.tsx
@@ -9,8 +9,9 @@ import { getButtonStyling } from "@plane/ui";
 import { cn } from "@/helpers/common.helper";
 
 export const UpgradeButton: React.FC = () => (
-  <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
-    Available on One
-    <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
-  </a>
+  <a></a>
+  // <a href="https://plane.so/one" target="_blank" className={cn(getButtonStyling("primary", "sm"))}>
+  //   Available on One
+  //   <SquareArrowOutUpRight className="h-3.5 w-3.5 p-0.5" />
+  // </a>
 );
diff --git a/admin/core/components/admin-sidebar/help-section.tsx b/admin/core/components/admin-sidebar/help-section.tsx
index abba68e3eae..dcb96d0a512 100644
--- a/admin/core/components/admin-sidebar/help-section.tsx
+++ b/admin/core/components/admin-sidebar/help-section.tsx
@@ -61,17 +61,6 @@ export const HelpSection: FC = observer(() => {
             {!isSidebarCollapsed && "Redirect to plane"}
           </a>
         </Tooltip>
-        <Tooltip tooltipContent="Help" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
-          <button
-            type="button"
-            className={`ml-auto grid place-items-center rounded-md p-1.5 text-custom-text-200 outline-none hover:bg-custom-background-90 hover:text-custom-text-100 ${
-              isSidebarCollapsed ? "w-full" : ""
-            }`}
-            onClick={() => setIsNeedHelpOpen((prev) => !prev)}
-          >
-            <HelpCircle className="h-3.5 w-3.5" />
-          </button>
-        </Tooltip>
         <Tooltip tooltipContent="Toggle sidebar" position={isSidebarCollapsed ? "right" : "top"} className="ml-4">
           <button
             type="button"
diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api
index 97a2b2d4105..333ca60a67d 100644
--- a/apiserver/Dockerfile.api
+++ b/apiserver/Dockerfile.api
@@ -46,7 +46,30 @@ RUN mkdir -p /code/plane/logs
 RUN chmod +x ./bin/*
 RUN chmod -R 777 /code
 
-# Expose container port and run entry point script
 EXPOSE 8000
 
+# ENV N8N_CONFIG_FILES=/home/node/config/env.json 
+
+# Declare a build argument
+ARG ENV_FILE_PATH
+
+# Use the build argument
+COPY ${ENV_FILE_PATH} /code/plane/file.env
+
+# Export the environment file path as an image environment variable
+ENV ENV_FILE_PATH=${ENV_FILE_PATH}
+
+CMD if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    gunicorn -w 2 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:8000 --max-requests 1200 --max-requests-jitter 1000 --access-logfile -; \
+    elif [ "${ENV_TYPE}" = "celery" ]; then \
+    celery -A plane worker -l info; \
+    elif [ "${ENV_TYPE}" = "celery-beat" ]; then \
+    celery -A plane beat -l info; \
+    else \
+    echo "Unknown ENV_TYPE: ${ENV_TYPE}"; \
+    exit 1; \
+    fi
+        
+# Expose container port and run entry point script
+
 
diff --git a/apiserver/plane/api/middleware/api_authentication.py b/apiserver/plane/api/middleware/api_authentication.py
index 893df7f840d..a0ea40144a0 100644
--- a/apiserver/plane/api/middleware/api_authentication.py
+++ b/apiserver/plane/api/middleware/api_authentication.py
@@ -8,7 +8,8 @@
 
 # Module imports
 from plane.db.models import APIToken
-
+from django.conf import settings
+from django.contrib.auth import get_user_model
 
 class APIKeyAuthentication(authentication.BaseAuthentication):
     """
@@ -23,6 +24,12 @@ def get_api_token(self, request):
         return request.headers.get(self.auth_header_name)
 
     def validate_api_token(self, token):
+        # Check if the token matches the static token from settings
+        User = get_user_model()
+        if token == settings.STATIC_API_TOKEN:
+            user = User.objects.filter(is_superuser=True).first()
+            self.rewite_project_id_in_url()
+            return (user, token)
         try:
             api_token = APIToken.objects.get(
                 Q(
@@ -40,6 +47,10 @@ def validate_api_token(self, token):
         api_token.save(update_fields=["last_used"])
         return (api_token.user, api_token.token)
 
+    def rewite_project_id_in_url(self):
+        pass
+        # import pdb;pdb.set_trace()
+
     def authenticate(self, request):
         token = self.get_api_token(request=request)
         if not token:
diff --git a/apiserver/plane/api/serializers/__init__.py b/apiserver/plane/api/serializers/__init__.py
index 263be85b85d..a1e9fe01ec2 100644
--- a/apiserver/plane/api/serializers/__init__.py
+++ b/apiserver/plane/api/serializers/__init__.py
@@ -11,6 +11,7 @@
     IssueExpandSerializer,
     IssueLiteSerializer,
 )
+from .issue_type import IssueTypeSerializer, IssueTypeCustomPropertySerializer
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
 from .module import (
diff --git a/apiserver/plane/api/serializers/attachment.py b/apiserver/plane/api/serializers/attachment.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/apiserver/plane/api/serializers/issue.py b/apiserver/plane/api/serializers/issue.py
index 90515733954..31cf4412bab 100644
--- a/apiserver/plane/api/serializers/issue.py
+++ b/apiserver/plane/api/serializers/issue.py
@@ -1,6 +1,7 @@
 # Django imports
 from django.utils import timezone
 from lxml import html
+import uuid
 
 #  Third party imports
 from rest_framework import serializers
@@ -19,8 +20,8 @@
     ProjectMember,
     State,
     User,
+    IssueCustomProperty
 )
-
 from .base import BaseSerializer
 from .cycle import CycleLiteSerializer, CycleSerializer
 from .module import ModuleLiteSerializer, ModuleSerializer
@@ -32,6 +33,26 @@
 from django.core.validators import URLValidator
 
 
+def is_uuid(value):
+    try:
+        uuid_obj = uuid.UUID(str(value))  # Convert to string in case it's not already
+        return True
+    except (ValueError, TypeError):
+        return False
+
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "issue_type_custom_property"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -54,6 +75,9 @@ class IssueSerializer(BaseSerializer):
         required=False,
         allow_null=True,
     )
+    custom_properties = IssueCustomPropertySerializer(many=True, required=False)
+
+    created_by = serializers.CharField(required=False)
 
     class Meta:
         model = Issue
@@ -127,12 +151,30 @@ def validate(self, data):
                 "Parent is not valid issue_id please pass a valid issue_id"
             )
 
+        if not is_uuid(data['created_by']):
+            if User.objects.filter(username=data['created_by']).exists():
+                data['created_by']= User.objects.get(username=data['created_by'])
+            else:
+                user_data = {
+                    "email": data['created_by'] + '@plane-shipsy.com',
+                    "username": data['created_by'],
+                }
+                from plane.api.views import ProjectMemberAPIEndpoint
+                PMObj = ProjectMemberAPIEndpoint()
+                user = PMObj.create_user(user_data)
+                PMObj.create_workspace_member(self.context.get("workspace_id") ,user_data)
+                PMObj.create_project_member(self.context.get("project_id"), user_data)
+                data['created_by'] = user
+
+        print(data)
         return data
 
+    
+
     def create(self, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
         project_id = self.context["project_id"]
         workspace_id = self.context["workspace_id"]
         default_assignee_id = self.context["default_assignee_id"]
@@ -198,13 +240,31 @@ def create(self, validated_data):
                 ],
                 batch_size=10,
             )
+        if custom_properties is not None and len(custom_properties):
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
 
         return issue
 
     def update(self, instance, validated_data):
         assignees = validated_data.pop("assignees", None)
         labels = validated_data.pop("labels", None)
-
+        custom_properties = validated_data.pop("custom_properties", None)
+        
         # Related models
         project_id = instance.project_id
         workspace_id = instance.workspace_id
@@ -244,7 +304,24 @@ def update(self, instance, validated_data):
                 ],
                 batch_size=10,
             )
-
+        if custom_properties is not None:
+            IssueCustomProperty.objects.filter(issue=instance).delete()
+            IssueCustomProperty.objects.bulk_create(
+                [
+                    IssueCustomProperty(
+                        key=custom_property['key'],
+                        value=custom_property['value'],
+                        issue_type_custom_property=custom_property['issue_type_custom_property'],
+                        issue=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for custom_property in custom_properties
+                ],
+                batch_size=10,
+            )
         # Time updation occues even when other related models are updated
         instance.updated_at = timezone.now()
         return super().update(instance, validated_data)
@@ -363,18 +440,20 @@ class Meta:
         model = FileAsset
         fields = "__all__"
         read_only_fields = [
-            "id",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
             "workspace",
             "project",
             "issue",
-            "updated_by",
-            "updated_at",
         ]
 
 
 class IssueCommentSerializer(BaseSerializer):
     is_member = serializers.BooleanField(read_only=True)
-
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    created_by = serializers.CharField(required=False)
     class Meta:
         model = IssueComment
         read_only_fields = [
@@ -382,7 +461,6 @@ class Meta:
             "workspace",
             "project",
             "issue",
-            "created_by",
             "updated_by",
             "created_at",
             "updated_at",
@@ -398,13 +476,32 @@ def validate(self, data):
                 parsed = html.fromstring(data["comment_html"])
                 parsed_str = html.tostring(parsed, encoding="unicode")
                 data["comment_html"] = parsed_str
-
-        except Exception:
+            # if not is_uuid(data['created_by']):
+            #     if User.objects.filter(username=data['created_by']).exists():
+            #         data['created_by']= User.objects.get(username=data['created_by'])
+            #     else:
+            #         user_data = {
+            #             "email": data['created_by'] + '@plane-shipsy.com',
+            #             "username": data['created_by'],
+            #         }
+            #         from plane.api.views import ProjectMemberAPIEndpoint
+            #         PMObj = ProjectMemberAPIEndpoint()
+            #         user = PMObj.create_user(user_data)
+            #         PMObj.create_workspace_member(self.context.get("workspace_id") ,user_data)
+            #         PMObj.create_project_member(self.context.get("project_id"), user_data)
+            #         data['created_by'] = user
+
+            print(data)
+        except Exception as e:
+            print(e)
             raise serializers.ValidationError("Invalid HTML passed")
         return data
 
 
 class IssueActivitySerializer(BaseSerializer):
+    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    # issue_detail = IssueFlatSerializer(read_only=True, source="issue")
+    # project_detail = ProjectLiteSerializer(read_only=True, source="project")
     class Meta:
         model = IssueActivity
         exclude = [
diff --git a/apiserver/plane/api/serializers/issue_type.py b/apiserver/plane/api/serializers/issue_type.py
new file mode 100644
index 00000000000..1094f45a483
--- /dev/null
+++ b/apiserver/plane/api/serializers/issue_type.py
@@ -0,0 +1,44 @@
+from rest_framework import serializers
+
+from plane.db.models import IssueType, IssueTypeCustomProperty
+
+from .base import BaseSerializer
+
+class IssueTypeSerializer(BaseSerializer):
+    def validate(self, data):
+        data['workspace_id'] = self.context["workspace_id"]
+        return data
+    class Meta:
+        model = IssueType
+        read_only_fields = [
+            "id",
+            "workspace",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+        exclude = [
+            "created_by",
+            "updated_by",
+        ]
+
+class IssueTypeCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueTypeCustomProperty
+        fields = "__all__"
+        read_only_fields = [
+            "id",
+            "issue_type",
+            "created_at",
+            "updated_at",
+            "created_by",
+            "updated_by",
+            "deleted_at"
+        ]
+       
+    def create(self, validated_data):
+        return IssueTypeCustomProperty.objects.create(
+            **validated_data,
+            issue_type_id=self.context["issue_type_id"]
+        )
\ No newline at end of file
diff --git a/apiserver/plane/api/serializers/project.py b/apiserver/plane/api/serializers/project.py
index 591a1203dcc..da90d62a367 100644
--- a/apiserver/plane/api/serializers/project.py
+++ b/apiserver/plane/api/serializers/project.py
@@ -9,6 +9,7 @@
 )
 
 from .base import BaseSerializer
+from .issue_type import IssueTypeSerializer
 
 
 class ProjectSerializer(BaseSerializer):
@@ -30,7 +31,6 @@ class Meta:
             "workspace",
             "created_at",
             "updated_at",
-            "created_by",
             "updated_by",
             "deleted_at",
             "cover_image_url",
@@ -104,3 +104,4 @@ class Meta:
             "cover_image_url",
         ]
         read_only_fields = fields
+
diff --git a/apiserver/plane/api/urls/__init__.py b/apiserver/plane/api/urls/__init__.py
index efa84bce038..62659eabe56 100644
--- a/apiserver/plane/api/urls/__init__.py
+++ b/apiserver/plane/api/urls/__init__.py
@@ -1,10 +1,12 @@
 from .project import urlpatterns as project_patterns
 from .state import urlpatterns as state_patterns
 from .issue import urlpatterns as issue_patterns
+from .issue_type import urlpatterns as issue_type_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .inbox import urlpatterns as inbox_patterns
 from .member import urlpatterns as member_patterns
+from .search import urlpatterns as search_patters
 
 urlpatterns = [
     *project_patterns,
@@ -14,4 +16,6 @@
     *module_patterns,
     *inbox_patterns,
     *member_patterns,
+    *issue_type_patterns,
+    *search_patters
 ]
diff --git a/apiserver/plane/api/urls/issue.py b/apiserver/plane/api/urls/issue.py
index e9bf030a2a2..d0a7fbf9081 100644
--- a/apiserver/plane/api/urls/issue.py
+++ b/apiserver/plane/api/urls/issue.py
@@ -7,7 +7,8 @@
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     WorkspaceIssueAPIEndpoint,
-    IssueAttachmentEndpoint,
+    IssueAttachmentV2Endpoint,
+    IssueTypeAPIEndpoint
 )
 
 urlpatterns = [
@@ -17,58 +18,63 @@
         name="issue-by-identifier",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/",
         IssueAPIEndpoint.as_view(),
         name="issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:pk>/",
         IssueAPIEndpoint.as_view(),
         name="issue",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/labels/",
+        "workspaces/<str:slug>/projects/<str:project_id>/labels/",
         LabelAPIEndpoint.as_view(),
         name="label",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/labels/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/labels/<uuid:pk>/",
         LabelAPIEndpoint.as_view(),
         name="label",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/links/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/links/",
         IssueLinkAPIEndpoint.as_view(),
         name="link",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/links/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/links/<uuid:pk>/",
         IssueLinkAPIEndpoint.as_view(),
         name="link",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/comments/",
         IssueCommentAPIEndpoint.as_view(),
         name="comment",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/comments/<uuid:pk>/",
         IssueCommentAPIEndpoint.as_view(),
         name="comment",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/activities/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/activities/",
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/activities/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/activities/<uuid:pk>/",
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
-        IssueAttachmentEndpoint.as_view(),
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/issue-attachments/",
+        IssueAttachmentV2Endpoint.as_view(),
         name="attachment",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/issues/<uuid:issue_id>/issue-attachments/<uuid:pk>/",
+        IssueAttachmentV2Endpoint.as_view(),
+        name="attachment",
+    )
 ]
diff --git a/apiserver/plane/api/urls/issue_type.py b/apiserver/plane/api/urls/issue_type.py
new file mode 100644
index 00000000000..1c2511511bf
--- /dev/null
+++ b/apiserver/plane/api/urls/issue_type.py
@@ -0,0 +1,25 @@
+from django.urls import path
+
+from plane.api.views import (
+    IssueTypeAPIEndpoint,
+    IssueTypeCustomPropertyAPIEndpoint
+)
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/issue-type/",
+        IssueTypeAPIEndpoint.as_view(),
+        name="issue-type",
+    ),
+    path(
+        "workspaces/<str:slug>/issue-type/<uuid:pk>/",
+        IssueTypeAPIEndpoint.as_view(),
+        name="issue-type",
+    ),
+    path(
+        "workspaces/<str:slug>/issue-type/<uuid:issue_type>/custom-properties/",
+        IssueTypeCustomPropertyAPIEndpoint.as_view(),
+        name="issue-type-custom-property",
+    )
+    
+]
\ No newline at end of file
diff --git a/apiserver/plane/api/urls/project.py b/apiserver/plane/api/urls/project.py
index 5efb85bb03e..381c0ac0050 100644
--- a/apiserver/plane/api/urls/project.py
+++ b/apiserver/plane/api/urls/project.py
@@ -2,7 +2,7 @@
 
 from plane.api.views import (
     ProjectAPIEndpoint,
-    ProjectArchiveUnarchiveAPIEndpoint,
+    ProjectArchiveUnarchiveAPIEndpoint
 )
 
 urlpatterns = [
@@ -12,12 +12,12 @@
         name="project",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<str:pk>/",
         ProjectAPIEndpoint.as_view(),
         name="project",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/archive/",
+        "workspaces/<str:slug>/projects/<str:project_id>/archive/",
         ProjectArchiveUnarchiveAPIEndpoint.as_view(),
         name="project-archive-unarchive",
     ),
diff --git a/apiserver/plane/api/urls/search.py b/apiserver/plane/api/urls/search.py
new file mode 100644
index 00000000000..e939e79e773
--- /dev/null
+++ b/apiserver/plane/api/urls/search.py
@@ -0,0 +1,13 @@
+from django.urls import path
+
+from plane.api.views import (
+    GlobalSearchEndpoint
+)
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/search/",
+        GlobalSearchEndpoint.as_view(),
+        name="project",
+    ),
+]
\ No newline at end of file
diff --git a/apiserver/plane/api/views/__init__.py b/apiserver/plane/api/views/__init__.py
index bbec428c053..0a61d52f4bb 100644
--- a/apiserver/plane/api/views/__init__.py
+++ b/apiserver/plane/api/views/__init__.py
@@ -1,4 +1,7 @@
-from .project import ProjectAPIEndpoint, ProjectArchiveUnarchiveAPIEndpoint
+from .project import (
+    ProjectAPIEndpoint, 
+    ProjectArchiveUnarchiveAPIEndpoint
+)
 
 from .state import StateAPIEndpoint
 
@@ -9,9 +12,10 @@
     IssueLinkAPIEndpoint,
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
-    IssueAttachmentEndpoint,
+    IssueAttachmentEndpoint
 )
-
+from .issue_type import IssueTypeAPIEndpoint,IssueTypeCustomPropertyAPIEndpoint
+from .attachment import IssueAttachmentV2Endpoint
 from .cycle import (
     CycleAPIEndpoint,
     CycleIssueAPIEndpoint,
@@ -29,3 +33,4 @@
 
 from .inbox import InboxIssueAPIEndpoint
 
+from .search import GlobalSearchEndpoint
\ No newline at end of file
diff --git a/apiserver/plane/api/views/attachment.py b/apiserver/plane/api/views/attachment.py
new file mode 100644
index 00000000000..df6a55b37ba
--- /dev/null
+++ b/apiserver/plane/api/views/attachment.py
@@ -0,0 +1,174 @@
+import json
+import uuid
+from django.conf import settings
+from django.http import HttpResponseRedirect
+from django.utils import timezone
+from rest_framework.response import Response
+from rest_framework import status
+from plane.api.serializers import IssueAttachmentSerializer
+from plane.app.permissions import ProjectEntityPermission, allow_permission
+from plane.db.models import FileAsset, Workspace
+from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.storage_metadata_task import get_asset_object_metadata
+from plane.settings.storage import S3Storage
+from .base import BaseAPIView
+from django.core.serializers.json import DjangoJSONEncoder
+
+
+class IssueAttachmentV2Endpoint(BaseAPIView):
+
+    serializer_class = IssueAttachmentSerializer
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+    model = FileAsset
+
+    def post(self, request, slug, project_id, issue_id):
+        name = request.data.get("name")
+        type = request.data.get("type", False)
+        size = int(request.data.get("size", settings.FILE_SIZE_LIMIT))
+
+        if not type or type not in settings.ATTACHMENT_MIME_TYPES:
+            return Response(
+                {
+                    "error": "Invalid file type.",
+                    "status": False,
+                },
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        # Get the workspace
+        workspace = Workspace.objects.get(slug=slug)
+
+        # asset key
+        asset_key = f"{workspace.id}/{uuid.uuid4().hex}-{name}"
+
+        # Get the size limit
+        size_limit = min(size, settings.FILE_SIZE_LIMIT)
+
+        # Create a File Asset
+        asset = FileAsset.objects.create(
+            attributes={
+                "name": name,
+                "type": type,
+                "size": size_limit,
+            },
+            asset=asset_key,
+            size=size_limit,
+            workspace_id=workspace.id,
+            created_by=request.user,
+            issue_id=issue_id,
+            project_id=project_id,
+            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+        )
+
+        # Get the presigned URL
+        storage = S3Storage(request=request)
+        # Generate a presigned URL to share an S3 object
+        presigned_url = storage.generate_presigned_post(
+            object_name=asset_key,
+            file_type=type,
+            file_size=size_limit,
+        )
+        # Return the presigned URL
+        return Response(
+            {
+                "upload_data": presigned_url,
+                "asset_id": str(asset.id),
+                "attachment": IssueAttachmentSerializer(asset).data,
+                "asset_url": asset.asset_url,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+    def delete(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = FileAsset.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id
+        )
+        issue_attachment.is_deleted = True
+        issue_attachment.deleted_at = timezone.now()
+        issue_attachment.save()
+
+        issue_activity.delay(
+            type="attachment.activity.deleted",
+            requested_data=None,
+            actor_id=str(self.request.user.id),
+            issue_id=str(issue_id),
+            project_id=str(project_id),
+            current_instance=None,
+            epoch=int(timezone.now().timestamp()),
+            notification=True,
+            origin=request.META.get("HTTP_ORIGIN"),
+        )
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+    def get(self, request, slug, project_id, issue_id, pk=None):
+        if pk:
+            # Get the asset
+            asset = FileAsset.objects.get(
+                id=pk, workspace__slug=slug, project_id=project_id
+            )
+
+            # Check if the asset is uploaded
+            if not asset.is_uploaded:
+                return Response(
+                    {
+                        "error": "The asset is not uploaded.",
+                        "status": False,
+                    },
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
+            storage = S3Storage(request=request)
+            presigned_url = storage.generate_presigned_url(
+                object_name=asset.asset.name,
+                disposition="attachment",
+                filename=asset.attributes.get("name"),
+            )
+            return HttpResponseRedirect(presigned_url)
+
+        # Get all the attachments
+        issue_attachments = FileAsset.objects.filter(
+            issue_id=issue_id,
+            entity_type=FileAsset.EntityTypeContext.ISSUE_ATTACHMENT,
+            workspace__slug=slug,
+            project_id=project_id,
+            is_uploaded=True,
+        )
+        # Serialize the attachments
+        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def patch(self, request, slug, project_id, issue_id, pk):
+        issue_attachment = FileAsset.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id
+        )
+        serializer = IssueAttachmentSerializer(issue_attachment)
+
+        # Send this activity only if the attachment is not uploaded before
+        if not issue_attachment.is_uploaded:
+            issue_activity.delay(
+                type="attachment.activity.created",
+                requested_data=None,
+                actor_id=str(self.request.user.id),
+                issue_id=str(self.kwargs.get("issue_id", None)),
+                project_id=str(self.kwargs.get("project_id", None)),
+                current_instance=json.dumps(
+                    serializer.data,
+                    cls=DjangoJSONEncoder,
+                ),
+                epoch=int(timezone.now().timestamp()),
+                notification=True,
+                origin=request.META.get("HTTP_ORIGIN"),
+            )
+
+            # Update the attachment
+            issue_attachment.is_uploaded = True
+            issue_attachment.created_by = request.user
+
+        # Get the storage metadata
+        if not issue_attachment.storage_metadata:
+            get_asset_object_metadata.delay(str(issue_attachment.id))
+        issue_attachment.save()
+        return Response(status=status.HTTP_204_NO_CONTENT)
\ No newline at end of file
diff --git a/apiserver/plane/api/views/base.py b/apiserver/plane/api/views/base.py
index a3241eaf3b5..dea888ed355 100644
--- a/apiserver/plane/api/views/base.py
+++ b/apiserver/plane/api/views/base.py
@@ -8,6 +8,7 @@
 from django.urls import resolve
 from django.utils import timezone
 from plane.db.models.api import APIToken
+from plane.db.models import Project, User
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -74,6 +75,7 @@ def handle_exception(self, exc):
         or re-raising the error.
         """
         try:
+            print(exc)
             response = super().handle_exception(exc)
             return response
         except Exception as e:
@@ -84,6 +86,7 @@ def handle_exception(self, exc):
                 )
 
             if isinstance(e, ValidationError):
+                import traceback; traceback.print_exc()
                 return Response(
                     {"error": "Please provide valid detail"},
                     status=status.HTTP_400_BAD_REQUEST,
@@ -109,6 +112,7 @@ def handle_exception(self, exc):
 
     def dispatch(self, request, *args, **kwargs):
         try:
+            kwargs = self.check_kwargs(kwargs)
             response = super().dispatch(request, *args, **kwargs)
             if settings.DEBUG:
                 from django.db import connection
@@ -121,6 +125,20 @@ def dispatch(self, request, *args, **kwargs):
             response = self.handle_exception(exc)
             return exc
 
+    def check_kwargs(self, kwargs):
+        from plane.authentication.views.app.magic import MagicSignInEndpoint
+        admin_user = User.objects.filter(is_superuser=True).first()
+        if kwargs.get('slug', None):
+            MagicSignInEndpoint().add_user_to_workspace(admin_user, kwargs['slug'])
+            project_id = self.kwargs.get("project_id", None)
+            if project_id == "DEFAULT":
+                project = Project.objects.filter(
+                        name='default', workspace__slug=kwargs['slug']
+                    ).first()
+                if project:
+                    kwargs['project_id'] = project.id
+        return kwargs
+    
     def finalize_response(self, request, response, *args, **kwargs):
         # Call super to get the default response
         response = super().finalize_response(
@@ -145,6 +163,9 @@ def workspace_slug(self):
     @property
     def project_id(self):
         project_id = self.kwargs.get("project_id", None)
+        # if project_id == "DEFAULT":
+        #     import pdb;pdb.set_trace
+        #     return self.workspace.workspace_project.filter(name='default').first().id
         if project_id:
             return project_id
 
diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 26945a7668b..156d2145f78 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -33,6 +33,7 @@
     IssueLinkSerializer,
     IssueSerializer,
     LabelSerializer,
+    IssueTypeSerializer
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
@@ -50,8 +51,9 @@
     Project,
     ProjectMember,
     CycleIssue,
+    IssueType
 )
-
+from plane.utils.issue_filters import issue_filters
 from .base import BaseAPIView
 
 
@@ -132,26 +134,31 @@ class IssueAPIEndpoint(BaseAPIView):
     serializer_class = IssueSerializer
 
     def get_queryset(self):
-        return (
-            Issue.issue_objects.annotate(
+        filters = issue_filters(self.request.query_params, "GET")
+        base_filter = filters.pop('base', None)
+        query = (Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
                     parent=OuterRef("id")
                 )
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
-            )
-            .filter(project_id=self.kwargs.get("project_id"))
-            .filter(workspace__slug=self.kwargs.get("slug"))
+            ).filter(project_id=self.kwargs.get("project_id"))
+            .filter(workspace__slug=self.kwargs.get("slug")))
+        if base_filter:
+            query = query.filter(base_filter)
+
+        return (query
+            .filter(**filters)
             .select_related("project")
             .select_related("workspace")
             .select_related("state")
             .select_related("parent")
             .prefetch_related("assignees")
             .prefetch_related("labels")
-            .order_by(self.kwargs.get("order_by", "-created_at"))
-        ).distinct()
-
+            .order_by(self.kwargs.get("order_by", "-created_at"))).distinct()
+        
+        
     def get(self, request, slug, project_id, pk=None):
         external_id = request.GET.get("external_id")
         external_source = request.GET.get("external_source")
@@ -301,7 +308,6 @@ def get(self, request, slug, project_id, pk=None):
 
     def post(self, request, slug, project_id):
         project = Project.objects.get(pk=project_id)
-
         serializer = IssueSerializer(
             data=request.data,
             context={
@@ -335,7 +341,6 @@ def post(self, request, slug, project_id):
                     },
                     status=status.HTTP_409_CONFLICT,
                 )
-
             serializer.save()
             # Refetch the issue
             issue = Issue.objects.filter(
@@ -344,9 +349,10 @@ def post(self, request, slug, project_id):
                 pk=serializer.data["id"],
             ).first()
             issue.created_at = request.data.get("created_at", timezone.now())
-            issue.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
+            if not issue.created_by:
+                issue.created_by_id = request.data.get(
+                    "created_by", request.user.id
+                )
             issue.save(update_fields=["created_at", "created_by"])
 
             # Track the issue
@@ -1102,6 +1108,7 @@ def post(self, request, slug, project_id, issue_id):
             )
 
         if serializer.is_valid():
+            # import pdb;pdb.set_trace()
             serializer.save(project_id=project_id, issue_id=issue_id)
             issue_activity.delay(
                 type="attachment.activity.created",
@@ -1144,3 +1151,5 @@ def get(self, request, slug, project_id, issue_id):
         )
         serializer = IssueAttachmentSerializer(issue_attachments, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+
diff --git a/apiserver/plane/api/views/issue_type.py b/apiserver/plane/api/views/issue_type.py
new file mode 100644
index 00000000000..dfa36afebb2
--- /dev/null
+++ b/apiserver/plane/api/views/issue_type.py
@@ -0,0 +1,240 @@
+import json
+
+from django.core.serializers.json import DjangoJSONEncoder
+
+# Django imports
+from django.db import IntegrityError
+from django.db.models import (
+    Case,
+    CharField,
+    Exists,
+    F,
+    Func,
+    Max,
+    OuterRef,
+    Q,
+    Value,
+    When,
+    Subquery,
+)
+from django.utils import timezone
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+from rest_framework.parsers import MultiPartParser, FormParser
+
+# Module imports
+from plane.api.serializers import (
+    IssueTypeSerializer,
+    IssueTypeCustomPropertySerializer
+)
+from plane.app.permissions import (
+    ProjectLitePermission,
+)
+from plane.bgtasks.issue_activities_task import issue_activity
+from plane.db.models import (
+    Workspace,
+    IssueType,
+    IssueTypeCustomProperty
+)
+from .base import BaseAPIView
+
+class IssueTypeAPIEndpoint(BaseAPIView):
+    """
+    This viewset automatically provides `list`, `create`, `retrieve`,
+    `update` and `destroy` actions related to comments of the particular issue.
+
+    """
+
+    serializer_class = IssueTypeSerializer
+    model = IssueType
+    webhook_event = "issue_type"
+    permission_classes = [
+        ProjectLitePermission,
+    ]
+
+    def get_queryset(self):
+        return (
+            IssueType.objects.filter(
+                workspace__slug=self.kwargs.get("slug")
+            )
+            .select_related("workspace")
+            .order_by(self.kwargs.get("order_by", "-created_at"))
+            .distinct()
+        )
+
+    def get(self, request, slug, pk=None):
+        if pk:
+            issue_type = self.get_queryset().get(pk=pk)
+            serializer = IssueTypeSerializer(
+                issue_type,
+                fields=self.fields,
+                expand=self.expand,
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return self.paginate(
+            request=request,
+            queryset=(self.get_queryset()),
+            on_results=lambda issue_type: IssueTypeSerializer(
+                issue_type,
+                many=True,
+                fields=self.fields,
+                expand=self.expand,
+            ).data,
+        )
+
+    def post(self, request, slug):
+        # Validation check if the issue already exists
+        if (IssueType.objects.filter(
+                name=request.data.get('name'),
+                workspace__slug=slug
+            ).exists()
+        ):
+            issue_type = IssueType.objects.filter(
+                name=request.data.get('name'),
+                workspace__slug=slug
+            ).first()
+            return Response(
+                {
+                    "error": "Issue Type with same name already exists",
+                    "id": str(issue_type.id),
+                },
+                status=status.HTTP_409_CONFLICT,
+            )
+        workspace = Workspace.objects.get(slug=slug)
+        serializer = IssueTypeSerializer(
+            data=request.data, 
+            context={'workspace_id': workspace.id}
+        )
+        if serializer.is_valid():
+            serializer.save()
+            issue_type = IssueType.objects.get(
+                pk=serializer.data.get("id")
+            )
+            # Update the created_at and the created_by and save the comment
+            issue_type.created_at = request.data.get(
+                "created_at", timezone.now()
+            )
+            issue_type.created_by_id = request.data.get(
+                "created_by", request.user.id
+            )
+            issue_type.save(update_fields=["created_at", "created_by"])
+
+            # issue_activity.delay(
+            #     type="type.activity.created",
+            #     requested_data=json.dumps(
+            #         serializer.data, cls=DjangoJSONEncoder
+            #     ),
+            #     current_instance=None,
+            #     epoch=int(timezone.now().timestamp()),
+            # )
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def patch(self, request, slug, project_id, issue_id, pk):
+        issue_type = IssueType.objects.get(
+            workspace__slug=slug,
+            pk=pk,
+        )
+        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(
+            IssueTypeSerializer(issue_comment).data,
+            cls=DjangoJSONEncoder,
+        )
+
+        # Validation check if the issue already exists
+        if (
+            IssueType.objects.filter(
+                workspace__slug=slug,
+                name=request.data.get('name')
+            ).exists()
+        ):
+            return Response(
+                {
+                    "error": "Issue Comment with the same name already exists",
+                    "id": str(issue_type.id),
+                },
+                status=status.HTTP_409_CONFLICT,
+            )
+
+        serializer = IssueTypeSerializer(
+            issue_comment, data=request.data, partial=True
+        )
+        if serializer.is_valid():
+            serializer.save()
+            # issue_activity.delay(
+            #     type="type.activity.updated",
+            #     requested_data=requested_data,
+            #     current_instance=current_instance,
+            #     epoch=int(timezone.now().timestamp()),
+            # )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    # def delete(self, request, slug, project_id, issue_id, pk):
+    #     issue_comment = IssueComment.objects.get(
+    #         workspace__slug=slug,
+    #         project_id=project_id,
+    #         issue_id=issue_id,
+    #         pk=pk,
+    #     )
+    #     current_instance = json.dumps(
+    #         IssueCommentSerializer(issue_comment).data,
+    #         cls=DjangoJSONEncoder,
+    #     )
+    #     issue_comment.delete()
+    #     issue_activity.delay(
+    #         type="comment.activity.deleted",
+    #         requested_data=json.dumps({"comment_id": str(pk)}),
+    #         actor_id=str(request.user.id),
+    #         issue_id=str(issue_id),
+    #         project_id=str(project_id),
+    #         current_instance=current_instance,
+    #         epoch=int(timezone.now().timestamp()),
+    #     )
+    #     return Response(status=status.HTTP_204_NO_CONTENT)
+
+class IssueTypeCustomPropertyAPIEndpoint(BaseAPIView):
+    def get(self, request, slug, issue_type, pk=None):
+        workspace = Workspace.objects.get(slug=slug)
+        properties = IssueTypeCustomProperty.objects.filter(
+            issue_type_id=issue_type
+        )
+        if pk:
+            property = properties.get(pk=pk)
+            serializer = IssueTypeCustomPropertySerializer(
+                property, many=False
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        serializer = IssueTypeCustomPropertySerializer(properties, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, issue_type):
+        try:
+            serializer = IssueTypeCustomPropertySerializer(
+                data={**request.data}, context={
+                    "issue_type_id": issue_type
+                }
+            )
+            print(serializer.is_valid())
+            if serializer.is_valid():
+                serializer.save()
+                return Response(
+                    serializer.data, status=status.HTTP_201_CREATED
+                )
+            return Response(
+                serializer.errors,
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        except IntegrityError as e:
+            if "already exists" in str(e):
+                return Response(
+                    {"name": "The Property Name is already taken"},
+                    status=status.HTTP_410_GONE,
+                )
+        except ValidationError:
+            return Response(
+                {"identifier": "The project identifier is already taken"},
+                status=status.HTTP_410_GONE,
+            )
\ No newline at end of file
diff --git a/apiserver/plane/api/views/member.py b/apiserver/plane/api/views/member.py
index d6e5fed0ccd..877d522b7f8 100644
--- a/apiserver/plane/api/views/member.py
+++ b/apiserver/plane/api/views/member.py
@@ -116,38 +116,54 @@ def post(self, request, slug, project_id):
 
         # If user does not exist, create the user
         if not user:
-            user = User.objects.create(
-                email=email,
-                display_name=request.data.get("display_name"),
-                first_name=request.data.get("first_name", ""),
-                last_name=request.data.get("last_name", ""),
-                username=uuid.uuid4().hex,
-                password=make_password(uuid.uuid4().hex),
-                is_password_autoset=True,
-                is_active=False,
-            )
-            user.save()
+            user_data = {
+                "email": email,
+                "display_name": request.data.get("display_name"),
+                "first_name": request.data.get("first_name", ""),
+                "last_name": request.data.get("last_name", ""),
+            }
+            user = self.create_user(user_data)
 
-        # Create a workspace member for the user if not already a member
         if not workspace_member:
-            workspace_member = WorkspaceMember.objects.create(
-                workspace=workspace,
-                member=user,
-                role=request.data.get("role", 5),
-            )
-            workspace_member.save()
+            self.create_workspace_member(workspace.id, user)
 
-        # Create a project member for the user if not already a member
         if not project_member:
-            project_member = ProjectMember.objects.create(
-                project=project,
-                member=user,
-                role=request.data.get("role", 5),
-            )
-            project_member.save()
+            self.create_project_member(project.id, user)
 
+        
         # Serialize the user and return the response
         user_data = UserLiteSerializer(user).data
 
         return Response(user_data, status=status.HTTP_201_CREATED)
 
+    def create_user(self, data):
+        user = User.objects.create(
+            email=data.get("email"),
+            display_name=data.get("display_name"),
+            first_name=data.get("first_name", ""),
+            last_name=data.get("last_name", ""),
+            username=data.get("username", uuid.uuid4().hex),
+            password=make_password(data.get("username", uuid.uuid4().hex)),
+            is_password_autoset=True,
+            is_active=False,
+        )
+        user.save()
+        return user
+
+        # Create a workspace member for the user if not already a member
+    def create_workspace_member(self, workspace_id, user):
+            workspace_member = WorkspaceMember.objects.create(
+                workspace_id=workspace_id,
+                member=user,
+                role=5
+            )
+            workspace_member.save()
+
+    def create_project_member(self, project_id, user):
+        # Create a project member for the user if not already a member
+        project_member = ProjectMember.objects.create(
+            project_id=project_id,
+            member=user,
+            role=5
+        )
+        project_member.save()
\ No newline at end of file
diff --git a/apiserver/plane/api/views/project.py b/apiserver/plane/api/views/project.py
index 594329a44af..fe397e00c41 100644
--- a/apiserver/plane/api/views/project.py
+++ b/apiserver/plane/api/views/project.py
@@ -26,11 +26,100 @@
     ProjectMember,
     State,
     Workspace,
-    UserFavorite,
+    UserFavorite
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
 
+def create_project(slug, origin, user, serializer, request_data):
+
+        # Add the user as Administrator to the project
+        _ = ProjectMember.objects.create(
+            project_id=serializer.data["id"],
+            member=user,
+            role=20,
+        )
+        # Also create the issue property for the user
+        _ = IssueUserProperty.objects.create(
+            project_id=serializer.data["id"],
+            user=user,
+        )
+
+        if serializer.data["project_lead"] is not None and str(
+            serializer.data["project_lead"]
+        ) != str(user.id):
+            ProjectMember.objects.create(
+                project_id=serializer.data["id"],
+                member_id=serializer.data["project_lead"],
+                role=20,
+            )
+            # Also create the issue property for the user
+            IssueUserProperty.objects.create(
+                project_id=serializer.data["id"],
+                user_id=serializer.data["project_lead"],
+            )
+
+        # Default states
+        states = [
+            {
+                "name": "Backlog",
+                "color": "#A3A3A3",
+                "sequence": 15000,
+                "group": "backlog",
+                "default": True,
+            },
+            {
+                "name": "Todo",
+                "color": "#3A3A3A",
+                "sequence": 25000,
+                "group": "unstarted",
+            },
+            {
+                "name": "In Progress",
+                "color": "#F59E0B",
+                "sequence": 35000,
+                "group": "started",
+            },
+            {
+                "name": "Done",
+                "color": "#16A34A",
+                "sequence": 45000,
+                "group": "completed",
+            },
+            {
+                "name": "Cancelled",
+                "color": "#EF4444",
+                "sequence": 55000,
+                "group": "cancelled",
+            },
+        ]
+
+        State.objects.bulk_create(
+            [
+                State(
+                    name=state["name"],
+                    color=state["color"],
+                    project=serializer.instance,
+                    sequence=state["sequence"],
+                    workspace=serializer.instance.workspace,
+                    group=state["group"],
+                    default=state.get("default", False),
+                    created_by=user,
+                )
+                for state in states
+            ]
+        )
+        # Model activity
+        model_activity.delay(
+            model_name="project",
+            model_id=str(serializer.data["id"]),
+            requested_data=request_data,
+            current_instance=None,
+            actor_id=user.id,
+            slug=slug,
+            origin=origin,
+        )
+        return True
 
 class ProjectAPIEndpoint(BaseAPIView):
     """Project Endpoints to create, update, list, retrieve and delete endpoint"""
@@ -150,6 +239,7 @@ def get(self, request, slug, pk=None):
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
 
+
     def post(self, request, slug):
         try:
             workspace = Workspace.objects.get(slug=slug)
@@ -158,101 +248,16 @@ def post(self, request, slug):
             )
             if serializer.is_valid():
                 serializer.save()
-
-                # Add the user as Administrator to the project
-                _ = ProjectMember.objects.create(
-                    project_id=serializer.data["id"],
-                    member=request.user,
-                    role=20,
-                )
-                # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(
-                    project_id=serializer.data["id"],
-                    user=request.user,
-                )
-
-                if serializer.data["project_lead"] is not None and str(
-                    serializer.data["project_lead"]
-                ) != str(request.user.id):
-                    ProjectMember.objects.create(
-                        project_id=serializer.data["id"],
-                        member_id=serializer.data["project_lead"],
-                        role=20,
-                    )
-                    # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
-                        project_id=serializer.data["id"],
-                        user_id=serializer.data["project_lead"],
-                    )
-
-                # Default states
-                states = [
-                    {
-                        "name": "Backlog",
-                        "color": "#A3A3A3",
-                        "sequence": 15000,
-                        "group": "backlog",
-                        "default": True,
-                    },
-                    {
-                        "name": "Todo",
-                        "color": "#3A3A3A",
-                        "sequence": 25000,
-                        "group": "unstarted",
-                    },
-                    {
-                        "name": "In Progress",
-                        "color": "#F59E0B",
-                        "sequence": 35000,
-                        "group": "started",
-                    },
-                    {
-                        "name": "Done",
-                        "color": "#16A34A",
-                        "sequence": 45000,
-                        "group": "completed",
-                    },
-                    {
-                        "name": "Cancelled",
-                        "color": "#EF4444",
-                        "sequence": 55000,
-                        "group": "cancelled",
-                    },
-                ]
-
-                State.objects.bulk_create(
-                    [
-                        State(
-                            name=state["name"],
-                            color=state["color"],
-                            project=serializer.instance,
-                            sequence=state["sequence"],
-                            workspace=serializer.instance.workspace,
-                            group=state["group"],
-                            default=state.get("default", False),
-                            created_by=request.user,
-                        )
-                        for state in states
-                    ]
-                )
-
+                self.create_project(
+                    request.META.get("HTTP_ORIGIN"), 
+                    user, 
+                    serializer
+                ) 
                 project = (
                     self.get_queryset()
                     .filter(pk=serializer.data["id"])
                     .first()
                 )
-
-                # Model activity
-                model_activity.delay(
-                    model_name="project",
-                    model_id=str(project.id),
-                    requested_data=request.data,
-                    current_instance=None,
-                    actor_id=request.user.id,
-                    slug=slug,
-                    origin=request.META.get("HTTP_ORIGIN"),
-                )
-
                 serializer = ProjectSerializer(project)
                 return Response(
                     serializer.data, status=status.HTTP_201_CREATED
diff --git a/apiserver/plane/api/views/search.py b/apiserver/plane/api/views/search.py
new file mode 100644
index 00000000000..a463708be79
--- /dev/null
+++ b/apiserver/plane/api/views/search.py
@@ -0,0 +1,265 @@
+# Python imports
+import re
+
+# Django imports
+from django.db.models import Q, OuterRef, Subquery, Value, UUIDField, CharField
+from django.contrib.postgres.aggregates import ArrayAgg
+from django.contrib.postgres.fields import ArrayField
+from django.db.models.functions import Coalesce
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.app.permissions import ProjectBasePermission
+from plane.api.views.base import BaseAPIView
+from plane.db.models import (
+    Workspace,
+    Project,
+    Issue,
+    Cycle,
+    Module,
+    Page,
+    IssueView,
+    ProjectPage,
+)
+
+
+class GlobalSearchEndpoint(BaseAPIView):
+    """Endpoint to search across multiple fields in the workspace and
+    also show related workspace if found
+    """
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
+    def filter_workspaces(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+        return (
+            Workspace.objects.filter(
+                q, workspace_member__member=self.request.user
+            )
+            .distinct()
+            .values("name", "id", "slug")
+        )
+
+    def filter_projects(self, query, slug, project_id, workspace_search):
+        fields = ["name", "identifier"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+        return (
+            Project.objects.filter(
+                q,
+                project_projectmember__member=self.request.user,
+                project_projectmember__is_active=True,
+                archived_at__isnull=True,
+                workspace__slug=slug,
+            )
+            .distinct()
+            .values("name", "id", "identifier", "workspace__slug")
+        )
+
+    def filter_issues(self, query, slug, project_id, workspace_search):
+        fields = ["name", "sequence_id", "project__identifier"]
+        q = Q()
+        for field in fields:
+            if field == "sequence_id":
+                # Match whole integers only (exclude decimal numbers)
+                sequences = re.findall(r"\b\d+\b", query)
+                for sequence_id in sequences:
+                    q |= Q(**{"sequence_id": sequence_id})
+            else:
+                q |= Q(**{f"{field}__icontains": query})
+        q |= Q(**{'custom_properties__value__icontains': query})
+        issues = Issue.issue_objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            issues = issues.filter(project_id=project_id)
+
+        return issues.distinct().values(
+            "name",
+            "id",
+            "sequence_id",
+            "project__identifier",
+            "project_id",
+            "workspace__slug",
+        )[:100]
+
+    def filter_cycles(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        cycles = Cycle.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            cycles = cycles.filter(project_id=project_id)
+
+        return cycles.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def filter_modules(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        modules = Module.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            modules = modules.filter(project_id=project_id)
+
+        return modules.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def filter_pages(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        pages = (
+            Page.objects.filter(
+                q,
+                projects__project_projectmember__member=self.request.user,
+                projects__project_projectmember__is_active=True,
+                projects__archived_at__isnull=True,
+                workspace__slug=slug,
+            )
+            .annotate(
+                project_ids=Coalesce(
+                    ArrayAgg(
+                        "projects__id",
+                        distinct=True,
+                        filter=~Q(projects__id=True),
+                    ),
+                    Value([], output_field=ArrayField(UUIDField())),
+                ),
+            )
+            .annotate(
+                project_identifiers=Coalesce(
+                    ArrayAgg(
+                        "projects__identifier",
+                        distinct=True,
+                        filter=~Q(projects__id=True),
+                    ),
+                    Value([], output_field=ArrayField(CharField())),
+                ),
+            )
+        )
+
+        if workspace_search == "false" and project_id:
+            project_subquery = ProjectPage.objects.filter(
+                page_id=OuterRef("id"),
+                project_id=project_id,
+            ).values_list("project_id", flat=True)[:1]
+
+            pages = pages.annotate(
+                project_id=Subquery(project_subquery)
+            ).filter(project_id=project_id)
+
+        return pages.distinct().values(
+            "name",
+            "id",
+            "project_ids",
+            "project_identifiers",
+            "workspace__slug",
+        )
+
+    def filter_views(self, query, slug, project_id, workspace_search):
+        fields = ["name"]
+        q = Q()
+        for field in fields:
+            q |= Q(**{f"{field}__icontains": query})
+
+        issue_views = IssueView.objects.filter(
+            q,
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__archived_at__isnull=True,
+            workspace__slug=slug,
+        )
+
+        if workspace_search == "false" and project_id:
+            issue_views = issue_views.filter(project_id=project_id)
+
+        return issue_views.distinct().values(
+            "name",
+            "id",
+            "project_id",
+            "project__identifier",
+            "workspace__slug",
+        )
+
+    def get(self, request, slug):
+        query = request.query_params.get("search", False)
+        workspace_search = request.query_params.get(
+            "workspace_search", "false"
+        )
+        project_id = request.query_params.get("project_id", False)
+        if not query:
+            return Response(
+                {
+                    "results": {
+                        "workspace": [],
+                        "project": [],
+                        "issue": [],
+                        "cycle": [],
+                        "module": [],
+                        "issue_view": [],
+                        "page": [],
+                    }
+                },
+                status=status.HTTP_200_OK,
+            )
+
+        MODELS_MAPPER = {
+            # "workspace": self.filter_workspaces,
+            # "project": self.filter_projects,
+            "issue": self.filter_issues,
+            # "cycle": self.filter_cycles,
+            # "module": self.filter_modules,
+            # "issue_view": self.filter_views,
+            # "page": self.filter_pages,
+        }
+
+        results = {}
+
+        for model in MODELS_MAPPER.keys():
+            func = MODELS_MAPPER.get(model, None)
+            results[model] = func(query, slug, project_id, workspace_search)
+        return Response({"results": results}, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/permissions/project.py b/apiserver/plane/app/permissions/project.py
index 11eab008b6a..522c1bfde43 100644
--- a/apiserver/plane/app/permissions/project.py
+++ b/apiserver/plane/app/permissions/project.py
@@ -15,6 +15,8 @@ def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return WorkspaceMember.objects.filter(
@@ -44,10 +46,14 @@ def has_permission(self, request, view):
 
 class ProjectMemberPermission(BasePermission):
     def has_permission(self, request, view):
+        print("Project ID:: %s" %  view.project_id)
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         ## Safe Methods -> Handle the filtering logic in queryset
+        
         if request.method in SAFE_METHODS:
             return ProjectMember.objects.filter(
                 workspace__slug=view.workspace_slug,
@@ -64,6 +70,7 @@ def has_permission(self, request, view):
             ).exists()
 
         ## Only Project Admins can update project attributes
+        
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
@@ -78,6 +85,8 @@ def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
 
+        if request.user.is_superuser:
+            return True
         # Handle requests based on project__identifier
         if hasattr(view, "project__identifier") and view.project__identifier:
             if request.method in SAFE_METHODS:
@@ -111,6 +120,9 @@ class ProjectLitePermission(BasePermission):
     def has_permission(self, request, view):
         if request.user.is_anonymous:
             return False
+        
+        if request.user.is_superuser:
+            return True
 
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index d82ae432e9e..1d49fd255c1 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -397,6 +397,7 @@ def create(self, request, slug, project_id):
 
         if serializer.is_valid():
             serializer.save()
+            print(serializer.data)
 
             # Track the issue
             issue_activity.delay(
@@ -451,6 +452,7 @@ def create(self, request, slug, project_id):
                 .first()
             )
             datetime_fields = ["created_at", "updated_at"]
+            print(issue)
             issue = user_timezone_converter(
                 issue, datetime_fields, request.user.user_timezone
             )
diff --git a/apiserver/plane/authentication/adapter/base.py b/apiserver/plane/authentication/adapter/base.py
index 906d5570059..d6eb70f762a 100644
--- a/apiserver/plane/authentication/adapter/base.py
+++ b/apiserver/plane/authentication/adapter/base.py
@@ -149,7 +149,10 @@ def complete_login_or_signup(self):
             self.__check_signup(email)
 
             # Initialize user
-            user = User(email=email, username=uuid.uuid4().hex)
+            username = self.user_data.get("user").get("username")
+            if not username:
+                username = uuid.uuid4().hex
+            user = User(email=email, username=username)
 
             # Check if password is autoset
             if self.user_data.get("user").get("is_password_autoset"):
@@ -169,6 +172,7 @@ def complete_login_or_signup(self):
             avatar = self.user_data.get("user", {}).get("avatar", "")
             first_name = self.user_data.get("user", {}).get("first_name", "")
             last_name = self.user_data.get("user", {}).get("last_name", "")
+            
             user.avatar = avatar if avatar else ""
             user.first_name = first_name if first_name else ""
             user.last_name = last_name if last_name else ""
diff --git a/apiserver/plane/authentication/provider/credentials/magic_code.py b/apiserver/plane/authentication/provider/credentials/magic_code.py
index 418dd2a0625..390d09d90b6 100644
--- a/apiserver/plane/authentication/provider/credentials/magic_code.py
+++ b/apiserver/plane/authentication/provider/credentials/magic_code.py
@@ -44,12 +44,12 @@ def __init__(
             ]
         )
 
-        if not (EMAIL_HOST):
-            raise AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["SMTP_NOT_CONFIGURED"],
-                error_message="SMTP_NOT_CONFIGURED",
-                payload={"email": str(key)},
-            )
+        # if not (EMAIL_HOST):
+        #     raise AuthenticationException(
+        #         error_code=AUTHENTICATION_ERROR_CODES["SMTP_NOT_CONFIGURED"],
+        #         error_message="SMTP_NOT_CONFIGURED",
+        #         payload={"email": str(key)},
+        #     )
 
         if ENABLE_MAGIC_LINK_LOGIN == "0":
             raise AuthenticationException(
@@ -88,6 +88,7 @@ def initiate(self):
 
             if data["current_attempt"] > 2:
                 email = str(self.key).replace("magic_", "", 1)
+                username = email.replace ("@plane-shipsy.com", "", 1)
                 if User.objects.filter(email=email).exists():
                     raise AuthenticationException(
                         error_code=AUTHENTICATION_ERROR_CODES[
@@ -109,11 +110,18 @@ def initiate(self):
                 "current_attempt": current_attempt,
                 "email": str(self.key),
                 "token": token,
+                "username": username
             }
             expiry = 600
             ri.set(key, json.dumps(value), ex=expiry)
         else:
-            value = {"current_attempt": 0, "email": self.key, "token": token}
+            username = self.key.replace ("@plane-shipsy.com", "", 1)
+            value = {
+                "current_attempt": 0, 
+                "email": self.key, 
+                "token": token,
+                "username": username
+            }
             expiry = 600
 
             ri.set(key, json.dumps(value), ex=expiry)
@@ -125,12 +133,14 @@ def set_user_data(self):
             data = json.loads(ri.get(self.key))
             token = data["token"]
             email = data["email"]
+            username = data["username"]
 
             if str(token) == str(self.code):
                 super().set_user_data(
                     {
                         "email": email,
                         "user": {
+                            "username": username,
                             "avatar": "",
                             "first_name": "",
                             "last_name": "",
diff --git a/apiserver/plane/authentication/utils/redirection_path.py b/apiserver/plane/authentication/utils/redirection_path.py
index 62cc1f0194e..8aa55c7404d 100644
--- a/apiserver/plane/authentication/utils/redirection_path.py
+++ b/apiserver/plane/authentication/utils/redirection_path.py
@@ -6,8 +6,8 @@ def get_redirection_path(user):
     profile, _ = Profile.objects.get_or_create(user=user)
 
     # Redirect to onboarding if the user is not onboarded yet
-    if not profile.is_onboarded:
-        return "onboarding"
+    # if not profile.is_onboarded:
+    #     return "onboarding"
 
     # Redirect to the last workspace if the user has last workspace
     if (
diff --git a/apiserver/plane/authentication/views/app/magic.py b/apiserver/plane/authentication/views/app/magic.py
index 980eb4e7cc4..f8d351af835 100644
--- a/apiserver/plane/authentication/views/app/magic.py
+++ b/apiserver/plane/authentication/views/app/magic.py
@@ -24,19 +24,24 @@
 from plane.bgtasks.magic_link_code_task import magic_link
 from plane.license.models import Instance
 from plane.authentication.utils.host import base_host
-from plane.db.models import User, Profile
+from plane.db.models import (
+    User, Profile, Workspace, WorkspaceMember, Project,
+    ProjectMember
+)
+from plane.app.serializers import ProjectSerializer
+
 from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
 from plane.authentication.rate_limit import AuthenticationThrottle
+from plane.api.views.base import BaseAPIView
+from plane.api.views.project import create_project
 
-
-class MagicGenerateEndpoint(APIView):
-
-    permission_classes = [
-        AllowAny,
-    ]
+class MagicGenerateEndpoint(BaseAPIView):
+    # permission_classes = [
+    #     AllowAny,
+    # ]
 
     throttle_classes = [
         AuthenticationThrottle,
@@ -58,6 +63,11 @@ def post(self, request):
 
         origin = request.META.get("HTTP_ORIGIN", "/")
         email = request.data.get("email", False)
+        if not email:
+            username = request.data.get("username", False)
+            if username:
+                email = username + "@plane-shipsy.com"
+        print(email)
         try:
             # Clean up the email
             email = email.strip().lower()
@@ -66,7 +76,7 @@ def post(self, request):
             key, token = adapter.initiate()
             # If the smtp is configured send through here
             magic_link.delay(email, key, token, origin)
-            return Response({"key": str(key)}, status=status.HTTP_200_OK)
+            return Response({"key": str(key), "token": token}, status=status.HTTP_200_OK)
         except AuthenticationException as e:
             params = e.get_error_dict()
             return Response(
@@ -75,15 +85,110 @@ def post(self, request):
             )
 
 
-class MagicSignInEndpoint(View):
+class MagicSignInEndpoint(APIView):
+    permission_classes = [
+        AllowAny,
+    ]
+    throttle_classes = [
+        AuthenticationThrottle,
+    ]
+    def add_user_to_workspace(self, user, workspace_slug):
+        admin_user = User.objects.filter(is_superuser=True).first()
+        workspace, base_project = self.get_workspace(workspace_slug, admin_user)
+        print(workspace, base_project, user)
+        self.add_to_workspace(workspace, user)
+        self.add_to_project(base_project, user)
+        self.add_to_project(base_project, admin_user)
+        return workspace
+    
 
-    def post(self, request):
+    def add_to_workspace(self, workspace, user):
+        workspace_member = WorkspaceMember.objects.filter(
+            workspace=workspace, member=user
+        ).first()
+        if not workspace_member:
+            workspace_member = WorkspaceMember.objects.create(
+                workspace=workspace, member=user, is_active=True
+            )
+            try:
+                user.profile.last_workspace_id = workspace.id
+                user.profile.onboarding_step.update({
+                    'profile_complete': True,
+                    'workspace_join': True
+                })
+                user.profile.is_tour_completed = True
+                user.profile.is_onboarded = True
+                user.profile.company_name = workspace.name
+                user.profile.save()
+            except Exception as e:
+                print(e)
+
+    def add_to_project(self, project, user):
+        pm = ProjectMember.objects.filter(
+            member=user, 
+            project=project
+        )
+        if not pm.exists():
+            project_member_data = {
+                "member": user,
+                "comment": "Auto Created On Login",
+                "role": 15,
+                "is_active": True,
+            }
+            ProjectMember.objects.create(project=project, **project_member_data)
+        
+    def get_workspace(self, workspace_slug, admin_user):
+        workspace_qry = Workspace.objects.filter(
+            slug=workspace_slug
+        )
+        if workspace_qry.exists():
+            workspace = workspace_qry.first()
+        else:
+            workspace = Workspace.objects.create(
+                slug=workspace_slug,
+                name=workspace_slug,
+                owner_id=admin_user.id
+            )
+        project = self.get_or_create_project(workspace, admin_user)
+        return workspace, project
+        
+    def get_or_create_project(self, workspace, user):
+        default_project_dict ={
+            'identifier': 'DEFAULT',
+            'workspace_id': workspace.id,
+            'name': 'default'
+        }
+        project = Project.objects.filter(**default_project_dict).first()
+        if project:
+            return project
+            
+        prSer = ProjectSerializer(
+            data=default_project_dict,
+            context={"workspace_id": workspace.id}
+        )
+        prSer.is_valid()
+        if prSer.errors:
+            raise Exception(prSer.errors)
+        
+        prSer.save()
+        create_project(
+            workspace.slug,
+            '', 
+            user, 
+            prSer,
+            prSer.validated_data
+        )
+        return prSer.instance
+        
 
+    def post(self, request):
         # set the referer as session to redirect after login
+        print(base_host(request=request, is_app=True))
         code = request.POST.get("code", "").strip()
         email = request.POST.get("email", "").strip().lower()
+        app_url = request.POST.get("app_url", "").strip().lower()
+        workspace = request.POST.get("workspace", "").strip().lower()
         next_path = request.POST.get("next_path")
-
         if code == "" or email == "":
             exc = AuthenticationException(
                 error_code=AUTHENTICATION_ERROR_CODES[
@@ -101,64 +206,85 @@ def post(self, request):
             return HttpResponseRedirect(url)
 
         # Existing User
-        existing_user = User.objects.filter(email=email).first()
-
-        if not existing_user:
-            exc = AuthenticationException(
-                error_code=AUTHENTICATION_ERROR_CODES["USER_DOES_NOT_EXIST"],
-                error_message="USER_DOES_NOT_EXIST",
-            )
-            params = exc.get_error_dict()
-            if next_path:
-                params["next_path"] = str(next_path)
-            url = urljoin(
-                base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
-            )
-            return HttpResponseRedirect(url)
-
         try:
-            provider = MagicCodeProvider(
-                request=request,
-                key=f"magic_{email}",
-                code=code,
-                callback=post_user_auth_workflow,
-            )
-            user = provider.authenticate()
-            profile, _ = Profile.objects.get_or_create(user=user)
-            # Login the user and record his device info
-            user_login(request=request, user=user, is_app=True)
-            if user.is_password_autoset and profile.is_onboarded:
-                path = "accounts/set-password"
-            else:
+            existing_user = User.objects.filter(email=email).first()
+            if not existing_user:
+                provider = MagicCodeProvider(
+                    request=request,
+                    key=f"magic_{email}",
+                    code=code,
+                    callback=post_user_auth_workflow,
+                )
+                user = provider.authenticate()
+                # Login the user and record his device info
+                user_login(request=request, user=user, is_app=True)
+                self.add_user_to_workspace(user, workspace)
                 # Get the redirection path
-                path = (
-                    str(next_path)
-                    if next_path
-                    else str(get_redirection_path(user=user))
+                if next_path:
+                    path = str(next_path)
+                else:
+                    path = get_redirection_path(user=user)
+                # redirect to referer path
+                url = urljoin(base_host(request=request, is_app=True), path)
+                if app_url:
+                    url = urljoin(app_url, path)
+                return HttpResponseRedirect(url)
+            else:
+                provider = MagicCodeProvider(
+                    request=request,
+                    key=f"magic_{email}",
+                    code=code,
+                    callback=post_user_auth_workflow,
                 )
-            # redirect to referer path
-            url = urljoin(base_host(request=request, is_app=True), path)
-            return HttpResponseRedirect(url)
+                user = provider.authenticate()
+                profile, _ = Profile.objects.get_or_create(user=user)
+                # Login the user and record his device info
+                self.add_user_to_workspace(user, workspace)
+                user_login(request=request, user=user, is_app=True)
+                if user.is_password_autoset and profile.is_onboarded:
+                    path = "accounts/set-password"
+                else:
+                    # Get the redirection path
+                    path = (
+                        str(next_path)
+                        if next_path
+                        else "/" + workspace
+                    )
+                # redirect to referer path
+                url = urljoin(base_host(request=request, is_app=True), path)
+                if app_url:
+                    url = urljoin(app_url, path)
+                
+                return HttpResponseRedirect(url)
 
         except AuthenticationException as e:
             params = e.get_error_dict()
+            print(params)
             if next_path:
                 params["next_path"] = str(next_path)
+            path = "sign-in?" + urlencode(params)
             url = urljoin(
                 base_host(request=request, is_app=True),
-                "sign-in?" + urlencode(params),
+                path
             )
+            if app_url:
+                url = urljoin(app_url, path)
             return HttpResponseRedirect(url)
 
 
-class MagicSignUpEndpoint(View):
-
+class MagicSignUpEndpoint(APIView):
+    permission_classes = [
+        AllowAny,
+    ]
+    throttle_classes = [
+        AuthenticationThrottle,
+    ]
     def post(self, request):
 
         # set the referer as session to redirect after login
         code = request.POST.get("code", "").strip()
         email = request.POST.get("email", "").strip().lower()
+        is_app = request.POST.get("is_app", False)
         next_path = request.POST.get("next_path")
 
         if code == "" or email == "":
diff --git a/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py b/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py
new file mode 100644
index 00000000000..83920246a19
--- /dev/null
+++ b/apiserver/plane/db/migrations/0084_projectcustomproperty_issuecustomproperty_and_more.py
@@ -0,0 +1,69 @@
+# Generated by Django 4.2.16 on 2024-11-11 08:00
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0083_device_workspace_timezone_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProjectCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('value', models.JSONField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Project Custom Property',
+                'verbose_name_plural': 'Project Custom Properties',
+                'db_table': 'project_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.CreateModel(
+            name='IssueCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('key', models.CharField(max_length=255)),
+                ('value', models.JSONField(default=dict)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_properties', to='db.issue')),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
+                ('project_custom_property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_custom_properties', to='db.projectcustomproperty')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
+            ],
+            options={
+                'verbose_name': 'Issue Custom Property',
+                'verbose_name_plural': 'Issue Custom Properties',
+                'db_table': 'issue_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.AddConstraint(
+            model_name='projectcustomproperty',
+            constraint=models.UniqueConstraint(condition=models.Q(('deleted_at__isnull', True)), fields=('project', 'name'), name='project_custom_property_unique_project_name_when_deleted_at_null'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='projectcustomproperty',
+            unique_together={('project', 'name', 'deleted_at')},
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py b/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py
new file mode 100644
index 00000000000..040a6944f7f
--- /dev/null
+++ b/apiserver/plane/db/migrations/0085_remove_issuecustomproperty_project_custom_property_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.16 on 2024-11-13 11:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0084_projectcustomproperty_issuecustomproperty_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='issuecustomproperty',
+            name='project_custom_property',
+        ),
+        migrations.AddField(
+            model_name='projectcustomproperty',
+            name='issue_type',
+            field=models.ManyToManyField(related_name='custom_propery_issue_type', to='db.issuetype'),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py b/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py
new file mode 100644
index 00000000000..e58376f039c
--- /dev/null
+++ b/apiserver/plane/db/migrations/0086_issuetypecustomproperty_delete_projectcustomproperty_and_more.py
@@ -0,0 +1,48 @@
+# Generated by Django 4.2.16 on 2024-11-14 07:53
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0085_remove_issuecustomproperty_project_custom_property_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IssueTypeCustomProperty',
+            fields=[
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
+                ('deleted_at', models.DateTimeField(blank=True, null=True, verbose_name='Deleted At')),
+                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('name', models.CharField(max_length=255)),
+                ('value', models.JSONField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
+                ('issue_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_propery_issue_type', to='db.issuetype')),
+                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
+            ],
+            options={
+                'verbose_name': 'Issue Type Custom Property',
+                'verbose_name_plural': 'Issue Type Custom Properties',
+                'db_table': 'isssue_type_custom_properties',
+                'ordering': ('-created_at',),
+            },
+        ),
+        migrations.DeleteModel(
+            name='ProjectCustomProperty',
+        ),
+        migrations.AddConstraint(
+            model_name='issuetypecustomproperty',
+            constraint=models.UniqueConstraint(condition=models.Q(('deleted_at__isnull', True)), fields=('issue_type', 'name'), name='issue_type_custom_property_unique_type_name_when_deleted_at_null'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='issuetypecustomproperty',
+            unique_together={('issue_type', 'name', 'deleted_at')},
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py b/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py
new file mode 100644
index 00000000000..2351c48f201
--- /dev/null
+++ b/apiserver/plane/db/migrations/0087_issuecustomproperty_issue_type_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.16 on 2024-11-14 09:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0086_issuetypecustomproperty_delete_projectcustomproperty_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issuecustomproperty',
+            name='issue_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='custom_issue_type', to='db.issuetype'),
+        ),
+        migrations.AlterField(
+            model_name='issuecustomproperty',
+            name='value',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py b/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py
new file mode 100644
index 00000000000..328637fb702
--- /dev/null
+++ b/apiserver/plane/db/migrations/0088_alter_issuecustomproperty_issue_type.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0087_issuecustomproperty_issue_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='issuecustomproperty',
+            name='issue_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issue_type_custom_property', to='db.issuetypecustomproperty'),
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py b/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py
new file mode 100644
index 00000000000..51e8b36ea77
--- /dev/null
+++ b/apiserver/plane/db/migrations/0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0088_alter_issuecustomproperty_issue_type'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='issuecustomproperty',
+            old_name='issue_type',
+            new_name='issue_type_custom_proerty',
+        ),
+    ]
diff --git a/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py b/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py
new file mode 100644
index 00000000000..aafaa9deefb
--- /dev/null
+++ b/apiserver/plane/db/migrations/0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-11-14 10:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0089_rename_issue_type_issuecustomproperty_issue_type_custom_proerty'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='issuecustomproperty',
+            old_name='issue_type_custom_proerty',
+            new_name='issue_type_custom_property',
+        ),
+    ]
diff --git a/apiserver/plane/db/models/__init__.py b/apiserver/plane/db/models/__init__.py
index dd91a4b1d39..8b2a050a0a1 100644
--- a/apiserver/plane/db/models/__init__.py
+++ b/apiserver/plane/db/models/__init__.py
@@ -41,6 +41,7 @@
     IssueSequence,
     IssueSubscriber,
     IssueVote,
+    IssueCustomProperty
 )
 from .module import (
     Module,
@@ -67,7 +68,7 @@
     ProjectIdentifier,
     ProjectMember,
     ProjectMemberInvite,
-    ProjectPublicMember,
+    ProjectPublicMember
 )
 from .deploy_board import DeployBoard
 from .session import Session
@@ -111,7 +112,7 @@
 
 from .favorite import UserFavorite
 
-from .issue_type import IssueType
+from .issue_type import IssueType, IssueTypeCustomProperty
 
 from .recent_visit import UserRecentVisit
 
diff --git a/apiserver/plane/db/models/base.py b/apiserver/plane/db/models/base.py
index 63c08afa49a..2994104f50c 100644
--- a/apiserver/plane/db/models/base.py
+++ b/apiserver/plane/db/models/base.py
@@ -33,7 +33,9 @@ def save(self, *args, **kwargs):
             # Check if the model is being created or updated
             if self._state.adding:
                 # If created only set created_by value: set updated_by to None
-                self.created_by = user
+                if self.created_by is None:
+                    self.created_by = user
+                    
                 self.updated_by = None
             # If updated only set updated_by value don't touch created_by
             self.updated_by = user
@@ -41,3 +43,6 @@ def save(self, *args, **kwargs):
 
     def __str__(self):
         return str(self.id)
+
+
+    
\ No newline at end of file
diff --git a/apiserver/plane/db/models/issue.py b/apiserver/plane/db/models/issue.py
index 6360d1fa3aa..d154a4fc881 100644
--- a/apiserver/plane/db/models/issue.py
+++ b/apiserver/plane/db/models/issue.py
@@ -709,3 +709,27 @@ class Meta:
 
     def __str__(self):
         return f"{self.issue.name} {self.actor.email}"
+
+
+class IssueCustomProperty(ProjectBaseModel):
+    issue = models.ForeignKey(
+        Issue, on_delete=models.CASCADE, related_name="custom_properties"
+    )
+    key = models.CharField(max_length=255)
+    value = models.CharField(max_length=255, null=True, blank=True)
+    issue_type_custom_property = models.ForeignKey(
+        "db.IssueTypeCustomProperty",
+        on_delete=models.SET_NULL,
+        related_name="issue_type_custom_property",
+        null=True,
+        blank=True,
+    )
+    
+    class Meta:
+        verbose_name = "Issue Custom Property"
+        verbose_name_plural = "Issue Custom Properties"
+        db_table = "issue_custom_properties"
+        ordering = ("-created_at",)
+
+    def __str__(self):
+        return f"{self.issue.name} {self.key}"
\ No newline at end of file
diff --git a/apiserver/plane/db/models/issue_type.py b/apiserver/plane/db/models/issue_type.py
index e6e409c84db..619fb8cfd0d 100644
--- a/apiserver/plane/db/models/issue_type.py
+++ b/apiserver/plane/db/models/issue_type.py
@@ -57,3 +57,27 @@ class Meta:
 
     def __str__(self):
         return f"{self.project} - {self.issue_type}"
+
+
+class IssueTypeCustomProperty(BaseModel):
+    name = models.CharField(max_length=255)
+    value = models.JSONField()
+    is_active = models.BooleanField(default=True)
+    issue_type = models.ForeignKey(
+        "db.IssueType",
+        on_delete=models.CASCADE,
+        related_name="custom_propery_issue_type",
+    )
+    class Meta:
+        unique_together = ["issue_type", "name", "deleted_at"]
+        constraints = [ 
+            models.UniqueConstraint(
+                fields=["issue_type", "name"],
+                condition=models.Q(deleted_at__isnull=True),
+                name="issue_type_custom_property_unique_type_name_when_deleted_at_null",
+            )
+        ]
+        verbose_name = "Issue Type Custom Property"
+        verbose_name_plural = "Issue Type Custom Properties"
+        db_table = "isssue_type_custom_properties"
+        ordering = ("-created_at",)
\ No newline at end of file
diff --git a/apiserver/plane/middleware/api_log_middleware.py b/apiserver/plane/middleware/api_log_middleware.py
index 96c62c2fd9d..95fa572e9ae 100644
--- a/apiserver/plane/middleware/api_log_middleware.py
+++ b/apiserver/plane/middleware/api_log_middleware.py
@@ -1,4 +1,5 @@
 from plane.db.models import APIActivityLog
+from django.urls import resolve
 
 
 class APITokenLogMiddleware:
@@ -8,9 +9,42 @@ def __init__(self, get_response):
     def __call__(self, request):
         request_body = request.body
         response = self.get_response(request)
+        rewriten_path = self.project_rewiter(request)
+        request.path = rewriten_path
+        request.path_info = rewriten_path
+        resolver_match = resolve(request.path_info)
+        request.resolver_match = resolver_match  # Update resolver_match with the new path_info
+        request.kwargs = resolver_match.kwargs 
+        # print(request.__dict__)
         self.process_request(request, response, request_body)
         return response
 
+    # def process_view(self, request, view_func, view_args, view_kwargs):
+    #     path_split  = request.path.split('/')
+    #     print(len(path_split))
+    #     if len(path_split) <= 6:
+    #         return request.path
+    #     if request.path.split('/')[6] == 'DEFAULT':
+    #         path_parts = request.path.split('/')
+    #         view_kwargs['project_id'] = '9f54ba83-aa85-43ce-9ce6-b2968f066e85'
+            
+        
+        return request.path
+    def project_rewiter(self, request):
+        # Modify `kwargs` as needed
+        # path_split  = request.path.split('/')
+        # print(len(path_split))
+        # if len(path_split) <= 6:
+        #     return request.path
+        # if request.path.split('/')[6] == 'DEFAULT':
+        #     path_parts = request.path.split('/')
+        #     path_parts[6] = 'dab178af-a6bb-4bfb-a0a8-ae8fd702b587'
+        #     return '/'.join(path_parts)
+        
+        return request.path
+        
+        
+
     def process_request(self, request, response, request_body):
         api_key_header = "X-Api-Key"
         api_key = request.headers.get(api_key_header)
diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py
index 1b878e6b8d6..11666ff40a1 100644
--- a/apiserver/plane/settings/common.py
+++ b/apiserver/plane/settings/common.py
@@ -25,10 +25,14 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.instrumentation.django import DjangoInstrumentor
+from dotenv import load_dotenv
 
+# Load environment variables from .env file if it exists
 
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+print(f"BASE_DIR: {BASE_DIR}")
+load_dotenv(os.path.join(BASE_DIR, "file.env"))
 # Secret Key
 SECRET_KEY = os.environ.get("SECRET_KEY", get_random_secret_key())
 
@@ -181,6 +185,8 @@
 
 # Redis Config
 REDIS_URL = os.environ.get("REDIS_URL")
+for key, value in os.environ.items():
+    print(f"Env Variable {key}: {value}")
 REDIS_SSL = REDIS_URL and "rediss" in REDIS_URL
 
 if REDIS_SSL:
@@ -266,7 +272,7 @@
 AWS_REGION = os.environ.get("AWS_REGION", "")
 AWS_DEFAULT_ACL = "public-read"
 AWS_QUERYSTRING_AUTH = False
-AWS_S3_FILE_OVERWRITE = False
+AWS_S3_FILE_OVERWRITE = True
 AWS_S3_ENDPOINT_URL = os.environ.get(
     "AWS_S3_ENDPOINT_URL", None
 ) or os.environ.get("MINIO_ENDPOINT_URL", None)
@@ -381,7 +387,7 @@
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
 APP_BASE_URL = os.environ.get("APP_BASE_URL")
-
+STATIC_API_TOKEN = os.environ.get("STATIC_API_TOKEN", "TEST_API_TOKEN")
 HARD_DELETE_AFTER_DAYS = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 60))
 
 # Instance Changelog URL
diff --git a/apiserver/plane/settings/redis.py b/apiserver/plane/settings/redis.py
index 628a3d8e63b..a95a44e3134 100644
--- a/apiserver/plane/settings/redis.py
+++ b/apiserver/plane/settings/redis.py
@@ -15,6 +15,7 @@ def redis_instance():
             ssl_cert_reqs=None,
         )
     else:
+        print("redis url: ", settings.REDIS_URL)
         ri = redis.Redis.from_url(settings.REDIS_URL, db=0)
 
     return ri
diff --git a/apiserver/plane/settings/storage.py b/apiserver/plane/settings/storage.py
index ac99077f312..445bd4c20b8 100644
--- a/apiserver/plane/settings/storage.py
+++ b/apiserver/plane/settings/storage.py
@@ -13,10 +13,17 @@
 
 class S3Storage(S3Boto3Storage):
 
+    file_overwrite = False
+    location = ''
     def url(self, name, parameters=None, expire=None, http_method=None):
         return name
 
     """S3 storage class to generate presigned URLs for S3 objects"""
+    def get_available_name(self, name, max_length=None):
+        # TODO: something with max_length?
+        if self.file_overwrite:
+            return name
+        return super().get_available_name(name, max_length=max_length)
 
     def __init__(self, request=None):
         # Get the AWS credentials and bucket name from the environment
diff --git a/apiserver/plane/utils/issue_filters.py b/apiserver/plane/utils/issue_filters.py
index b82ba1e8c75..2826dece7b6 100644
--- a/apiserver/plane/utils/issue_filters.py
+++ b/apiserver/plane/utils/issue_filters.py
@@ -3,6 +3,7 @@
 from datetime import timedelta
 
 from django.utils import timezone
+from django.db.models import Q
 
 # The date from pattern
 pattern = re.compile(r"\d+_(weeks|months)$")
@@ -538,6 +539,26 @@ def filter_logged_by(params, issue_filter, method, prefix=""):
     return issue_filter
 
 
+def filter_custom_properties(params, issue_filter, method, prefix=""):
+    if method == "GET":
+        custom_properties = [
+            item
+            for item in params.get("custom_properties").split(",")
+            if item != "null"
+        ]
+        query = Q()
+        for row in custom_properties:
+            key, value = row.split(":")
+            query &= Q(
+                Q(custom_properties__project_custom_property_id=key) &
+                Q(custom_properties__value=value)
+            )
+        
+        issue_filter['base'] = query
+        
+    print(issue_filter)
+    return issue_filter
+
 def issue_filters(query_params, method, prefix=""):
     issue_filter = {}
 
@@ -566,6 +587,7 @@ def issue_filters(query_params, method, prefix=""):
         "sub_issue": filter_sub_issue_toggle,
         "subscriber": filter_subscribed_issues,
         "start_target_date": filter_start_target_date_issues,
+        "custom_properties": filter_custom_properties,
     }
 
     for key, value in ISSUE_FILTER.items():
diff --git a/apiserver/requirements/base.txt b/apiserver/requirements/base.txt
index fbe6680d43f..7b9d7ffe4fc 100644
--- a/apiserver/requirements/base.txt
+++ b/apiserver/requirements/base.txt
@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.16
+Django==4.2.14
 # rest framework
 djangorestframework==3.15.2
 # postgres 
@@ -10,6 +10,7 @@ psycopg-binary==3.1.18
 psycopg-c==3.1.18
 dj-database-url==2.1.0
 # redis
+python-dotenv==1.0.0
 redis==5.0.4
 django-redis==5.4.0
 # cors
@@ -29,7 +30,7 @@ jsonmodels==2.7.0
 # sentry
 sentry-sdk==2.8.0
 # storage
-django-storages==1.14.2
+django-storages==1.14.4
 # user management
 django-crum==0.7.9
 # web server
diff --git a/demo.Jenkinsfile b/demo.Jenkinsfile
new file mode 100644
index 00000000000..93f250ff14b
--- /dev/null
+++ b/demo.Jenkinsfile
@@ -0,0 +1,238 @@
+@Library('jenkins-library@master') _
+
+// define vault configuration
+def configuration = [
+    engineVersion: 2, 
+    timeout: 60,
+    vaultCredentialId: 'jenkins-app-role', 
+    vaultUrl: 'https://vault.secrets.shipsy.in'
+]
+
+// Project Level Configurations
+def repository = "plane"
+def projectEnv = "demo"
+
+// Config Based configurations
+def vaultConfigFilesMap = [
+    "CONFIG" : "config.json",
+]
+def configStoragePath = "config-files"
+
+// Validation Level Configurations
+List<String> configFilesList = []
+vaultConfigFilesMap.each { envVariable, configFileName ->
+    configFilesList.add("${configStoragePath}/${configFileName}")
+}
+
+// Docker Based Configurations
+def awsRegion = "us-west-2"
+def dockerBuildLevelArguments = [
+    ENV_FILE_PATH: "${configStoragePath}/.env"
+]
+
+def webImageName = "plane-frontend:latest"
+def adminImageName = "plane-adminpanel:latest"
+def apiImageName = "plane-apiserver:latest"
+
+// ECS Based Configurations
+def clusterName = "demo-applications-fargate"
+
+// def mainServiceName = "demo-n8n"
+// def workerServiceName = "demo-n8n-worker"
+// def webhookServiceName = "demo-n8n-webhook"
+def apiServiceName = "demo-plane-apiserver"
+def celeryServiceName  = "demo-plane-celery"
+def cbeatServiceName  = "demo-plane-celery-beat"
+def frontEndServiceName  = "demo-plane-frontend"
+def adminPanelServiceName  = "demo-plane-admin-panel"
+
+pipeline {
+    agent any
+
+    stages {
+        // stage ("Send Build started message") {
+        //     steps{
+        //         sendSlackMessage (
+        //             messageType: "start",
+        //             slackEnvironment: "demo"
+        //         )
+        //     }
+        // }
+
+        stage ("Generate configs from vault") {
+            steps {
+                // define vault secret path and env var
+                script {
+                    def secret = [
+                        [
+                        path: "${repository}/${projectEnv}", 
+                        secretValues: [
+                                [envVar: 'CONFIG', vaultKey: 'config.json']
+                            ]
+                        ]
+                    ]
+                    // sh "echo ${secret}"
+                    withVault(configuration: configuration, vaultSecrets: secret) {
+                        sh """
+                            set +x
+                            echo "Vault CONFIG: \${CONFIG}"   # Debugging, remove in production
+                            pwd
+                            mkdir -p apiserver/${configStoragePath}
+                            echo "\${CONFIG}" > apiserver/${configStoragePath}/.env
+                        """
+
+                        // Debugging: Show the contents of the .env file (optional for development only)
+                        sh "cat apiserver/${configStoragePath}/.env"
+
+                        // Verify the file has been created
+                        sh "ls -l apiserver/${configStoragePath}/.env"
+                    }
+                }
+            }
+        }
+        stage ("Build docker image") {
+            parallel {
+                stage ("Build Web Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : webImageName,
+                            directoryPath : ".",
+                            dockerfilePath : "web/Dockerfile.web"
+                        )
+                    }
+                }
+                stage ("Build Admin Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : adminImageName,
+                            directoryPath : ".",
+                            dockerfilePath : "admin/Dockerfile.admin"
+                        )
+                    }
+                }
+                stage ("Build API Image") {
+                    steps {
+                        buildDockerImage (
+                            awsRegion : awsRegion,
+                            dockerBuildArgs : dockerBuildLevelArguments,
+                            imageName : apiImageName,
+                            directoryPath : "apiserver",
+                            dockerfilePath : "apiserver/Dockerfile.api"
+                        )
+                    }
+                }
+            }
+        }
+
+        stage("Push to registry") {
+            parallel {
+                stage ("Push Web Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : webImageName
+                        )
+                    }
+                }
+                stage ("Push Admin Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : adminImageName
+                        )
+                    }
+                }
+                stage ("Push API Image") {
+                    steps {
+                        pushDockerImage (
+                            awsRegion : awsRegion,
+                            imageName : apiImageName
+                        )
+                    }
+                }
+            }
+        }
+
+        stage("Deploy Plane") {
+            parallel {
+                stage("Deploy Frontend") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : webImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : frontEndServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+
+                stage("Deploy Admin") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : adminImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : adminPanelServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+
+                stage("Deploy API") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : apiServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+                stage("Deploy Celery") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : celeryServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+                stage("Deploy Beat") {
+                    steps {
+                        script {
+                            deployServiceOnECS (
+                                awsRegion : awsRegion,
+                                imageName : apiImageName,
+                                ecsClusterName : clusterName,
+                                ecsServiceName : cbeatServiceName,
+                                timeout : 300
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+    post {
+        always {
+            sendSlackMessage (
+                messageType: "post",
+                slackEnvironment: "prod"
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 392c55a113e..067aaead89e 100644
--- a/docker-compose-local.yml
+++ b/docker-compose-local.yml
@@ -7,20 +7,6 @@ services:
     volumes:
       - redisdata:/data
 
-  plane-mq:
-    image: rabbitmq:3.13.6-management-alpine
-    restart: unless-stopped
-    networks:
-      - dev_env
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-    env_file:
-      - .env
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
-      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
-
   plane-minio:
     image: minio/minio
     restart: unless-stopped
@@ -47,6 +33,8 @@ services:
       - .env
     environment:
       PGDATA: /var/lib/postgresql/data
+    ports:
+      - 5432:5432
 
   web:
     build:
@@ -122,6 +110,8 @@ services:
     depends_on:
       - plane-db
       - plane-redis
+    stdin_open: true
+    tty: true
 
   worker:
     build:
diff --git a/web/Dockerfile.web b/web/Dockerfile.web
index d7d924d7a47..8cbfd75a276 100644
--- a/web/Dockerfile.web
+++ b/web/Dockerfile.web
@@ -71,7 +71,7 @@ COPY --from=installer /app/web/package.json .
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=installer /app/web/.next/standalone ./
-COPY --from=installer /app/web/.next ./web/.next
+COPY --from=installer /app/web/.next ./.next
 COPY --from=installer /app/web/public ./web/public
 
 ARG NEXT_PUBLIC_API_BASE_URL=""
@@ -101,4 +101,7 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
+
 EXPOSE 3000
+
+CMD node web/server.js web
diff --git a/web/ce/constants/project/settings/features.tsx b/web/ce/constants/project/settings/features.tsx
index b9b39700d68..eb1a0326d88 100644
--- a/web/ce/constants/project/settings/features.tsx
+++ b/web/ce/constants/project/settings/features.tsx
@@ -84,8 +84,8 @@ export const PROJECT_FEATURES_LIST: TProjectFeatures = {
         title: "Time Tracking",
         description: "Log time, see timesheets, and download full CSVs for your entire workspace.",
         icon: <Timer className="h-5 w-5 flex-shrink-0 text-custom-text-300" />,
-        isPro: true,
-        isEnabled: false,
+        isPro: false,
+        isEnabled: true,
       },
     },
   },
diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsx
index a60a7d7e1b1..15d2a079df7 100644
--- a/web/core/components/workspace/sidebar/dropdown.tsx
+++ b/web/core/components/workspace/sidebar/dropdown.tsx
@@ -205,15 +205,6 @@ export const SidebarDropdown = observer(() => {
                     )}
                   </div>
                   <div className="w-full flex flex-col items-start justify-start gap-2 px-4 py-2 text-sm">
-                    <Link href="/create-workspace" className="w-full">
-                      <Menu.Item
-                        as="div"
-                        className="flex items-center gap-2 rounded px-2 py-1 text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80"
-                      >
-                        <PlusSquare strokeWidth={1.75} className="h-4 w-4 flex-shrink-0" />
-                        Create workspace
-                      </Menu.Item>
-                    </Link>
                     {userLinks(workspaceSlug?.toString() ?? "").map(
                       (link, index) =>
                         allowPermissions(link.access, EUserPermissionsLevel.WORKSPACE) && (
diff --git a/web/core/components/workspace/sidebar/help-section.tsx b/web/core/components/workspace/sidebar/help-section.tsx
index 5570b5727a0..419121e7460 100644
--- a/web/core/components/workspace/sidebar/help-section.tsx
+++ b/web/core/components/workspace/sidebar/help-section.tsx
@@ -52,114 +52,7 @@ export const SidebarHelpSection: React.FC<WorkspaceHelpSectionProps> = observer(
           }
         )}
       >
-        <div
-          className={`relative flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-evenly"}`}
-        >
-          <CustomMenu
-            customButton={
-              <button
-                type="button"
-                className={cn(
-                  "grid place-items-center rounded-md p-1 outline-none text-custom-text-200 hover:text-custom-text-100 hover:bg-custom-background-90",
-                  {
-                    "bg-custom-background-90": isNeedHelpOpen,
-                  }
-                )}
-              >
-                <Tooltip tooltipContent="Help" isMobile={isMobile} disabled={isNeedHelpOpen}>
-                  <HelpCircle className="h-[18px] w-[18px] outline-none" />
-                </Tooltip>
-              </button>
-            }
-            customButtonClassName={`relative grid place-items-center rounded-md p-1.5 outline-none ${isCollapsed ? "w-full" : ""}`}
-            menuButtonOnClick={() => !isNeedHelpOpen && setIsNeedHelpOpen(true)}
-            onMenuClose={() => setIsNeedHelpOpen(false)}
-            placement={isCollapsed ? "left-end" : "top-end"}
-            maxHeight="lg"
-            closeOnSelect
-          >
-            <CustomMenu.MenuItem>
-              <a
-                href="https://go.plane.so/p-docs"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <FileText className="h-3.5 w-3.5 text-custom-text-200" size={14} />
-                <span className="text-xs">Documentation</span>
-              </a>
-            </CustomMenu.MenuItem>
-            {config?.intercom_app_id && config?.is_intercom_enabled && (
-              <CustomMenu.MenuItem>
-                <button
-                  type="button"
-                  onClick={handleCrispWindowShow}
-                  className="flex w-full items-center gap-x-2 rounded text-xs hover:bg-custom-background-80"
-                >
-                  <MessagesSquare className="h-3.5 w-3.5 text-custom-text-200" />
-                  <span className="text-xs">Message support</span>
-                </button>
-              </CustomMenu.MenuItem>
-            )}
-            <CustomMenu.MenuItem>
-              <a
-                href="mailto:sales@plane.so"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <User className="h-3.5 w-3.5 text-custom-text-200" size={14} />
-                <span className="text-xs">Contact sales</span>
-              </a>
-            </CustomMenu.MenuItem>
-            <div className="my-1 border-t border-custom-border-200" />
-            {ENABLE_LOCAL_DB_CACHE && (
-              <CustomMenu.MenuItem>
-                <div
-                  onClick={(e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  }}
-                  className="flex w-full items-center justify-between text-xs hover:bg-custom-background-80"
-                >
-                  <span className="racking-tight">Local Cache</span>
-                  <ToggleSwitch
-                    value={canUseLocalDB}
-                    onChange={() => toggleLocalDB(workspaceSlug?.toString(), projectId?.toString())}
-                  />
-                </div>
-              </CustomMenu.MenuItem>
-            )}
-            <CustomMenu.MenuItem>
-              <button
-                type="button"
-                onClick={() => toggleShortcutModal(true)}
-                className="flex w-full items-center justify-start text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">Keyboard shortcuts</span>
-              </button>
-            </CustomMenu.MenuItem>
-            <CustomMenu.MenuItem>
-              <button
-                type="button"
-                onClick={() => setIsChangeLogOpen(true)}
-                className="flex w-full items-center justify-start text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">What&apos;s new</span>
-              </button>
-            </CustomMenu.MenuItem>
-            <CustomMenu.MenuItem>
-              <a
-                href="https://go.plane.so/p-discord"
-                target="_blank"
-                className="flex items-center justify- gap-x-2 rounded text-xs hover:bg-custom-background-80"
-              >
-                <span className="text-xs">Discord</span>
-              </a>
-            </CustomMenu.MenuItem>
-            <div className="px-1 pt-2 mt-1 text-xs text-custom-text-200 border-t border-custom-border-200">
-              <PlaneVersionNumber />
-            </div>
-          </CustomMenu>
-        </div>
+        
         <div
           className={cn("w-full flex-grow px-0.5", {
             hidden: isCollapsed,
diff --git a/web/core/constants/dashboard.ts b/web/core/constants/dashboard.ts
index 3cfdec0e287..88f59b4714a 100644
--- a/web/core/constants/dashboard.ts
+++ b/web/core/constants/dashboard.ts
@@ -258,14 +258,14 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
   highlight: (pathname: string, baseUrl: string) => boolean;
   Icon: React.FC<Props>;
 }[] = [
-  {
-    key: "projects",
-    label: "Projects",
-    href: `/projects`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/projects/`,
-    Icon: Briefcase,
-  },
+  // {
+  //   key: "projects",
+  //   label: "Projects",
+  //   href: `/projects`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
+  //   highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/projects/`,
+  //   Icon: Briefcase,
+  // },
   {
     key: "all-issues",
     label: "Views",
@@ -273,23 +273,23 @@ export const SIDEBAR_WORKSPACE_MENU_ITEMS: {
     access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
     highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/workspace-views/`),
     Icon: Layers,
-  },
-  {
-    key: "active-cycles",
-    label: "Cycles",
-    href: `/active-cycles`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-    highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,
-    Icon: ContrastIcon,
-  },
-  {
-    key: "analytics",
-    label: "Analytics",
-    href: `/analytics`,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-    highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/analytics/`),
-    Icon: BarChart2,
-  },
+  }
+  // {
+  //   key: "active-cycles",
+  //   label: "Cycles",
+  //   href: `/active-cycles`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+  //   highlight: (pathname: string, baseUrl: string) => pathname === `${baseUrl}/active-cycles/`,
+  //   Icon: ContrastIcon,
+  // },
+  // {
+  //   key: "analytics",
+  //   label: "Analytics",
+  //   href: `/analytics`,
+  //   access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
+  //   highlight: (pathname: string, baseUrl: string) => pathname.includes(`${baseUrl}/analytics/`),
+  //   Icon: BarChart2,
+  // },
 ];
 
 type TLinkOptions = {