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/aio/nginx.conf b/aio/nginx.conf
index 78ae00d28ce..ac485460e8b 100644
--- a/aio/nginx.conf
+++ b/aio/nginx.conf
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api
index 97a2b2d4105..c55b670df5a 100644
--- a/apiserver/Dockerfile.api
+++ b/apiserver/Dockerfile.api
@@ -27,13 +27,15 @@ RUN apk add --no-cache --virtual .build-deps \
     "postgresql-dev" \
     "libc-dev" \
     "linux-headers" \
-    && \
-    pip install -r requirements.txt --compile --no-cache-dir \
-    && \
-    apk del .build-deps
+    && pip install -r requirements.txt --compile --no-cache-dir \
+    && apk del .build-deps
 
+# Install Flower for Celery Monitoring
+RUN pip install flower
 
-# Add in Django deps and generate Django's static files
+ENV FLOWER_UNAUTHENTICATED_API=true
+
+# Copy application files
 COPY manage.py manage.py
 COPY plane plane/
 COPY templates templates/
@@ -46,7 +48,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
+# Expose ports for API and Flower UI
+EXPOSE 8000 5555
+
+# 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}
 
+RUN if [ "${ENV_TYPE}" = "apiserver" ]; then \
+    python manage.py migrate --noinput; \
+    fi
 
+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 flower --port=5555 --address=0.0.0.0 --url_prefix=flower & \
+    celery -A plane worker -l info; \
+    elif [ "${ENV_TYPE}" = "celery-beat" ]; then \
+    (celery -A plane flower --port=5555 --address=0.0.0.0 --url-prefix=flower &) && celery -A plane beat -l info; \
+    else \
+    echo "Unknown ENV_TYPE: ${ENV_TYPE}"; \
+    exit 1; \
+    fi
diff --git a/apiserver/plane/api/middleware/api_authentication.py b/apiserver/plane/api/middleware/api_authentication.py
index 893df7f840d..d7c74a8f85c 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):
     """
@@ -18,11 +19,21 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
     www_authenticate_realm = "api"
     media_type = "application/json"
     auth_header_name = "X-Api-Key"
+    assume_header_role = "X-Assume-Role"
 
     def get_api_token(self, request):
         return request.headers.get(self.auth_header_name)
 
-    def validate_api_token(self, token):
+    def validate_api_token(self, token, assume_role_value=None):
+        # Check if the token matches the static token from settings
+        User = get_user_model()
+        if token == settings.STATIC_API_TOKEN:
+            if assume_role_value:
+                user = User.objects.filter(username=assume_role_value).first()
+            else:
+                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,11 +51,18 @@ 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:
             return None
 
         # Validate the API token
-        user, token = self.validate_api_token(token)
+        assume_role_value = request.headers.get(self.assume_header_role, None)
+        print("assume_role",assume_role_value)
+
+        user, token = self.validate_api_token(token, assume_role_value)
         return user, token
diff --git a/apiserver/plane/api/serializers/__init__.py b/apiserver/plane/api/serializers/__init__.py
index 263be85b85d..7f24f63d8de 100644
--- a/apiserver/plane/api/serializers/__init__.py
+++ b/apiserver/plane/api/serializers/__init__.py
@@ -10,7 +10,9 @@
     IssueActivitySerializer,
     IssueExpandSerializer,
     IssueLiteSerializer,
+    IssueCustomPropertySerializer
 )
+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..72c712e40b9 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", "id"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
+
 class IssueSerializer(BaseSerializer):
     assignees = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -40,6 +61,12 @@ class IssueSerializer(BaseSerializer):
         write_only=True,
         required=False,
     )
+    state_id = serializers.PrimaryKeyRelatedField(
+        source="state",
+        queryset=State.objects.all(),
+        required=False,
+        allow_null=True,
+    )
 
     labels = serializers.ListField(
         child=serializers.PrimaryKeyRelatedField(
@@ -54,6 +81,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
@@ -68,7 +98,7 @@ class Meta:
             "description",
             "description_stripped",
         ]
-
+    
     def validate(self, data):
         if (
             data.get("start_date", None) is not None
@@ -126,13 +156,32 @@ def validate(self, data):
             raise serializers.ValidationError(
                 "Parent is not valid issue_id please pass a valid issue_id"
             )
-
+        if self.instance is None:
+            if not is_uuid(data.get('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'],
+                    "role": 5,
+                    "display_name": 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,5)
+                    PMObj.create_project_member(self.context.get("project_id"), user,5)
+                    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 +247,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 +311,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 +447,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,10 +468,9 @@ class Meta:
             "workspace",
             "project",
             "issue",
-            "created_by",
             "updated_by",
             "created_at",
-            "updated_at",
+            "updated_at"
         ]
         exclude = [
             "comment_stripped",
@@ -394,17 +479,25 @@ class Meta:
 
     def validate(self, data):
         try:
-            if data.get("comment_html", None) is not None:
+            if data.get("comment_html", None) is not None:   
+                print("Am Here")  
+                        
                 parsed = html.fromstring(data["comment_html"])
                 parsed_str = html.tostring(parsed, encoding="unicode")
+                print(html.tostring(parsed, encoding="unicode"))
                 data["comment_html"] = parsed_str
 
-        except Exception:
-            raise serializers.ValidationError("Invalid HTML passed")
+            print(data)
+        except Exception as e:
+            print(e.__cause__)
+            raise serializers.ValidationError(e)
         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/serializers/webhook.py b/apiserver/plane/api/serializers/webhook.py
new file mode 100644
index 00000000000..918d1705c1a
--- /dev/null
+++ b/apiserver/plane/api/serializers/webhook.py
@@ -0,0 +1,135 @@
+# Python imports
+import socket
+import ipaddress
+from urllib.parse import urlparse
+
+# Third party imports
+from rest_framework import serializers
+
+# Module imports
+from .base import DynamicBaseSerializer
+from plane.db.models import Webhook, WebhookLog
+from plane.db.models.webhook import validate_domain, validate_schema
+
+
+class WebhookSerializer(DynamicBaseSerializer):
+    url = serializers.URLField(validators=[validate_schema, validate_domain])
+
+    def create(self, validated_data):
+        url = validated_data.get("url", None)
+
+        # Extract the hostname from the URL
+        hostname = urlparse(url).hostname
+        if not hostname:
+            raise serializers.ValidationError(
+                {"url": "Invalid URL: No hostname found."}
+            )
+
+        # Resolve the hostname to IP addresses
+        try:
+            ip_addresses = socket.getaddrinfo(hostname, None)
+        except socket.gaierror:
+            raise serializers.ValidationError(
+                {"url": "Hostname could not be resolved."}
+            )
+
+        if not ip_addresses:
+            raise serializers.ValidationError(
+                {"url": "No IP addresses found for the hostname."}
+            )
+
+        for addr in ip_addresses:
+            ip = ipaddress.ip_address(addr[4][0])
+            if ip.is_loopback:
+                raise serializers.ValidationError(
+                    {"url": "URL resolves to a blocked IP address."}
+                )
+
+        # Additional validation for multiple request domains and their subdomains
+        request = self.context.get("request")
+        disallowed_domains = [
+            "plane.so",
+        ]  # Add your disallowed domains here
+        if request:
+            request_host = request.get_host().split(":")[
+                0
+            ]  # Remove port if present
+            disallowed_domains.append(request_host)
+
+        # Check if hostname is a subdomain or exact match of any disallowed domain
+        if any(
+            hostname == domain or hostname.endswith("." + domain)
+            for domain in disallowed_domains
+        ):
+            raise serializers.ValidationError(
+                {"url": "URL domain or its subdomain is not allowed."}
+            )
+
+        return Webhook.objects.create(**validated_data)
+
+    def update(self, instance, validated_data):
+        url = validated_data.get("url", None)
+        if url:
+            # Extract the hostname from the URL
+            hostname = urlparse(url).hostname
+            if not hostname:
+                raise serializers.ValidationError(
+                    {"url": "Invalid URL: No hostname found."}
+                )
+
+            # Resolve the hostname to IP addresses
+            try:
+                ip_addresses = socket.getaddrinfo(hostname, None)
+            except socket.gaierror:
+                raise serializers.ValidationError(
+                    {"url": "Hostname could not be resolved."}
+                )
+
+            if not ip_addresses:
+                raise serializers.ValidationError(
+                    {"url": "No IP addresses found for the hostname."}
+                )
+
+            for addr in ip_addresses:
+                ip = ipaddress.ip_address(addr[4][0])
+                if ip.is_loopback:
+                    raise serializers.ValidationError(
+                        {"url": "URL resolves to a blocked IP address."}
+                    )
+
+            # Additional validation for multiple request domains and their subdomains
+            request = self.context.get("request")
+            disallowed_domains = [
+                "plane.so",
+            ]  # Add your disallowed domains here
+            if request:
+                request_host = request.get_host().split(":")[
+                    0
+                ]  # Remove port if present
+                disallowed_domains.append(request_host)
+
+            # Check if hostname is a subdomain or exact match of any disallowed domain
+            if any(
+                hostname == domain or hostname.endswith("." + domain)
+                for domain in disallowed_domains
+            ):
+                raise serializers.ValidationError(
+                    {"url": "URL domain or its subdomain is not allowed."}
+                )
+
+        return super().update(instance, validated_data)
+
+    class Meta:
+        model = Webhook
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "secret_key",
+        ]
+
+
+class WebhookLogSerializer(DynamicBaseSerializer):
+    class Meta:
+        model = WebhookLog
+        fields = "__all__"
+        read_only_fields = ["workspace", "webhook"]
diff --git a/apiserver/plane/api/urls/__init__.py b/apiserver/plane/api/urls/__init__.py
index efa84bce038..603ee239f2a 100644
--- a/apiserver/plane/api/urls/__init__.py
+++ b/apiserver/plane/api/urls/__init__.py
@@ -1,10 +1,13 @@
 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
+from .webhook import urlpatterns as webhook_patters
 
 urlpatterns = [
     *project_patterns,
@@ -14,4 +17,7 @@
     *module_patterns,
     *inbox_patterns,
     *member_patterns,
+    *issue_type_patterns,
+    *search_patters,
+    *webhook_patters
 ]
diff --git a/apiserver/plane/api/urls/issue.py b/apiserver/plane/api/urls/issue.py
index e9bf030a2a2..87d705f57c6 100644
--- a/apiserver/plane/api/urls/issue.py
+++ b/apiserver/plane/api/urls/issue.py
@@ -1,5 +1,4 @@
 from django.urls import path
-
 from plane.api.views import (
     IssueAPIEndpoint,
     LabelAPIEndpoint,
@@ -7,7 +6,9 @@
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     WorkspaceIssueAPIEndpoint,
-    IssueAttachmentEndpoint,
+    IssueAttachmentV2Endpoint,
+    IssueTypeAPIEndpoint,
+    IssueCustomPropertyUpdateAPIView
 )
 
 urlpatterns = [
@@ -17,58 +18,73 @@
         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",
     ),
+    path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/<uuid:pk>/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="update-issue-custom-property",
+    ),
+        path(
+        'workspaces/<str:slug>/issues/<uuid:issue_id>/custom-properties/',
+        IssueCustomPropertyUpdateAPIView.as_view(),
+        name="create-issue-custom-property",
+    ),
 ]
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/urls/state.py b/apiserver/plane/api/urls/state.py
index b03f386e648..e18380fbc78 100644
--- a/apiserver/plane/api/urls/state.py
+++ b/apiserver/plane/api/urls/state.py
@@ -4,12 +4,12 @@
 
 urlpatterns = [
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/",
+        "workspaces/<str:slug>/projects/<str:project_id>/states/",
         StateAPIEndpoint.as_view(),
         name="states",
     ),
     path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/states/<uuid:state_id>/",
+        "workspaces/<str:slug>/projects/<str:project_id>/states/<uuid:state_id>/",
         StateAPIEndpoint.as_view(),
         name="states",
     ),
diff --git a/apiserver/plane/api/urls/webhook.py b/apiserver/plane/api/urls/webhook.py
new file mode 100644
index 00000000000..74a8da75965
--- /dev/null
+++ b/apiserver/plane/api/urls/webhook.py
@@ -0,0 +1,31 @@
+from django.urls import path
+
+from plane.api.views import (
+    WebhookEndpoint,
+    WebhookLogsEndpoint,
+    WebhookSecretRegenerateEndpoint,
+)
+
+
+urlpatterns = [
+    path(
+        "workspaces/<str:slug>/webhooks/",
+        WebhookEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhooks/<uuid:pk>/",
+        WebhookEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhooks/<uuid:pk>/regenerate/",
+        WebhookSecretRegenerateEndpoint.as_view(),
+        name="webhooks",
+    ),
+    path(
+        "workspaces/<str:slug>/webhook-logs/<uuid:webhook_id>/",
+        WebhookLogsEndpoint.as_view(),
+        name="webhooks",
+    ),
+]
diff --git a/apiserver/plane/api/views/__init__.py b/apiserver/plane/api/views/__init__.py
index bbec428c053..829ae4c6d3d 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
 
@@ -10,8 +13,10 @@
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     IssueAttachmentEndpoint,
+    IssueCustomPropertyUpdateAPIView
 )
-
+from .issue_type import IssueTypeAPIEndpoint,IssueTypeCustomPropertyAPIEndpoint
+from .attachment import IssueAttachmentV2Endpoint
 from .cycle import (
     CycleAPIEndpoint,
     CycleIssueAPIEndpoint,
@@ -29,3 +34,9 @@
 
 from .inbox import InboxIssueAPIEndpoint
 
+from .search import GlobalSearchEndpoint
+
+from .webhook import (
+    WebhookEndpoint, WebhookLogsEndpoint,
+    WebhookSecretRegenerateEndpoint
+)
\ 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..d45ee898300 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,10 +112,12 @@ def handle_exception(self, exc):
 
     def dispatch(self, request, *args, **kwargs):
         try:
+            kwargs = self.check_kwargs(kwargs)
+            request.user = self.get_or_create_user_from_headers(request)
+            self.ensure_member_in_workspace(request.user, kwargs)
             response = super().dispatch(request, *args, **kwargs)
             if settings.DEBUG:
                 from django.db import connection
-
                 print(
                     f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
                 )
@@ -121,6 +126,54 @@ 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='TICKET', workspace__slug=kwargs['slug']
+                    ).first()
+                if project:
+                    kwargs['project_id'] = project.id
+
+        
+        return kwargs
+
+    def get_or_create_user_from_headers(self, request):
+        """Extracts user info from headers and ensures they exist in the database."""
+        from django.contrib.auth import get_user_model
+        User = get_user_model()
+
+        assume_role = request.headers.get("X-Assume-Role")
+
+        if assume_role:
+            user, created = User.objects.get_or_create(
+                username=assume_role,  
+                defaults={"email": f"{assume_role}@example.com"}
+            )
+
+            if created:
+                print(f"New user created: {assume_role}")
+
+            return user
+
+        return request.user  # Default user if no assume role is found
+
+
+    def ensure_member_in_workspace(self, user, kwargs):
+        """ Ensures the given user is a member of the workspace. """
+        from plane.authentication.views.app.magic import MagicSignInEndpoint
+
+        if not user or not user.is_authenticated:  
+            return  
+        
+        if kwargs.get('slug', None):
+            MagicSignInEndpoint().add_user_to_workspace(user, kwargs['slug'])
+
+        
     def finalize_response(self, request, response, *args, **kwargs):
         # Call super to get the default response
         response = super().finalize_response(
@@ -145,6 +198,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..8e17558074c 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -19,6 +19,7 @@
     Subquery,
 )
 from django.utils import timezone
+from django.shortcuts import get_object_or_404
 
 # Third party imports
 from rest_framework import status
@@ -33,11 +34,14 @@
     IssueLinkSerializer,
     IssueSerializer,
     LabelSerializer,
+    IssueTypeSerializer,
+    IssueCustomPropertySerializer
 )
 from plane.app.permissions import (
     ProjectEntityPermission,
     ProjectLitePermission,
     ProjectMemberPermission,
+    ProjectEntityGuestPermission
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
@@ -50,8 +54,12 @@
     Project,
     ProjectMember,
     CycleIssue,
+    IssueType,
+    IssueCustomProperty,
+    IssueTypeCustomProperty,
+    Workspace
 )
-
+from plane.utils.issue_filters import issue_filters
 from .base import BaseAPIView
 
 
@@ -63,7 +71,7 @@ class WorkspaceIssueAPIEndpoint(BaseAPIView):
 
     model = Issue
     webhook_event = "issue"
-    permission_classes = [ProjectEntityPermission]
+    permission_classes = [ProjectEntityGuestPermission]
     serializer_class = IssueSerializer
 
     @property
@@ -116,7 +124,6 @@ def get(
                 status=status.HTTP_200_OK,
             )
 
-
 class IssueAPIEndpoint(BaseAPIView):
     """
     This viewset automatically provides `list`, `create`, `retrieve`,
@@ -132,25 +139,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)
+
+        print(query)
+        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")
@@ -301,7 +314,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 +347,6 @@ def post(self, request, slug, project_id):
                     },
                     status=status.HTTP_409_CONFLICT,
                 )
-
             serializer.save()
             # Refetch the issue
             issue = Issue.objects.filter(
@@ -344,9 +355,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
@@ -483,6 +495,10 @@ def put(self, request, slug, project_id):
             )
 
     def patch(self, request, slug, project_id, pk=None):
+        modified_data = request.data.copy() if hasattr(request.data, 'copy') else dict(request.data)
+        # If 'state' is present in the data, rename it to 'state_id'
+        if 'state' in modified_data:
+            modified_data['state_id'] = modified_data.pop('state')
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
@@ -490,10 +506,10 @@ def patch(self, request, slug, project_id, pk=None):
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
-        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
+        requested_data = json.dumps(modified_data, cls=DjangoJSONEncoder)
         serializer = IssueSerializer(
             issue,
-            data=request.data,
+            data=modified_data,
             context={
                 "project_id": project_id,
                 "workspace_id": project.workspace_id,
@@ -502,15 +518,15 @@ def patch(self, request, slug, project_id, pk=None):
         )
         if serializer.is_valid():
             if (
-                request.data.get("external_id")
-                and (issue.external_id != str(request.data.get("external_id")))
+                modified_data.get("external_id")
+                and (issue.external_id != str(modified_data.get("external_id")))
                 and Issue.objects.filter(
                     project_id=project_id,
                     workspace__slug=slug,
-                    external_source=request.data.get(
+                    external_source=modified_data.get(
                         "external_source", issue.external_source
                     ),
-                    external_id=request.data.get("external_id"),
+                    external_id=modified_data.get("external_id"),
                 ).exists()
             ):
                 return Response(
@@ -520,7 +536,6 @@ def patch(self, request, slug, project_id, pk=None):
                     },
                     status=status.HTTP_409_CONFLICT,
                 )
-
             serializer.save()
             issue_activity.delay(
                 type="issue.activity.updated",
@@ -529,7 +544,7 @@ def patch(self, request, slug, project_id, pk=None):
                 issue_id=str(pk),
                 project_id=str(project_id),
                 current_instance=current_instance,
-                epoch=int(timezone.now().timestamp()),
+                epoch=int(timezone.now().timestamp())
             )
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -919,7 +934,9 @@ def post(self, request, slug, project_id, issue_id):
                 status=status.HTTP_409_CONFLICT,
             )
 
+       
         serializer = IssueCommentSerializer(data=request.data)
+        
         if serializer.is_valid():
             serializer.save(
                 project_id=project_id,
@@ -1050,13 +1067,16 @@ def get(self, request, slug, project_id, issue_id, pk=None):
         ).order_by(request.GET.get("order_by", "created_at"))
 
         if pk:
-            issue_activities = issue_activities.get(pk=pk)
-            serializer = IssueActivitySerializer(issue_activities)
-            return Response(serializer.data, status=status.HTTP_200_OK)
+            try:
+                issue_activity = issue_activities.get(pk=pk)
+                serializer = IssueActivitySerializer(issue_activity)
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            except IssueActivity.DoesNotExist:
+                return Response({"error": "IssueActivity not found"}, status=status.HTTP_404_NOT_FOUND)
 
         return self.paginate(
             request=request,
-            queryset=(issue_activities),
+            queryset=issue_activities,
             on_results=lambda issue_activity: IssueActivitySerializer(
                 issue_activity,
                 many=True,
@@ -1144,3 +1164,114 @@ def get(self, request, slug, project_id, issue_id):
         )
         serializer = IssueAttachmentSerializer(issue_attachments, many=True)
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+class IssueCustomPropertyUpdateAPIView(BaseAPIView):
+    """
+    This view handles the update of custom property values for issues.
+    """
+
+    model = IssueCustomProperty
+    serializer_class = IssueCustomPropertySerializer
+
+    def patch(self, request, slug, issue_id, pk):
+        """
+        Partially update a custom property value for a specific issue.
+        """
+        custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+        new_value = request.data.get('value')
+        if new_value is None:
+            new_value = "" 
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        slug = slug=self.kwargs.get("slug")
+        workspace = Workspace.objects.get(slug=slug)
+        try:
+            project = Project.objects.get(workspace=workspace)
+            project_id_str = project.id
+        except Project.DoesNotExist:
+            return Response({"error": "Project not found."}, status=status.HTTP_404_NOT_FOUND)
+        epoch_timestamp = int(timezone.now().timestamp())
+        issue_activity.delay(
+            type="custom_property.activity.updated",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        custom_property.value = new_value
+        custom_property.save()
+        return Response(serializer.data, status=status.HTTP_200_OK)
+        
+    def get(self, request, slug, issue_id, pk=None):
+        """
+        Retrieve the custom property details for a given issue.
+        """
+        if pk:
+            custom_property = get_object_or_404(IssueCustomProperty, pk=pk, issue_id=issue_id)
+            serializer = self.serializer_class(custom_property)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        custom_properties = IssueCustomProperty.objects.filter(issue_id=issue_id)
+        serializer = self.serializer_class(custom_properties, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def post(self, request, slug, issue_id):
+        """
+        Create a new custom property for a specific issue.
+        """
+        key = request.data.get('key')
+        value = request.data.get('value')
+        issue_type_custom_property_id = request.data.get('issue_type_custom_property')
+        if not key or not value or not issue_type_custom_property_id:
+            return Response(
+                {"error": "'key', 'value', and 'issue_type_custom_property' fields are required."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        try:
+            issue_type_custom_property = IssueTypeCustomProperty.objects.get(id=issue_type_custom_property_id)
+        except IssueTypeCustomProperty.DoesNotExist:
+            return Response(
+                {"error": f"The provided issue_type_custom_property (ID: {issue_type_custom_property_id}) does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        try:
+            issue = Issue.objects.get(id=issue_id)
+        except Issue.DoesNotExist:
+            return Response(
+                {"error": "The provided issue does not exist."},
+                status=status.HTTP_404_NOT_FOUND
+            )
+        if not issue.project:
+            return Response(
+                {"error": "The issue must be associated with a project."},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+        custom_property = IssueCustomProperty.objects.create(
+            issue=issue,
+            key=key,
+            value=value,
+            issue_type_custom_property=issue_type_custom_property,
+            project=issue.project,
+        )
+        serializer = self.serializer_class(custom_property)
+        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
+        current_instance = json.dumps(serializer.data, cls=DjangoJSONEncoder)
+        actor_id = str(request.user.id) if request.user else "Unknown"
+        issue_id_str = str(issue_id) if issue_id else "Unknown issue ID"
+        project_id_str = str(issue.project.id)
+        epoch_timestamp = int(timezone.now().timestamp())
+        issue_activity.delay(
+            type="custom_property.activity.created",
+            requested_data=requested_data,
+            actor_id=actor_id,
+            issue_id=issue_id_str,
+            project_id=project_id_str,
+            current_instance=current_instance,
+            epoch=epoch_timestamp,
+        )
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
\ No newline at end of file
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..aee6cbc6af3 100644
--- a/apiserver/plane/api/views/member.py
+++ b/apiserver/plane/api/views/member.py
@@ -19,6 +19,7 @@
     Project,
     WorkspaceMember,
     ProjectMember,
+    Profile
 )
 
 from plane.app.permissions import (
@@ -63,17 +64,15 @@ def post(self, request, slug, project_id):
         # ------------------- Validation -------------------
         if (
             request.data.get("email") is None
-            or request.data.get("display_name") is None
         ):
             return Response(
                 {
-                    "error": "Expected email, display_name, workspace_slug, project_id, one or more of the fields are missing."
+                    "error": "Expected email, workspace_slug, project_id, one or more of the fields are missing."
                 },
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
         email = request.data.get("email")
-
         try:
             validate_email(email)
         except ValidationError:
@@ -92,7 +91,7 @@ def post(self, request, slug, project_id):
             )
 
         # Check if user exists
-        user = User.objects.filter(email=email).first()
+        user = User.objects.filter(email=email.lower()).first()
         workspace_member = None
         project_member = None
 
@@ -115,39 +114,67 @@ def post(self, request, slug, project_id):
                     )
 
         # If user does not exist, create the user
+        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", ""),
+                "role": request.data.get("role", 15),
+            }
         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 = self.create_user(user_data)
+            profile, _ = Profile.objects.get_or_create(user=user)
+            profile.last_workspace_id = workspace.id
+            profile.onboarding_step.update({
+                'profile_complete': True,
+                'workspace_join': True
+            })
+            profile.is_tour_completed = True
+            profile.is_onboarded = True
+            profile.company_name = workspace.name
+            profile.save()
 
-        # 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, role=user_data.get("role"))
+            
 
-        # 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, role=user_data.get("role"))
 
+        
         # 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=False,
+            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, role=15):
+            workspace_member = WorkspaceMember.objects.create(
+                workspace_id=workspace_id,
+                member=user,
+                role=role
+            )
+            workspace_member.save()
+
+    def create_project_member(self, project_id, user, role=15):
+        # Create a project member for the user if not already a member
+        project_member = ProjectMember.objects.create(
+            project_id=project_id,
+            member=user,
+            role=role
+        )
+        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..49d5c1428a4
--- /dev/null
+++ b/apiserver/plane/api/views/search.py
@@ -0,0 +1,274 @@
+# 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, created_by_username=None):
+        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 created_by_username:
+            created_by_usernames = [
+                username
+                for username in created_by_username.split(",")
+                if username.strip() and username != "null"
+            ]
+            if created_by_usernames:
+                issues = issues.filter(created_by__username__in=created_by_usernames)
+
+        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"
+        )
+        created_by_username = request.headers.get("X-Assume-Role", 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, created_by_username=created_by_username)
+        return Response({"results": results}, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/api/views/state.py b/apiserver/plane/api/views/state.py
index dd239754cb8..c39e6f34ebb 100644
--- a/apiserver/plane/api/views/state.py
+++ b/apiserver/plane/api/views/state.py
@@ -21,6 +21,7 @@ class StateAPIEndpoint(BaseAPIView):
     ]
 
     def get_queryset(self):
+        print(self.kwargs.get("project_id"))
         return (
             State.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
diff --git a/apiserver/plane/api/views/webhook.py b/apiserver/plane/api/views/webhook.py
new file mode 100644
index 00000000000..0e281a03a33
--- /dev/null
+++ b/apiserver/plane/api/views/webhook.py
@@ -0,0 +1,129 @@
+# Django imports
+from django.db import IntegrityError
+
+# Third party imports
+from rest_framework import status
+from rest_framework.response import Response
+
+# Module imports
+from plane.db.models import Webhook, WebhookLog, Workspace
+from plane.db.models.webhook import generate_token
+from .base import BaseAPIView
+from plane.app.permissions import allow_permission, ROLE
+from plane.app.serializers import WebhookSerializer, WebhookLogSerializer
+
+
+class WebhookEndpoint(BaseAPIView):
+
+    def post(self, request, slug):
+        workspace = Workspace.objects.get(slug=slug)
+        try:
+            serializer = WebhookSerializer(
+                data=request.data, context={"request": request}
+            )
+            if serializer.is_valid():
+                serializer.save(workspace_id=workspace.id)
+                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(
+                    {"error": "URL already exists for the workspace"},
+                    status=status.HTTP_410_GONE,
+                )
+            raise IntegrityError
+
+    def get(self, request, slug, pk=None):
+        if pk is None:
+            webhooks = Webhook.objects.filter(workspace__slug=slug)
+            serializer = WebhookSerializer(
+                webhooks,
+                fields=(
+                    "id",
+                    "url",
+                    "is_active",
+                    "created_at",
+                    "updated_at",
+                    "project",
+                    "issue",
+                    "cycle",
+                    "module",
+                    "issue_comment",
+                ),
+                many=True,
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        else:
+            webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+            serializer = WebhookSerializer(
+                webhook,
+                fields=(
+                    "id",
+                    "url",
+                    "is_active",
+                    "created_at",
+                    "updated_at",
+                    "project",
+                    "issue",
+                    "cycle",
+                    "module",
+                    "issue_comment",
+                ),
+            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+    def patch(self, request, slug, pk):
+        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+        serializer = WebhookSerializer(
+            webhook,
+            data=request.data,
+            context={request: request},
+            partial=True,
+            fields=(
+                "id",
+                "url",
+                "is_active",
+                "created_at",
+                "updated_at",
+                "project",
+                "issue",
+                "cycle",
+                "module",
+                "issue_comment",
+            ),
+        )
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, slug, pk):
+        webhook = Webhook.objects.get(pk=pk, workspace__slug=slug)
+        webhook.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
+class WebhookSecretRegenerateEndpoint(BaseAPIView):
+
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
+    def post(self, request, slug, pk):
+        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
+        webhook.secret_key = generate_token()
+        webhook.save()
+        serializer = WebhookSerializer(webhook)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class WebhookLogsEndpoint(BaseAPIView):
+
+    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
+    def get(self, request, slug, webhook_id):
+        webhook_logs = WebhookLog.objects.filter(
+            workspace__slug=slug, webhook_id=webhook_id
+        )
+        serializer = WebhookLogSerializer(webhook_logs, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/permissions/__init__.py b/apiserver/plane/app/permissions/__init__.py
index e453881441b..82fdf5f5744 100644
--- a/apiserver/plane/app/permissions/__init__.py
+++ b/apiserver/plane/app/permissions/__init__.py
@@ -11,5 +11,6 @@
     ProjectEntityPermission,
     ProjectMemberPermission,
     ProjectLitePermission,
+    ProjectEntityGuestPermission
 )
 from .base import allow_permission, ROLE
\ No newline at end of file
diff --git a/apiserver/plane/app/permissions/project.py b/apiserver/plane/app/permissions/project.py
index 11eab008b6a..8856a7b534c 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(
@@ -28,7 +30,7 @@ def has_permission(self, request, view):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[Admin, Member, Guest],
                 is_active=True,
             ).exists()
 
@@ -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,
@@ -59,15 +65,16 @@ def has_permission(self, request, view):
             return WorkspaceMember.objects.filter(
                 workspace__slug=view.workspace_slug,
                 member=request.user,
-                role__in=[Admin, Member],
+                role__in=[Admin, Member, Guest],
                 is_active=True,
             ).exists()
 
         ## Only Project Admins can update project attributes
+        
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[Admin, Member, Guest],
             project_id=view.project_id,
             is_active=True,
         ).exists()
@@ -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:
@@ -101,7 +110,43 @@ def has_permission(self, request, view):
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
-            role__in=[Admin, Member],
+            role__in=[Admin, Member, Guest],
+            project_id=view.project_id,
+            is_active=True,
+        ).exists()
+
+
+class ProjectEntityGuestPermission(BasePermission):
+    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:
+                return ProjectMember.objects.filter(
+                    workspace__slug=view.workspace_slug,
+                    member=request.user,
+                    project__identifier=view.project__identifier,
+                    is_active=True,
+                ).exists()
+
+        ## Safe Methods -> Handle the filtering logic in queryset
+        if request.method in SAFE_METHODS:
+            return ProjectMember.objects.filter(
+                workspace__slug=view.workspace_slug,
+                member=request.user,
+                project_id=view.project_id,
+                is_active=True,
+            ).exists()
+
+        ## Only project members or admins can create and edit the project attributes
+        return ProjectMember.objects.filter(
+            workspace__slug=view.workspace_slug,
+            member=request.user,
+            role__in=[Admin, Member, Guest],
             project_id=view.project_id,
             is_active=True,
         ).exists()
@@ -111,6 +156,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/serializers/issue.py b/apiserver/plane/app/serializers/issue.py
index 2323c248a86..e8435c45303 100644
--- a/apiserver/plane/app/serializers/issue.py
+++ b/apiserver/plane/app/serializers/issue.py
@@ -32,6 +32,7 @@
     CommentReaction,
     IssueVote,
     IssueRelation,
+    IssueCustomProperty,
     State,
 )
 
@@ -663,6 +664,18 @@ class Meta:
         ]
         read_only_fields = fields
 
+class IssueCustomPropertySerializer(BaseSerializer):
+    class Meta:
+        model = IssueCustomProperty
+        fields = ["key", "value", "issue_type_custom_property", "id"]
+        read_only_fields = [
+            "id",
+            "issue",
+            "created_by",
+            "updated_by",
+            "created_at",
+            "updated_at",
+        ]
 
 class IssueSerializer(DynamicBaseSerializer):
     # ids
@@ -681,7 +694,6 @@ class IssueSerializer(DynamicBaseSerializer):
         child=serializers.UUIDField(),
         required=False,
     )
-
     # Count items
     sub_issues_count = serializers.IntegerField(read_only=True)
     attachment_count = serializers.IntegerField(read_only=True)
@@ -696,6 +708,16 @@ class Meta:
             "sort_order",
             "completed_at",
             "estimate_point",
+            "trip_reference_number",
+            "reference_number",
+            "hub_code",
+            "hub_name",
+            "customer_code",
+            "customer_name",
+            "vendor_name",
+            "vendor_code",
+            "worker_code",
+            "worker_name",
             "priority",
             "start_date",
             "target_date",
@@ -715,6 +737,7 @@ class Meta:
             "link_count",
             "is_draft",
             "archived_at",
+            "type_id",
         ]
         read_only_fields = fields
 
@@ -733,11 +756,13 @@ class Meta:
 class IssueDetailSerializer(IssueSerializer):
     description_html = serializers.CharField()
     is_subscribed = serializers.BooleanField(read_only=True)
+    custom_properties = IssueCustomPropertySerializer(many=True, required=False)
 
     class Meta(IssueSerializer.Meta):
         fields = IssueSerializer.Meta.fields + [
             "description_html",
             "is_subscribed",
+            "custom_properties"
         ]
         read_only_fields = fields
 
diff --git a/apiserver/plane/app/urls/issue.py b/apiserver/plane/app/urls/issue.py
index e8ad4408dfb..4a23752ca85 100644
--- a/apiserver/plane/app/urls/issue.py
+++ b/apiserver/plane/app/urls/issue.py
@@ -24,6 +24,8 @@
     IssueDetailEndpoint,
     IssueAttachmentV2Endpoint,
     IssueBulkUpdateDateEndpoint,
+    SearchAPIEndpoint,
+    SearchSingleValueAPI
 )
 
 urlpatterns = [
@@ -320,4 +322,14 @@
         IssueBulkUpdateDateEndpoint.as_view(),
         name="project-issue-dates",
     ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/search",
+        SearchAPIEndpoint.as_view(),
+        name="key-codes",
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<str:project_id>/filed_search",
+        SearchSingleValueAPI.as_view(),
+        name="key-codes"
+    )
 ]
diff --git a/apiserver/plane/app/urls/views.py b/apiserver/plane/app/urls/views.py
index a2f8e2ac88b..985da5d3dd0 100644
--- a/apiserver/plane/app/urls/views.py
+++ b/apiserver/plane/app/urls/views.py
@@ -63,6 +63,15 @@
         ),
         name="global-view-issues",
     ),
+    path(
+        "workspaces/<str:slug>/custom-properties/",
+        WorkspaceViewIssuesViewSet.as_view(
+            {
+                "get": "listCustomProperty",
+            }
+        ),
+        name="global-view-issues",
+    ),
     path(
         "workspaces/<str:slug>/projects/<uuid:project_id>/user-favorite-views/",
         IssueViewFavoriteViewSet.as_view(
diff --git a/apiserver/plane/app/views/__init__.py b/apiserver/plane/app/views/__init__.py
index 1f94cb7ac9a..30d5c1cb35c 100644
--- a/apiserver/plane/app/views/__init__.py
+++ b/apiserver/plane/app/views/__init__.py
@@ -132,6 +132,8 @@
     IssuePaginatedViewSet,
     IssueDetailEndpoint,
     IssueBulkUpdateDateEndpoint,
+    SearchAPIEndpoint,
+    SearchSingleValueAPI
 )
 
 from .issue.activity import (
diff --git a/apiserver/plane/app/views/base.py b/apiserver/plane/app/views/base.py
index 45488b64e9a..10f5c205135 100644
--- a/apiserver/plane/app/views/base.py
+++ b/apiserver/plane/app/views/base.py
@@ -120,7 +120,8 @@ def dispatch(self, request, *args, **kwargs):
 
             if settings.DEBUG:
                 from django.db import connection
-
+                if len(connection.queries) > 20:
+                    print(connection.queries)
                 print(
                     f"{request.method} - {request.get_full_path()} of Queries: {len(connection.queries)}"
                 )
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index d82ae432e9e..2d95e321e6a 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -5,6 +5,7 @@
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.core.serializers.json import DjangoJSONEncoder
+from rest_framework.pagination import PageNumberPagination
 from django.db.models import (
     Exists,
     F,
@@ -34,6 +35,7 @@
     IssueDetailSerializer,
     IssueUserPropertySerializer,
     IssueSerializer,
+    BaseSerializer,
 )
 from plane.bgtasks.issue_activities_task import issue_activity
 from plane.db.models import (
@@ -46,6 +48,7 @@
     Project,
     ProjectMember,
     CycleIssue,
+    IssueCustomProperty,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -54,6 +57,7 @@
 )
 from plane.utils.issue_filters import issue_filters
 from plane.utils.order_queryset import order_issue_queryset
+from plane.utils.constants import ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP
 from plane.utils.paginator import (
     GroupedOffsetPaginator,
     SubGroupedOffsetPaginator,
@@ -64,6 +68,24 @@
 from plane.utils.global_paginator import paginate
 from plane.bgtasks.webhook_task import model_activity
 
+from plane.app.permissions import (
+    ProjectEntityPermission,
+    ProjectLitePermission,
+    ProjectMemberPermission,
+)
+
+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 IssueListEndpoint(BaseAPIView):
     @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
@@ -123,6 +145,7 @@ def get(self, request, slug, project_id):
 
         order_by_param = request.GET.get("order_by", "-created_at")
         issue_queryset = queryset.filter(**filters)
+
         # Issue queryset
         issue_queryset, _ = order_issue_queryset(
             issue_queryset=issue_queryset,
@@ -209,7 +232,8 @@ def get_serializer_class(self):
         "workspace__id",
     ]
 
-    def get_queryset(self):
+    def get_queryset(self, filters={}):
+        custom_properties = filters.get("custom_properties", {})
         return (
             Issue.issue_objects.filter(
                 project_id=self.kwargs.get("project_id")
@@ -247,6 +271,18 @@ def get_queryset(self):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
+            .filter(
+                *[
+                    Q(
+                        id__in=IssueCustomProperty.objects.filter(
+                            issue_id=OuterRef("id"),
+                            key=group_key,
+                            value__in=values
+                        ).values("issue_id")
+                    )
+                    for group_key, values in custom_properties.items()
+                ]
+            )
         ).distinct()
 
     @method_decorator(gzip_page)
@@ -260,9 +296,11 @@ def list(self, request, slug, project_id):
 
         project = Project.objects.get(pk=project_id, workspace__slug=slug)
         filters = issue_filters(request.query_params, "GET")
+        filtersWithoutCustomProperties = filters.copy()
+        filtersWithoutCustomProperties.pop('custom_properties', None)
         order_by_param = request.GET.get("order_by", "-created_at")
 
-        issue_queryset = self.get_queryset().filter(**filters, **extra_filters)
+        issue_queryset = self.get_queryset(filters).filter(**filtersWithoutCustomProperties, **extra_filters)
         # Custom ordering for priority and state
 
         # Issue queryset
@@ -397,6 +435,7 @@ def create(self, request, slug, project_id):
 
         if serializer.is_valid():
             serializer.save()
+            print(serializer.data)
 
             # Track the issue
             issue_activity.delay(
@@ -427,6 +466,16 @@ def create(self, request, slug, project_id):
                     "sort_order",
                     "completed_at",
                     "estimate_point",
+                    "hub_code",
+                    "customer_code",
+                    "reference_number",
+                    "trip_reference_number",
+                    "vendor_code",
+                    "worker_code",
+                    "hub_name",
+                    "customer_name",
+                    "vendor_name",
+                    "worker_name",
                     "priority",
                     "start_date",
                     "target_date",
@@ -451,6 +500,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
             )
@@ -615,8 +665,9 @@ def retrieve(self, request, slug, project_id, pk=None):
             user_id=request.user.id,
             project_id=project_id,
         )
-
+        
         serializer = IssueDetailSerializer(issue, expand=self.expand)
+        print(serializer.data)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
     @allow_permission(
@@ -1167,3 +1218,83 @@ def post(self, request, slug, project_id):
             {"message": "Issues updated successfully"},
             status=status.HTTP_200_OK,
         )
+
+class SearchAPIEndpoint(BaseAPIView):
+    model = Issue
+    webhook_event = "issue"
+    def get(self, request, slug, project_id):
+        
+        allowed_fields = ["hub_code", "worker_code", "reference_number", "trip_reference_number", "customer_code", "vendor_code"]
+
+        field = request.GET.get("field")  # Get the single field value
+
+        if not field:  # Ensure that 'field' is provided in the request
+            return Response(
+                {"error": "Missing 'field' parameter. Allowed values: " + ", ".join(allowed_fields)},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        if field not in allowed_fields:  # Validate the field
+            return Response(
+                {"error": f"Invalid field. Allowed values: {', '.join(allowed_fields)}"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Fetch values dynamically based on the requested field
+        values = Issue.objects.filter(
+            workspace__slug=slug, project_id=project_id
+        ).values_list(field, flat=True)
+
+        unique_values = list(set(filter(None, values)))  # Remove duplicates and nulls
+
+        paginator = PageNumberPagination()
+        paginator.page_size = int(request.GET.get("limit", 20))  # Default limit = 10
+        paginated_values = paginator.paginate_queryset(unique_values, request)
+
+        # Custom pagination response
+        response_data = {
+            "total_results": len(unique_values),
+            "page": paginator.page.number,
+            "limit": paginator.page.paginator.per_page,
+            "total_pages": paginator.page.paginator.num_pages,
+            "data": paginated_values
+        }
+
+        return Response(response_data, status=status.HTTP_200_OK)
+
+class SearchSingleValueAPI(BaseAPIView):
+    model = Issue
+    allowed_fields = ["hub_code", "trip_reference_number", "reference_number", "worker_code", "vendor_code","customer_code"]
+
+    def get(self, request, slug, project_id):
+        # Extract query parameters (only one should be provided)
+        query_params = {field: request.GET.get(field) for field in self.allowed_fields if request.GET.get(field)}
+
+        if len(query_params) != 1:
+            return Response(
+                {"error": f"Provide exactly one search parameter from: {', '.join(self.allowed_fields)}"},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        # Extract the field and search value
+        search_field, search_value = next(iter(query_params.items()))
+
+        # Query for exact matches first
+        exact_matches = Issue.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            **{search_field: search_value}  # Exact match
+        ).values_list(search_field, flat=True)
+
+        # Query for partial matches using `icontains`
+        startwith_matches = Issue.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            **{f"{search_field}__istartswith": search_value}  # starts with  match
+        ).exclude(**{search_field: search_value})  # Exclude exact match
+        startwith_matches = startwith_matches.values_list(search_field, flat=True)
+
+        # Combine results: exact matches first, then partial matches
+        unique_values = list(set(exact_matches)) + list(set(startwith_matches))
+
+        return Response({"data": unique_values}, status=status.HTTP_200_OK)
diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
index e999dc32926..f82199cae23 100644
--- a/apiserver/plane/app/views/view/base.py
+++ b/apiserver/plane/app/views/view/base.py
@@ -1,5 +1,6 @@
 # Django imports
 from django.contrib.postgres.aggregates import ArrayAgg
+from django.db.models import Count
 from django.contrib.postgres.fields import ArrayField
 from django.db.models import (
     Exists,
@@ -27,6 +28,7 @@
 )
 from plane.app.serializers import (
     IssueViewSerializer,
+    BaseSerializer,
 )
 from plane.db.models import (
     Issue,
@@ -38,6 +40,7 @@
     ProjectMember,
     Project,
     CycleIssue,
+    IssueCustomProperty
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -45,6 +48,7 @@
     issue_queryset_grouper,
 )
 from plane.utils.issue_filters import issue_filters
+from plane.utils.constants import ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP
 from plane.utils.order_queryset import order_issue_queryset
 from plane.utils.paginator import (
     GroupedOffsetPaginator,
@@ -56,6 +60,18 @@
     UserFavorite,
 )
 
+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 WorkspaceViewViewSet(BaseViewSet):
     serializer_class = IssueViewSerializer
@@ -190,7 +206,8 @@ def destroy(self, request, slug, pk):
 
 
 class WorkspaceViewIssuesViewSet(BaseViewSet):
-    def get_queryset(self):
+    def get_queryset(self, filters):
+        custom_properties = filters.get("custom_properties", {})
         return (
             Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
@@ -274,6 +291,18 @@ def get_queryset(self):
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
             )
+            .filter(
+                *[
+                    Q(
+                        id__in=IssueCustomProperty.objects.filter(
+                            issue_id=OuterRef("id"),
+                            key=group_key,
+                            value__in=values
+                        ).values("issue_id")
+                    )
+                    for group_key, values in custom_properties.items()
+                ]
+            )
         )
 
     @method_decorator(gzip_page)
@@ -281,13 +310,32 @@ def get_queryset(self):
         allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST],
         level="WORKSPACE",
     )
+
+    def listCustomProperty(self, request, slug):
+        customPropertyAllowedKeys = ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP.get(slug, [])
+        custom_properties = IssueCustomProperty.objects.filter(key__in=customPropertyAllowedKeys)
+        serializer = IssueCustomPropertySerializer(custom_properties, many=True)
+
+        groupedCustomProperties = {}
+        for item in serializer.data:
+            key = item.get("key")
+            value = item.get("value")
+            if value is None or key not in customPropertyAllowedKeys:
+                continue
+            groupedCustomProperties.setdefault(key, set()).add(value)
+
+        groupedUniqueCustomProperties = {key: list(values) for key, values in groupedCustomProperties.items()}
+        return Response(groupedUniqueCustomProperties, status=status.HTTP_200_OK)
+    
     def list(self, request, slug):
         filters = issue_filters(request.query_params, "GET")
+        filtersWithoutCustomProperties = filters.copy()
+        filtersWithoutCustomProperties.pop('custom_properties', None)
         order_by_param = request.GET.get("order_by", "-created_at")
 
         issue_queryset = (
-            self.get_queryset()
-            .filter(**filters)
+            self.get_queryset(filters)
+            .filter(**filtersWithoutCustomProperties)
             .annotate(
                 cycle_id=Subquery(
                     CycleIssue.objects.filter(
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..a62650edaa9 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(
@@ -83,11 +83,10 @@ def initiate(self):
         # Check if the key already exists in python
         if ri.exists(key):
             data = json.loads(ri.get(key))
-
             current_attempt = data["current_attempt"] + 1
-
+            email = str(self.key).replace("magic_", "", 1)
+            username = email.replace("@plane-shipsy.com", "", 1)
             if data["current_attempt"] > 2:
-                email = str(self.key).replace("magic_", "", 1)
                 if User.objects.filter(email=email).exists():
                     raise AuthenticationException(
                         error_code=AUTHENTICATION_ERROR_CODES[
@@ -109,11 +108,19 @@ def initiate(self):
                 "current_attempt": current_attempt,
                 "email": str(self.key),
                 "token": token,
+                "username": username
             }
-            expiry = 600
+            expiry = 30
+            print(key, value)
             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)
@@ -121,21 +128,26 @@ def initiate(self):
 
     def set_user_data(self):
         ri = redis_instance()
+        keys = ri.keys('*')
+        print("All keys in redis:", keys)
+        print("Key to be checked:", self.key)
         if ri.exists(self.key):
             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": "",
                             "provider_id": "",
-                            "is_password_autoset": True,
+                            "is_password_autoset": False,
                         },
                     }
                 )
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..99c686eb0c7 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,112 @@ def post(self, request):
             )
 
 
-class MagicSignInEndpoint(View):
+class MagicSignInEndpoint(BaseAPIView):
+    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)
+        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,
+                role=15
+            )
+            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.is_password_autoset = False
+                user.profile.company_name = workspace.name
+                user.save()
+                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': 'TICKET',
+            'workspace_id': workspace.id,
+            'name': 'TICKET'
+        }
+        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 +208,83 @@ 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"
+            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()
+                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)
+                self.add_user_to_workspace(user, workspace)
+                # Get the redirection path
+                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,
+                )
+                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)
                 # Get the redirection path
                 path = (
                     str(next_path)
                     if next_path
-                    else str(get_redirection_path(user=user))
+                    else "/" + workspace
                 )
-            # redirect to referer path
-            url = urljoin(base_host(request=request, is_app=True), path)
-            return HttpResponseRedirect(url)
+                # 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/bgtasks/issue_activities_task.py b/apiserver/plane/bgtasks/issue_activities_task.py
index 371204aa8a6..f374fd14487 100644
--- a/apiserver/plane/bgtasks/issue_activities_task.py
+++ b/apiserver/plane/bgtasks/issue_activities_task.py
@@ -367,14 +367,16 @@ def track_assignees(
     actor_id,
     issue_activities,
     epoch,
+    verb="updated"
 ):
+   
     requested_assignees = (
-        set([str(asg) for asg in requested_data.get("assignee_ids", [])])
+        set([str(asg) for asg in requested_data.get("assignee_ids", requested_data.get("assignees", []))])
         if requested_data is not None
         else set()
     )
     current_assignees = (
-        set([str(asg) for asg in current_instance.get("assignee_ids", [])])
+        set([str(asg) for asg in current_instance.get("assignee_ids", current_instance.get("assignees", []))])
         if current_instance is not None
         else set()
     )
@@ -389,7 +391,7 @@ def track_assignees(
             IssueActivity(
                 issue_id=issue_id,
                 actor_id=actor_id,
-                verb="updated",
+                verb=verb,
                 old_value="",
                 new_value=assignee.display_name,
                 field="assignees",
@@ -597,7 +599,7 @@ def create_issue_activity(
     requested_data = (
         json.loads(requested_data) if requested_data is not None else None
     )
-    if requested_data.get("assignee_ids") is not None:
+    if requested_data.get("assignee_ids") is not None or requested_data.get("assignees")is not None:
         track_assignees(
             requested_data,
             current_instance,
@@ -607,6 +609,7 @@ def create_issue_activity(
             actor_id,
             issue_activities,
             epoch,
+            "created"
         )
 
 
@@ -1607,6 +1610,71 @@ def create_inbox_activity(
         )
 
 
+# Track custom property
+def update_custom_property_activity(
+    requested_data,
+    current_instance,
+    issue_id,
+    project_id,
+    workspace_id,
+    actor_id,
+    issue_activities,
+    epoch,
+):
+    if isinstance(current_instance, str):
+        current_instance = json.loads(current_instance)
+    if isinstance(requested_data, str):
+        requested_data = json.loads(requested_data)
+    custom_property_key = current_instance.get("key", "unknown_key")
+    if current_instance.get("value") != requested_data.get("value"):
+        issue_activities.append(
+            IssueActivity(
+                issue_id=issue_id,
+                actor_id=actor_id,
+                verb="updated",
+                old_value=current_instance.get("value"),
+                new_value=requested_data.get("value"),
+                field=f"Custom Property {custom_property_key}",
+                project_id=project_id,
+                workspace_id=workspace_id,
+                comment=f"updated the custom property ({custom_property_key}) to",
+                epoch=epoch,
+            )
+        )
+
+
+# Track custom property addition
+def create_custom_property_activity(
+    requested_data,
+    current_instance,
+    issue_id,
+    project_id,
+    workspace_id,
+    actor_id,
+    issue_activities,
+    epoch,
+):
+    if isinstance(current_instance, str):
+        current_instance = json.loads(current_instance)
+    if isinstance(requested_data, str):
+        requested_data = json.loads(requested_data)
+    custom_property_key = requested_data.get("key", "unknown_key")
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            actor_id=actor_id,
+            verb="created",
+            old_value="",
+            new_value=requested_data.get("value"),
+            field=f"Custom Property {custom_property_key}",
+            project_id=project_id,
+            workspace_id=workspace_id,
+            comment=f"added a custom property ({custom_property_key})",
+            epoch=epoch,
+        )
+    )
+
+
 # Receive message from room group
 @shared_task
 def issue_activity(
@@ -1669,6 +1737,8 @@ def issue_activity(
             "issue_draft.activity.updated": update_draft_issue_activity,
             "issue_draft.activity.deleted": delete_draft_issue_activity,
             "inbox.activity.created": create_inbox_activity,
+            "custom_property.activity.updated": update_custom_property_activity,
+            "custom_property.activity.created": create_custom_property_activity,
         }
 
         func = ACTIVITY_MAPPER.get(type)
diff --git a/apiserver/plane/bgtasks/webhook_task.py b/apiserver/plane/bgtasks/webhook_task.py
index 7614c4b2f57..ee35054b120 100644
--- a/apiserver/plane/bgtasks/webhook_task.py
+++ b/apiserver/plane/bgtasks/webhook_task.py
@@ -402,8 +402,10 @@ def webhook_activity(
 
         if event == "issue_comment":
             webhooks = webhooks.filter(issue_comment=True)
-
+            
         for webhook in webhooks:
+            event_data = get_model_data(event=event, event_id=event_id)
+            actor_data = get_model_data(event="user", event_id=actor_id)
             webhook_send_task.delay(
                 webhook=webhook.id,
                 slug=slug,
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/migrations/0091_issue_customer_code_issue_hub_code_and_more.py b/apiserver/plane/db/migrations/0091_issue_customer_code_issue_hub_code_and_more.py
new file mode 100644
index 00000000000..d3d42273346
--- /dev/null
+++ b/apiserver/plane/db/migrations/0091_issue_customer_code_issue_hub_code_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 4.2.14 on 2025-02-18 10:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('db', '0090_rename_issue_type_custom_proerty_issuecustomproperty_issue_type_custom_property'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='issue',
+            name='customer_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='hub_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='reference_number',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='trip_reference_number',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='vendor_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='issue',
+            name='worker_code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
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..a7f84542971 100644
--- a/apiserver/plane/db/models/issue.py
+++ b/apiserver/plane/db/models/issue.py
@@ -45,7 +45,7 @@ def get_default_filters():
         "labels": None,
         "start_date": None,
         "target_date": None,
-        "subscriber": None,
+        "subscriber": None
     }
 
 
@@ -76,6 +76,16 @@ def get_default_display_properties():
         "state": True,
         "sub_issue_count": True,
         "updated_on": True,
+        "trip_reference_number": True,
+        "reference_number": True,
+        "hub_code": True,
+        "hub_name": True,
+        "customer_code": True,
+        "customer_name": True,
+        "vendor_name":True,
+        "vendor_code":True,
+        "worker_code":True,
+        "worker_name":True,
     }
 
 
@@ -133,6 +143,16 @@ class Issue(ProjectBaseModel):
         null=True,
         blank=True,
     )
+    hub_code = models.CharField(max_length=255, blank=True, null=True)
+    vendor_code = models.CharField(max_length=255, blank=True, null=True)
+    customer_code = models.CharField(max_length=255, blank=True, null=True)
+    worker_code = models.CharField(max_length=255, blank=True, null=True)
+    reference_number = models.CharField(max_length=255, blank=True, null=True)
+    trip_reference_number = models.CharField(max_length=255, blank=True, null=True)
+    hub_name = models.CharField(max_length=255, blank=True, null=True)
+    customer_name = models.CharField(max_length=255, blank=True, null=True)
+    vendor_name = models.CharField(max_length=255, blank=True, null=True)
+    worker_name = models.CharField(max_length=255, blank=True, null=True)
     name = models.CharField(max_length=255, verbose_name="Issue Name")
     description = models.JSONField(blank=True, default=dict)
     description_html = models.TextField(blank=True, default="<p></p>")
@@ -709,3 +729,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..67d5f9dc1dc 100644
--- a/apiserver/plane/db/models/issue_type.py
+++ b/apiserver/plane/db/models/issue_type.py
@@ -57,3 +57,28 @@ 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)
+    is_required = models.BooleanField(default=False)
+    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..05774297339 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())
 
@@ -149,7 +153,7 @@
     CORS_ALLOW_ALL_ORIGINS = True
     secure_origins = False
 
-CORS_ALLOW_HEADERS = [*default_headers, "X-API-Key"]
+CORS_ALLOW_HEADERS = [*default_headers, "X-API-Key", "X-Assume-Role"]
 
 # Application Settings
 WSGI_APPLICATION = "plane.wsgi.application"
@@ -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)
@@ -356,7 +362,9 @@
 DATA_UPLOAD_MAX_MEMORY_SIZE = int(os.environ.get("FILE_SIZE_LIMIT", 5242880))
 
 # Cookie Settings
+# SESSION_COOKIE_SECURE = True
 SESSION_COOKIE_SECURE = secure_origins
+# SESSION_COOKIE_SAMESITE = "None"
 SESSION_COOKIE_HTTPONLY = True
 SESSION_ENGINE = "plane.db.models.session"
 SESSION_COOKIE_AGE = os.environ.get("SESSION_COOKIE_AGE", 604800)
@@ -371,8 +379,10 @@
 ADMIN_SESSION_COOKIE_AGE = os.environ.get("ADMIN_SESSION_COOKIE_AGE", 3600)
 
 # CSRF cookies
+# CSRF_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = secure_origins
-CSRF_COOKIE_HTTPONLY = True
+# CSRF_COOKIE_SAMESITE = "None"
+CSRF_COOKIE_HTTPONLY = False
 CSRF_TRUSTED_ORIGINS = cors_allowed_origins
 CSRF_COOKIE_DOMAIN = os.environ.get("COOKIE_DOMAIN", None)
 CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
@@ -381,7 +391,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..72057c79ac9 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
@@ -31,7 +38,6 @@ def __init__(self, request=None):
         self.aws_s3_endpoint_url = os.environ.get(
             "AWS_S3_ENDPOINT_URL"
         ) or os.environ.get("MINIO_ENDPOINT_URL")
-
         if os.environ.get("USE_MINIO") == "1":
             # Create an S3 client for MinIO
             self.s3_client = boto3.client(
@@ -40,7 +46,7 @@ def __init__(self, request=None):
                 aws_secret_access_key=self.aws_secret_access_key,
                 region_name=self.aws_region,
                 endpoint_url=(
-                    f"{request.scheme}://{request.get_host()}"
+                    f"https://{request.get_host()}"
                     if request
                     else self.aws_s3_endpoint_url
                 ),
@@ -82,6 +88,7 @@ def generate_presigned_post(
 
         # Generate the presigned POST URL
         try:
+            
             # Generate a presigned URL for the S3 object
             response = self.s3_client.generate_presigned_post(
                 Bucket=self.aws_storage_bucket_name,
@@ -90,6 +97,7 @@ def generate_presigned_post(
                 Conditions=conditions,
                 ExpiresIn=expiration,
             )
+            
         # Handle errors
         except ClientError as e:
             print(f"Error generating presigned POST URL: {e}")
diff --git a/apiserver/plane/utils/constants.py b/apiserver/plane/utils/constants.py
index a4d1e1ea662..36f411eaba7 100644
--- a/apiserver/plane/utils/constants.py
+++ b/apiserver/plane/utils/constants.py
@@ -33,3 +33,16 @@
     "signup",
     "config",
 ]
+
+ALLOWED_CUSTOM_PROPERTY_WORKSPACE_MAP = {
+    "heineken": [
+        "Hub Code",
+        "Customer Name",
+        "Vendor Code",
+        "Vendor Name",
+        "Customer Code",
+        "Consignment Number",
+        "Trip Number",
+        "Hub Name"
+    ]
+}
\ No newline at end of file
diff --git a/apiserver/plane/utils/grouper.py b/apiserver/plane/utils/grouper.py
index 38ac74a1647..945747f7237 100644
--- a/apiserver/plane/utils/grouper.py
+++ b/apiserver/plane/utils/grouper.py
@@ -94,6 +94,16 @@ def issue_on_results(issues, group_by, sub_group_by):
         "is_draft",
         "archived_at",
         "state__group",
+        "trip_reference_number",
+        "reference_number",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "vendor_name",
+        "vendor_code",
+        "worker_code",
+        "worker_name",
     ]
 
     if group_by in FIELD_MAPPER:
diff --git a/apiserver/plane/utils/issue_filters.py b/apiserver/plane/utils/issue_filters.py
index b82ba1e8c75..e8b94c48103 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)$")
@@ -267,7 +268,9 @@ def filter_created_by(params, issue_filter, method, prefix=""):
         ]
         if "None" in created_bys:
             issue_filter[f"{prefix}created_by__isnull"] = True
+        print(created_bys)
         created_bys = filter_valid_uuids(created_bys)
+
         if len(created_bys) and "" not in created_bys:
             issue_filter[f"{prefix}created_by__in"] = created_bys
     else:
@@ -280,6 +283,25 @@ def filter_created_by(params, issue_filter, method, prefix=""):
     return issue_filter
 
 
+def filter_created_by_username(params, issue_filter, method, prefix=""):
+    if method == "GET":
+        created_bys = [
+            item
+            for item in params.get("created_by_username").split(",")
+            if item != "null"
+        ]
+        if len(created_bys) and "" not in created_bys:
+            issue_filter[f"{prefix}created_by__username__in"] = created_bys
+    # else:
+    #     if (
+    #         params.get("created_by", None)
+    #         and len(params.get("created_by"))
+    #         and params.get("created_by") != "null"
+    #     ):
+    #         issue_filter[f"{prefix}created_by__in"] = params.get("created_by")
+    return issue_filter
+
+
 def filter_name(params, issue_filter, method, prefix=""):
     if params.get("name", "") != "":
         issue_filter[f"{prefix}name__icontains"] = params.get("name")
@@ -538,6 +560,65 @@ 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
+        
+        groupedCustomProperties = {}
+        for row in custom_properties:
+            key, value = row.split(':')
+            if key not in groupedCustomProperties:
+                groupedCustomProperties[key] = []
+            groupedCustomProperties[key].append(value)
+
+        issue_filter['custom_properties'] = groupedCustomProperties
+
+    print(issue_filter)
+    return issue_filter
+
+def filter_character_fields(params, issue_filter, method, prefix=""):
+    character_fields = [
+        "trip_reference_number",
+        "reference_number",
+        "hub_code",
+        "hub_name",
+        "customer_code",
+        "customer_name",
+        "vendor_name",
+        "vendor_code",
+        "worker_code",
+        "worker_name",
+    ]
+
+    for field in character_fields:
+        value = params.get(field, "").strip()  # Remove spaces to avoid blank entries
+        if value:  
+            issue_filter[f"{prefix}{field}__iexact"] = value  # Case-insensitive filtering
+
+    return issue_filter
+
+def filter_issue_type_id(params, issue_filter, method, prefix=""):
+    """
+    Filter issues by type_id
+    """
+    type_id = params.get(f"{prefix}type_id", None)
+    if type_id is not None:
+        issue_filter[f"{prefix}type_id"] = type_id
+
 def issue_filters(query_params, method, prefix=""):
     issue_filter = {}
 
@@ -551,6 +632,7 @@ def issue_filters(query_params, method, prefix=""):
         "assignees": filter_assignees,
         "mentions": filter_mentions,
         "created_by": filter_created_by,
+        "created_by_username": filter_created_by_username,
         "logged_by": filter_logged_by,
         "name": filter_name,
         "created_at": filter_created_at,
@@ -559,6 +641,7 @@ def issue_filters(query_params, method, prefix=""):
         "target_date": filter_target_date,
         "completed_at": filter_completed_at,
         "type": filter_issue_state_type,
+        "type_id": filter_issue_type_id,
         "project": filter_project,
         "cycle": filter_cycle,
         "module": filter_module,
@@ -566,10 +649,13 @@ 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():
         if key in query_params:
             func = value
             func(query_params, issue_filter, method, prefix)
+            
+    filter_character_fields(query_params, issue_filter, method, prefix)
     return issue_filter
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/apiserver/supervisord.conf b/apiserver/supervisord.conf
new file mode 100644
index 00000000000..d4f4eebe3cb
--- /dev/null
+++ b/apiserver/supervisord.conf
@@ -0,0 +1,16 @@
+[supervisord]
+nodaemon=true
+
+[program:celery]
+command=celery -A plane worker -l info
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/celery.err.log
+stdout_logfile=/var/log/celery.out.log
+
+[program:flower]
+command=celery -A plane flower --port=5555
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/flower.err.log
+stdout_logfile=/var/log/flower.out.log
\ No newline at end of file
diff --git a/apiserver/templates/emails/exports/analytics.html b/apiserver/templates/emails/exports/analytics.html
index d2caa9d7a41..c21d67f8e9e 100644
--- a/apiserver/templates/emails/exports/analytics.html
+++ b/apiserver/templates/emails/exports/analytics.html
@@ -1,2 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 
-<html> Hey there,<br/> Your requested data export from Plane Analytics is now ready. The information has been compiled into a CSV format for your convenience.<br/> Please find the attachment and download the CSV file. This file can easily be imported into any spreadsheet program for further analysis.<br/> If you require any assistance or have any questions, please do not hesitate to contact us.<br/> Thank you </html>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html> Hey there,<br /> Your requested data export from Plane Analytics is now ready. The information has been compiled
+into a CSV format for your convenience.<br /> Please find the attachment and download the CSV file. This file can easily
+be imported into any spreadsheet program for further analysis.<br /> If you require any assistance or have any
+questions, please do not hesitate to contact us.<br /> Thank you
+
+</html>
\ No newline at end of file
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/deploy/selfhost/install.sh b/deploy/selfhost/install.sh
index 08cd4d9169e..185a1a05600 100755
--- a/deploy/selfhost/install.sh
+++ b/deploy/selfhost/install.sh
@@ -182,7 +182,7 @@ function buildYourOwnImage(){
     local PLANE_TEMP_CODE_DIR=~/tmp/plane
     rm -rf $PLANE_TEMP_CODE_DIR
     mkdir -p $PLANE_TEMP_CODE_DIR
-    REPO=https://github.com/makeplane/plane.git
+    REPO=https://github.com/shipsy/plane.git
     git clone "$REPO" "$PLANE_TEMP_CODE_DIR"  --branch "$BRANCH" --single-branch --depth 1
 
     cp "$PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml" "$PLANE_TEMP_CODE_DIR/build.yml"
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
index 392c55a113e..473fc8a4fc9 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
@@ -34,6 +20,8 @@ services:
     environment:
       MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+    ports:
+      - 9090:9090
 
   plane-db:
     image: postgres:15.7-alpine
@@ -47,6 +35,8 @@ services:
       - .env
     environment:
       PGDATA: /var/lib/postgresql/data
+    ports:
+      - 5432:5432
 
   web:
     build:
@@ -122,6 +112,8 @@ services:
     depends_on:
       - plane-db
       - plane-redis
+    stdin_open: true
+    tty: true
 
   worker:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index 861fa9dd89f..a15bec98aa1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,174 +7,177 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: always
-    command: node web/server.js web
-    depends_on:
-      - api
+    volumes:
+      - ./web:/app/web
+      - ./output:/app/out
+    command: tail -f #node web/server.js web
+    # depends_on:
+    #   - api
 
-  admin:
-    container_name: admin
-    build:
-      context: .
-      dockerfile: ./admin/Dockerfile.admin
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node admin/server.js admin
-    depends_on:
-      - api
-      - web
+#   admin:
+#     container_name: admin
+#     build:
+#       context: .
+#       dockerfile: ./admin/Dockerfile.admin
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node admin/server.js admin
+#     depends_on:
+#       - api
+#       - web
 
-  space:
-    container_name: space
-    build:
-      context: .
-      dockerfile: ./space/Dockerfile.space
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node space/server.js space
-    depends_on:
-      - api
-      - web
+#   space:
+#     container_name: space
+#     build:
+#       context: .
+#       dockerfile: ./space/Dockerfile.space
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node space/server.js space
+#     depends_on:
+#       - api
+#       - web
 
-  api:
-    container_name: api
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-api.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - plane-db
-      - plane-redis
+#   api:
+#     container_name: api
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-api.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - plane-db
+#       - plane-redis
 
-  worker:
-    container_name: bgworker
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-worker.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
+#   worker:
+#     container_name: bgworker
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-worker.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - api
+#       - plane-db
+#       - plane-redis
 
-  beat-worker:
-    container_name: beatworker
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: ./bin/docker-entrypoint-beat.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - api
-      - plane-db
-      - plane-redis
+#   beat-worker:
+#     container_name: beatworker
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: ./bin/docker-entrypoint-beat.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - api
+#       - plane-db
+#       - plane-redis
 
-  migrator:
-    container_name: plane-migrator
-    build:
-      context: ./apiserver
-      dockerfile: Dockerfile.api
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: no
-    command: ./bin/docker-entrypoint-migrator.sh
-    env_file:
-      - ./apiserver/.env
-    depends_on:
-      - plane-db
-      - plane-redis
+#   migrator:
+#     container_name: plane-migrator
+#     build:
+#       context: ./apiserver
+#       dockerfile: Dockerfile.api
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: no
+#     command: ./bin/docker-entrypoint-migrator.sh
+#     env_file:
+#       - ./apiserver/.env
+#     depends_on:
+#       - plane-db
+#       - plane-redis
 
-  live:
-    container_name: plane-live
-    build:
-      context: .
-      dockerfile: ./live/Dockerfile.live
-      args:
-        DOCKER_BUILDKIT: 1
-    restart: always
-    command: node live/dist/server.js
+#   live:
+#     container_name: plane-live
+#     build:
+#       context: .
+#       dockerfile: ./live/Dockerfile.live
+#       args:
+#         DOCKER_BUILDKIT: 1
+#     restart: always
+#     command: node live/dist/server.js
 
-  plane-db:
-    container_name: plane-db
-    image: postgres:15.7-alpine
-    restart: always
-    command: postgres -c 'max_connections=1000'
-    volumes:
-      - pgdata:/var/lib/postgresql/data
-    env_file:
-      - .env
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_DB: ${POSTGRES_DB}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      PGDATA: /var/lib/postgresql/data
+#   plane-db:
+#     container_name: plane-db
+#     image: postgres:15.7-alpine
+#     restart: always
+#     command: postgres -c 'max_connections=1000'
+#     volumes:
+#       - pgdata:/var/lib/postgresql/data
+#     env_file:
+#       - .env
+#     environment:
+#       POSTGRES_USER: ${POSTGRES_USER}
+#       POSTGRES_DB: ${POSTGRES_DB}
+#       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+#       PGDATA: /var/lib/postgresql/data
 
-  plane-redis:
-    container_name: plane-redis
-    image: valkey/valkey:7.2.5-alpine
-    restart: always
-    volumes:
-      - redisdata:/data
+#   plane-redis:
+#     container_name: plane-redis
+#     image: valkey/valkey:7.2.5-alpine
+#     restart: always
+#     volumes:
+#       - redisdata:/data
 
-  plane-mq:
-    container_name: plane-mq
-    image: rabbitmq:3.13.6-management-alpine
-    restart: always
-    env_file:
-      - .env
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
-      RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
-    volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
+#   plane-mq:
+#     container_name: plane-mq
+#     image: rabbitmq:3.13.6-management-alpine
+#     restart: always
+#     env_file:
+#       - .env
+#     environment:
+#       RABBITMQ_DEFAULT_USER: ${RABBITMQ_USER}
+#       RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
+#       RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST}
+#     volumes:
+#       - rabbitmq_data:/var/lib/rabbitmq
 
-  plane-minio:
-    container_name: plane-minio
-    image: minio/minio
-    restart: always
-    command: server /export --console-address ":9090"
-    volumes:
-      - uploads:/export
-    environment:
-      MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
-      MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+#   plane-minio:
+#     container_name: plane-minio
+#     image: minio/minio
+#     restart: always
+#     command: server /export --console-address ":9090"
+#     volumes:
+#       - uploads:/export
+#     environment:
+#       MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
+#       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
 
-  # Comment this if you already have a reverse proxy running
-  proxy:
-    container_name: proxy
-    build:
-      context: ./nginx
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - ${NGINX_PORT}:80
-    environment:
-      FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
-      BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
-    depends_on:
-      - web
-      - api
-      - space
-      - admin
+#   # Comment this if you already have a reverse proxy running
+#   proxy:
+#     container_name: proxy
+#     build:
+#       context: ./nginx
+#       dockerfile: Dockerfile
+#     restart: always
+#     ports:
+#       - ${NGINX_PORT}:80
+#     environment:
+#       FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
+#       BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+#     depends_on:
+#       - web
+#       - api
+#       - space
+#       - admin
 
-volumes:
-  pgdata:
-  redisdata:
-  uploads:
-  rabbitmq_data:
+# volumes:
+#   pgdata:
+#   redisdata:
+#   uploads:
+#   rabbitmq_data:
diff --git a/nginx/nginx.conf.dev b/nginx/nginx.conf.dev
index 7b94982104e..8a5a8e62027 100644
--- a/nginx/nginx.conf.dev
+++ b/nginx/nginx.conf.dev
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index 819c00f21d2..7f2c0784560 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -3,6 +3,9 @@ events {
 
 http {
     sendfile on;
+    chunked_transfer_encoding on;
+    client_body_buffer_size 10M;
+    client_max_body_size 50M;
 
     server {
         listen 80;
diff --git a/packages/types/src/issues/issue.d.ts b/packages/types/src/issues/issue.d.ts
index ae4a98d63f0..287a64eb1d9 100644
--- a/packages/types/src/issues/issue.d.ts
+++ b/packages/types/src/issues/issue.d.ts
@@ -58,10 +58,18 @@ export type TIssue = TBaseIssue & {
   issue_link?: TIssueLink[];
   issue_relation?: IssueRelation[];
   issue_related?: IssueRelation[];
+  custom_properties?: Record<string, any>;
+  hub_code?: string[] | null;
+  worker_code?: string[] | null;
+  customer_code?: string[] | null;
+  trip_reference_number?: string[] | null;
+  reference_number?: string[] | null;
+  vendor_code?: string[] | null;
   // tempId is used for optimistic updates. It is not a part of the API response.
   tempId?: string;
   // sourceIssueId is used to store the original issue id when creating a copy of an issue. Used in cloning property values. It is not a part of the API response.
   sourceIssueId?: string;
+  [key: string]: any;
 };
 
 export type TIssueMap = {
diff --git a/packages/types/src/view-props.d.ts b/packages/types/src/view-props.d.ts
index 0c543241eef..2ae3ff29952 100644
--- a/packages/types/src/view-props.d.ts
+++ b/packages/types/src/view-props.d.ts
@@ -77,9 +77,17 @@ export type TIssueParams =
   | "show_empty_groups"
   | "cursor"
   | "per_page"
+  | "hub_code"
   | "issue_type"
   | "layout"
-  | "expand";
+  | "expand"
+  | "customer_code"
+  | "worker_code"
+  | "trip_reference_number"
+  | "reference_number"
+  | "vendor_code"
+  | "custom_properties"
+  | "hub_code";
 
 export type TCalendarLayouts = "month" | "week";
 
@@ -98,6 +106,13 @@ export interface IIssueFilterOptions {
   subscriber?: string[] | null;
   target_date?: string[] | null;
   issue_type?: string[] | null;
+  hub_code?: string[] | null;
+  customer_code?: string[] | null;
+  worker_code?: string[] | null;
+  trip_reference_number?: string[] | null;
+  reference_number?: string[] | null;
+  vendor_code?: string[] | null;
+  custom_properties?: string[] | null;
 }
 
 export interface IIssueDisplayFilterOptions {
diff --git a/space/core/components/issues/filters/selection.tsx b/space/core/components/issues/filters/selection.tsx
index 2b5d54074c7..b8bd632feac 100644
--- a/space/core/components/issues/filters/selection.tsx
+++ b/space/core/components/issues/filters/selection.tsx
@@ -6,7 +6,7 @@ import { Search, X } from "lucide-react";
 // types
 import { IIssueFilterOptions, TIssueFilterKeys } from "@/types/issue";
 // components
-import { FilterPriority, FilterState } from ".";
+import { FilterPriority, FilterState, FilterCustomProperty } from ".";
 
 type Props = {
   filters: IIssueFilterOptions;
diff --git a/space/next.config.js b/space/next.config.js
index d18ce805f4d..de3afceb17c 100644
--- a/space/next.config.js
+++ b/space/next.config.js
@@ -13,7 +13,7 @@ const nextConfig = {
     return [
       {
         source: "/",
-        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }], // clickjacking protection
+        headers: [{ key: "X-Frame-Options", value: "ALLOWALL" }], // clickjacking protection
       },
     ];
   },
diff --git a/web/Dockerfile.web b/web/Dockerfile.web
index d7d924d7a47..eb67cbbc486 100644
--- a/web/Dockerfile.web
+++ b/web/Dockerfile.web
@@ -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/app/[workspaceSlug]/(projects)/header.tsx b/web/app/[workspaceSlug]/(projects)/header.tsx
index a7a19afe6b0..0d6a3e451db 100644
--- a/web/app/[workspaceSlug]/(projects)/header.tsx
+++ b/web/app/[workspaceSlug]/(projects)/header.tsx
@@ -1,17 +1,17 @@
 "use client";
 
-import Image from "next/image";
+// import Image from "next/image";
 import { useTheme } from "next-themes";
 import { Home } from "lucide-react";
 // images
-import githubBlackImage from "/public/logos/github-black.png";
-import githubWhiteImage from "/public/logos/github-white.png";
+// import githubBlackImage from "/public/logos/github-black.png";
+// import githubWhiteImage from "/public/logos/github-white.png";
 // ui
 import { Breadcrumbs, Header } from "@plane/ui";
 // components
 import { BreadcrumbLink } from "@/components/common";
 // constants
-import { GITHUB_REDIRECTED } from "@/constants/event-tracker";
+// import { GITHUB_REDIRECTED } from "@/constants/event-tracker";
 // hooks
 import { useEventTracker } from "@/hooks/store";
 
@@ -33,27 +33,6 @@ export const WorkspaceDashboardHeader = () => {
             </Breadcrumbs>
           </div>
         </Header.LeftItem>
-        <Header.RightItem>
-          <a
-            onClick={() =>
-              captureEvent(GITHUB_REDIRECTED, {
-                element: "navbar",
-              })
-            }
-            className="flex flex-shrink-0 items-center gap-1.5 rounded bg-custom-background-80 px-3 py-1.5"
-            href="https://github.com/makeplane/plane"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <Image
-              src={resolvedTheme === "dark" ? githubWhiteImage : githubBlackImage}
-              height={16}
-              width={16}
-              alt="GitHub Logo"
-            />
-            <span className="hidden text-xs font-medium sm:hidden md:block">Star us on GitHub</span>
-          </a>
-        </Header.RightItem>
       </Header>
     </>
   );
diff --git a/web/app/provider.tsx b/web/app/provider.tsx
index dba975a6373..368e4c9b5d0 100644
--- a/web/app/provider.tsx
+++ b/web/app/provider.tsx
@@ -1,11 +1,11 @@
 "use client";
 
-import { FC, ReactNode } from "react";
+import { FC, ReactNode, useEffect } from "react";
 import dynamic from "next/dynamic";
+import { usePathname } from "next/navigation";//ui
 import { useTheme, ThemeProvider } from "next-themes";
 import { SWRConfig } from "swr";
-// ui
-import { Toast } from "@plane/ui";
+import { Toast, setToast, TOAST_TYPE } from "@plane/ui";
 // constants
 import { SWR_CONFIG } from "@/constants/swr-config";
 //helpers
@@ -18,6 +18,7 @@ import "@/lib/polyfills";
 import { StoreProvider } from "@/lib/store-context";
 // wrappers
 import { InstanceWrapper } from "@/lib/wrappers";
+import { useUser } from "@/hooks/store";
 // dynamic imports
 const StoreWrapper = dynamic(() => import("@/lib/wrappers/store-wrapper"), { ssr: false });
 const PostHogProvider = dynamic(() => import("@/lib/posthog-provider"), { ssr: false });
@@ -35,6 +36,41 @@ const ToastWithTheme = () => {
 export const AppProvider: FC<IAppProvider> = (props) => {
   const { children } = props;
   // themes
+
+  const pathname = usePathname();
+  const { signOut } = useUser();
+
+  const handleSignOut = async () => {
+    await signOut().catch(() =>
+      setToast({
+        type: TOAST_TYPE.ERROR,
+        title: "Error!",
+        message: "Failed to sign out. Please try again.",
+      })
+    );
+  };
+
+  useEffect(() => {
+    console.log(pathname, 'pathname');
+    window.parent.postMessage({ type: "ROUTE_CHANGE", path: pathname }, "*");
+  }, [pathname]);
+
+  useEffect(() => {
+    const onIncomingMessage = async (event) => {
+      console.log('onIncomingMessage', event);
+      if (event.data.type === "PLANE_SIGN_OUT") {
+        try {
+          await handleSignOut();
+          window.parent.postMessage({ type: "PLANE_SIGN_OUT_SUCCESS", path: pathname }, "*");
+        } catch (err) {}
+      }
+    };
+    window.addEventListener('message', onIncomingMessage);
+    return () => {
+      window.removeEventListener("message", onIncomingMessage);
+    };
+  }, []);
+
   return (
     <>
       <AppProgressBar height="4px" color="#3F76FF" options={{ showSpinner: false }} shallowRouting />
diff --git a/web/app/workspace-invitations/page.tsx b/web/app/workspace-invitations/page.tsx
index a6829019892..a715a2f469f 100644
--- a/web/app/workspace-invitations/page.tsx
+++ b/web/app/workspace-invitations/page.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 import useSWR from "swr";
-import { Boxes, Check, Share2, Star, User2, X } from "lucide-react";
+import { Boxes, Check, Share2, User2, X } from "lucide-react";
 // components
 import { LogoSpinner } from "@/components/common";
 import { EmptySpace, EmptySpaceItem } from "@/components/ui/empty-space";
@@ -107,7 +107,6 @@ const WorkspaceInvitationPage = observer(() => {
               ) : (
                 <EmptySpaceItem Icon={Boxes} title="Continue to home" href="/" />
               )}
-              <EmptySpaceItem Icon={Star} title="Star us on GitHub" href="https://github.com/makeplane" />
               <EmptySpaceItem
                 Icon={Share2}
                 title="Join our community of active creators"
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/issues/custom-properties.tsx b/web/core/components/issues/custom-properties.tsx
new file mode 100644
index 00000000000..3be049ab0ba
--- /dev/null
+++ b/web/core/components/issues/custom-properties.tsx
@@ -0,0 +1,192 @@
+import React, { useState, useEffect } from "react";
+import { Pencil } from "lucide-react";
+import axios from "axios";
+
+export type CustomProperty = {
+  key: string;
+  value: string;
+  issue_type_custom_property: string;
+  is_required: boolean;
+};
+
+type CustomPropertiesProps = {
+  customProperties?: CustomProperty[];
+  issue_type_id: string;
+  workspaceSlug: string;
+  updateCustomProperties: (updatedProperties: CustomProperty[]) => void;
+  layout?: "quarter" | "two-fifths";
+};
+
+export const CustomProperties: React.FC<CustomPropertiesProps> = ({
+  customProperties,
+  issue_type_id,
+  workspaceSlug,
+  updateCustomProperties,
+  layout = "quarter",
+}) => {
+  const [issueTypeCustomProperties, setissueTypeCustomProperties] = useState<CustomProperty[]>([]);
+  const [error, setError] = useState<string | null>(null);
+  const [editingPropertyKey, setEditingPropertyKey] = useState<string | null>(null);
+  const [localCustomProperties, setLocalCustomProperties] = useState<CustomProperty[]>([]);
+
+  useEffect(() => {
+    const getIssueTypeCustomProperties = async () => {
+      try {
+        const response = await axios.get(
+          `/api/v1/workspaces/${workspaceSlug}/issue-type/${issue_type_id}/custom-properties/`,
+          {
+            headers: {
+              'x-api-key': 'TEST_API_TOKEN',
+            }
+          }
+        );
+        setissueTypeCustomProperties(response.data);
+      } catch (error) {
+        setError("Failed to load custom properties.");
+      }
+    };
+
+    getIssueTypeCustomProperties();
+  }, [workspaceSlug, issue_type_id]);
+
+  useEffect(() => {
+    if (customProperties) {
+      setLocalCustomProperties(customProperties);
+    }
+  }, [customProperties]);
+
+  const mergedCustomProperties = issueTypeCustomProperties.map((customProp) => {
+    const customProperty = localCustomProperties?.find(
+      (prop) => prop.key === customProp.name
+    );
+
+    return {
+      key: customProp.name,
+      value: customProperty ? customProperty.value : "",
+      issue_type_custom_property: customProp.id,
+      is_required: customProp.is_required,
+      id: customProperty ? customProperty.id : "",
+    };
+  });
+
+  if (error) {
+    return <div className="error-message">{error}</div>;
+  }
+
+  if (!Array.isArray(mergedCustomProperties) || mergedCustomProperties.length === 0) {
+    return null;
+  }
+
+  const handlePropertyUpdate = async (updatedProperty: CustomProperty) => {
+    try {
+      setLocalCustomProperties(prev => {
+        const updatedProperties = [...(prev || [])];
+        const existingIndex = updatedProperties.findIndex(p => p.key === updatedProperty.key);
+        
+        if (existingIndex >= 0) {
+          updatedProperties[existingIndex] = {...updatedProperties[existingIndex], ...updatedProperty};
+        } else {
+          updatedProperties.push(updatedProperty);
+        }
+        
+        return updatedProperties;
+      });
+      
+      await updateCustomProperties([updatedProperty]);
+    } catch (error) {
+      console.error("Failed to update custom property:", error);
+    }
+  };
+
+  const EditableProperty: React.FC<{ property: CustomProperty }> = React.memo(({ property }) => {
+    const [value, setValue] = useState(property.value);
+    const [localError, setLocalError] = useState<string | null>(null);
+
+    const handleBlur = async () => {
+      if (property.is_required && value.trim() === "") {
+        setLocalError("This field is required and cannot be left empty or consist of spaces.");
+        setValue(property.value);
+        return;
+      }
+
+      if (value !== property.value) {
+        try {
+          const updatedProperty = { ...property, value };
+          await handlePropertyUpdate(updatedProperty);
+          setLocalError(null);
+        } catch (error) {
+          setLocalError("Failed to update custom property.");
+        }
+      }
+
+      setEditingPropertyKey(null);
+      setLocalError(null);
+    };
+
+    const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+      setValue(e.target.value);
+      setLocalError(null);
+    };
+
+    return (
+      <div>
+        <input
+          type="text"
+          value={value}
+          onChange={handleChange}
+          onBlur={handleBlur}
+          autoFocus
+          placeholder={`Add ${property.key}`}
+          className="text-sm w-full border rounded px-2 py-1 focus:outline-none focus:ring-2 focus:ring-custom-primary-100"
+        />
+        {localError && (
+          <div className="text-red-500 text-sm mt-1">{localError}</div>
+        )}
+      </div>
+    );
+  });
+
+  const labelWidth = layout === "two-fifths" ? "w-2/5" : "w-1/4";
+  const valueWidth = layout === "two-fifths" ? "w-3/5" : "w-3/4";
+
+  return (
+    <div className="w-full">
+      <hr className="flex-shrink-0 border-custom-sidebar-border-300 h-[0.5px] w-full mx-auto my-1" />
+
+      <div className="space-y-2">
+        {mergedCustomProperties.map((element) => (
+          <div key={element.key} className="flex w-full items-center gap-3 min-h-8">
+            <div className={`flex items-center gap-1 ${labelWidth} flex-shrink-0 text-sm text-custom-text-300 truncate`}>
+              <span>
+                {element.key}
+                {element.is_required && <span className="text-red-500 ml-1">*</span>}
+              </span>
+            </div>
+            <div className={`${valueWidth} flex-grow group text-sm`}>
+              {editingPropertyKey === element.key ? (
+                <EditableProperty property={element} />
+              ) : (
+                <button
+                  type="button"
+                  className="group flex items-center justify-between gap-2 px-2 py-0.5 rounded outline-none w-full hover:bg-custom-background-80"
+                  onClick={() => setEditingPropertyKey(element.key)}
+                >
+                  {element.value ? (
+                    <span className="text-sm text-custom-text-500 whitespace-nowrap overflow-hidden text-ellipsis" title={element.value}>
+                      {element.value}
+                    </span>
+                  ) : (
+                    <span className="text-sm text-custom-text-400">Add {element.key}</span>
+                  )}
+                  <span className="p-1 flex-shrink-0 opacity-0 group-hover:opacity-100 text-custom-text-400">
+                    <Pencil className="h-2.5 w-2.5 flex-shrink-0" />
+                  </span>
+                </button>
+              )}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/web/core/components/issues/index.ts b/web/core/components/issues/index.ts
index 483d53da918..42114945798 100644
--- a/web/core/components/issues/index.ts
+++ b/web/core/components/issues/index.ts
@@ -12,6 +12,7 @@ export * from "./issue-update-status";
 export * from "./create-issue-toast-action-items";
 export * from "./relations";
 export * from "./issue-detail-widgets";
+export * from "./custom-properties";
 
 // issue details
 export * from "./issue-detail";
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx
new file mode 100644
index 00000000000..96c8e352e8e
--- /dev/null
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/custom-properties.tsx
@@ -0,0 +1,45 @@
+"use client";
+
+import { FC } from "react";
+import { observer } from "mobx-react";
+// hooks
+import { useIssueDetail } from "@/hooks/store";
+// components
+import { IssueActivityBlockComponent, IssueLink } from "./";
+// icons
+import { DoubleCircleIcon } from "@plane/ui";
+
+type TIssueCustomPropertyActivity = { activityId: string; showIssue?: boolean; ends: "top" | "bottom" | undefined };
+
+export const IssueCustomPropertyActivity: FC<TIssueCustomPropertyActivity> = observer((props) => {
+  const { activityId, showIssue = true, ends } = props;
+  // hooks
+  const {
+    activity: { getActivityById },
+  } = useIssueDetail();
+
+  const activity = getActivityById(activityId);
+
+  if (!activity) return <></>;
+
+  const isNewProperty = !activity.old_value;
+  const customPropertyKey = activity?.field.replace("Custom Property ", "");
+  const newValue = activity.new_value;
+  const oldValue = activity.old_value;
+
+  return (
+    <IssueActivityBlockComponent
+      icon={<DoubleCircleIcon className="h-4 w-4 flex-shrink-0 text-custom-text-200" />}
+      activityId={activityId}
+      ends={ends}
+    >
+      <>
+        {isNewProperty ? (
+          <>Added a Custom Property <span className="font-medium text-custom-text-100">{customPropertyKey}</span> with value <span className="font-medium text-custom-text-100">{newValue}</span>.</>
+        ) : (
+          <>Updated the value of <span className="font-medium text-custom-text-100">{customPropertyKey}</span> from <span className="font-medium text-custom-text-100">{oldValue}</span> to <span className="font-medium text-custom-text-100">{newValue}</span>.</>
+        )}
+      </>
+    </IssueActivityBlockComponent>
+  );
+});
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts b/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
index ea69163085a..f76b1c66549 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/actions/index.ts
@@ -17,6 +17,7 @@ export * from "./attachment";
 export * from "./archived-at";
 export * from "./inbox";
 export * from "./label-activity-chip";
+export * from "./custom-properties";
 
 // helpers
 export * from "./helpers/activity-block";
diff --git a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
index 18cd3481fe9..6fc4e1e27c4 100644
--- a/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/activity/activity-list.tsx
@@ -24,6 +24,7 @@ import {
   IssueAttachmentActivity,
   IssueArchivedAtActivity,
   IssueInboxActivity,
+  IssueCustomPropertyActivity,
 } from "./actions";
 
 type TIssueActivityItem = {
@@ -42,6 +43,11 @@ export const IssueActivityItem: FC<TIssueActivityItem> = observer((props) => {
   const componentDefaultProps = { activityId, ends };
 
   const activityField = getActivityById(activityId)?.field;
+
+  if (activityField && activityField.startsWith("Custom Property")) {
+    return <IssueCustomPropertyActivity {...componentDefaultProps} />;
+  }
+
   switch (activityField) {
     case null: // default issue creation
       return <IssueDefaultActivity {...componentDefaultProps} />;
diff --git a/web/core/components/issues/issue-detail/sidebar.tsx b/web/core/components/issues/issue-detail/sidebar.tsx
index 102dc6e5a33..e3a0ae77ed6 100644
--- a/web/core/components/issues/issue-detail/sidebar.tsx
+++ b/web/core/components/issues/issue-detail/sidebar.tsx
@@ -2,7 +2,8 @@
 
 import React from "react";
 import { observer } from "mobx-react";
-import { CalendarCheck2, CalendarClock, LayoutPanelTop, Signal, Tag, Triangle, UserCircle2, Users } from "lucide-react";
+import { CalendarCheck2, CalendarClock, LayoutPanelTop, Signal, Tag, Triangle, UserCircle2, Users, Info } from "lucide-react";
+import axios from "axios";
 // ui
 import { ContrastIcon, DiceIcon, DoubleCircleIcon } from "@plane/ui";
 // components
@@ -14,7 +15,7 @@ import {
   StateDropdown,
 } from "@/components/dropdowns";
 import { ButtonAvatars } from "@/components/dropdowns/member/avatar";
-import { IssueCycleSelect, IssueLabel, IssueModuleSelect, IssueParentSelect } from "@/components/issues";
+import { IssueCycleSelect, IssueLabel, IssueModuleSelect, IssueParentSelect, CustomProperties} from "@/components/issues";
 // helpers
 import { cn } from "@/helpers/common.helper";
 import { getDate, renderFormattedPayloadDate } from "@/helpers/date-time.helper";
@@ -26,6 +27,8 @@ import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issu
 import { IssueWorklogProperty } from "@/plane-web/components/issues";
 // components
 import type { TIssueOperations } from "./root";
+import { ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
+import { CustomProperty } from "../custom-properties";
 
 type Props = {
   workspaceSlug: string;
@@ -53,13 +56,52 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
   // derived values
   const projectDetails = getProjectById(issue.project_id);
   const stateDetails = getStateById(issue.state_id);
-
+  const customProperties = issue?.custom_properties || [];
+  const issue_type_id = issue?.type_id || "afd30f86-5ae5-428c-aa3a-e633ea973740";
   const minDate = issue.start_date ? getDate(issue.start_date) : null;
   minDate?.setDate(minDate.getDate());
 
   const maxDate = issue.target_date ? getDate(issue.target_date) : null;
   maxDate?.setDate(maxDate.getDate());
 
+  const handleCustomPropertiesUpdate = async (updatedProperties: CustomProperty[]) => {
+    try {
+      const updateRequests = updatedProperties.map((property) => {
+        const customPropertyId = property?.id || "";
+        const apiUrl = `/api/v1/workspaces/${workspaceSlug}/issues/${issueId}/custom-properties/`;
+        if (customPropertyId) {
+          return axios.patch(
+            `${apiUrl}${customPropertyId}/`, 
+            { value: property.value },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        } else {
+          return axios.post(
+            apiUrl, 
+            {
+              key: property.key,
+              value: property.value,
+              issue_type_custom_property: property.issue_type_custom_property,
+            },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        }
+      });
+      await Promise.all(updateRequests);
+    } catch (error) {
+    }
+  };
+
   return (
     <>
       <div className="flex items-center h-full w-full flex-col divide-y-2 divide-custom-border-200 overflow-hidden">
@@ -282,7 +324,7 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
                 />
               </div>
             </div>
-
+            
             <IssueWorklogProperty
               workspaceSlug={workspaceSlug}
               projectId={projectId}
@@ -299,6 +341,28 @@ export const IssueDetailsSidebar: React.FC<Props> = observer((props) => {
                 isDisabled={!isEditable}
               />
             )}
+
+            {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) =>
+              issue[prop.key] ? (
+                <div key={prop?.key} className="flex min-h-8 gap-2 align-items-center">
+                  <div className="flex w-2/5 flex-shrink-0 gap-1 pt-2 text-sm text-custom-text-300">
+                    <Info className="h-4 w-4 flex-shrink-0 mt-0.5" />
+                    <span>{prop?.title}</span>
+                  </div>
+                  <div className="h-full min-h-8 w-3/5 mt-1 ml-5 flex-grow">
+                    <span className="text-sm">{issue[prop.key]}</span>
+                  </div>
+                </div>
+              ) : null
+            )}
+
+            <CustomProperties
+              customProperties={Array.isArray(customProperties) ? customProperties : []}
+              issue_type_id={issue_type_id}
+              workspaceSlug={workspaceSlug}
+              updateCustomProperties={handleCustomPropertiesUpdate}
+              layout="two-fifths"
+            />
           </div>
         </div>
       </div>
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx
new file mode 100644
index 00000000000..c90a3533b16
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/additional-properties.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import { observer } from "mobx-react";
+
+// icons
+import { X } from "lucide-react";
+
+type Props = {
+  handleRemove: (val: string) => void;
+  values: string[];
+  editable: boolean | undefined;
+};
+
+export const AppliedAdditionalPropertiesFilters: React.FC<Props> = observer((props) => {
+  const { handleRemove, values } = props;
+
+  return (
+    <>
+      {values.map((element) => (
+        <div key={element} className="flex items-center gap-1 rounded bg-custom-background-80 p-1 text-xs">
+          {element}
+          <button
+            type="button"
+            className="grid place-items-center text-custom-text-300 hover:text-custom-text-200"
+            onClick={() => handleRemove(element)}
+          >
+            <X size={10} strokeWidth={2} />
+          </button>
+        </div>
+      ))}
+    </>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
index 268358efea2..64acb2ccac6 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/filters-list.tsx
@@ -14,6 +14,7 @@ import {
   AppliedProjectFilters,
   AppliedStateFilters,
   AppliedStateGroupFilters,
+  AppliedAdditionalPropertiesFilters
 } from "@/components/issues";
 // constants
 // helpers
@@ -36,6 +37,7 @@ type Props = {
 
 const membersFilters = ["assignees", "mentions", "created_by", "subscriber"];
 const dateFilters = ["start_date", "target_date"];
+const additionalFilters = ["hub_code", "customer_code", "reference_number", "trip_reference_number", "vendor_code", "worker_code"];
 
 export const AppliedFiltersList: React.FC<Props> = observer((props) => {
   const {
@@ -134,6 +136,13 @@ export const AppliedFiltersList: React.FC<Props> = observer((props) => {
                 values={value}
               />
             )}
+            {additionalFilters?.includes(filterKey) && (
+              <AppliedAdditionalPropertiesFilters
+                editable={isEditingAllowed}
+                handleRemove={(val) => handleRemoveFilter(filterKey, val)}
+                values={value}
+              />
+            )}
             {isEditingAllowed && (
               <button
                 type="button"
diff --git a/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts b/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
index ba074e84f8b..a26443969c3 100644
--- a/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
+++ b/web/core/components/issues/issue-layouts/filters/applied-filters/index.ts
@@ -9,3 +9,4 @@ export * from "./module";
 export * from "./cycle";
 export * from "./state";
 export * from "./state-group";
+export * from "./additional-properties";
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx
new file mode 100644
index 00000000000..4921eddb09b
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/additional-properties.tsx
@@ -0,0 +1,80 @@
+"use client";
+
+import React, { useEffect, useState } from "react";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { FilterHeader, FilterOption } from "@/components/issues";
+import { WorkspaceService } from "@/services/workspace.service";
+import { API_BASE_URL } from "@/helpers/common.helper";
+
+type Props = {
+  appliedFilters: string[] | null;
+  handleUpdate: (val: string) => void;
+  additionalPropertyTitle: string | undefined;
+  additionalPropertyKey: string | undefined;
+  searchQuery: string;
+};
+
+export const FilterAdditionalProperties: React.FC<Props> = observer((props) => {
+  const { workspaceSlug, projectId } = useParams();
+  const { appliedFilters, handleUpdate, searchQuery, additionalPropertyTitle, additionalPropertyKey } = props;
+  const workspaceService = new WorkspaceService(API_BASE_URL);
+  
+  const [options, setOptions] = useState<{ label: string; value: string }[]>([]);
+  const [previewEnabled, setPreviewEnabled] = useState(true);
+  const [visibleOptions, setVisibleOptions] = useState(5); 
+
+  useEffect(() => {
+    const fetchOptions = async () => {
+      try {
+        const response = await workspaceService.getIssueAdditionalProperties(workspaceSlug.toString(), projectId.toString(), props.additionalPropertyKey);
+        const formattedOptions = response.data.map((item: string) => ({ label: item, value: item })) || [];
+        setOptions(formattedOptions);
+      } catch (error) {
+        console.error(`Error fetching ${additionalPropertyKey} options:`, error);
+      }
+    };
+
+    fetchOptions();
+  }, [workspaceSlug, projectId, additionalPropertyKey]);
+
+  const filteredOptions = searchQuery
+    ? options.filter((option: any) => option?.label.toLowerCase().includes(searchQuery.toLowerCase()))
+    : options;
+
+  return (
+    <>
+      <FilterHeader
+        title={`${additionalPropertyTitle} ${appliedFilters?.length ? `(${appliedFilters.length})` : ""}`}
+        isPreviewEnabled={previewEnabled}
+        handleIsPreviewEnabled={() => setPreviewEnabled(!previewEnabled)}
+      />
+      {previewEnabled && (
+        <div>
+          {filteredOptions.length > 0 ? (
+            <>
+              {filteredOptions.slice(0, visibleOptions).map(({ label, value }) => (
+                <FilterOption
+                  key={value}
+                  isChecked={appliedFilters?.includes(value) ?? false}
+                  onClick={() => handleUpdate(value)}
+                  title={label}
+                />
+              ))}
+              {filteredOptions.length > 5 && (
+                <button
+                  className="text-blue-500 text-xs mt-2"
+                  onClick={() => setVisibleOptions(visibleOptions === 5 ? filteredOptions.length : 5)}
+                >
+                  {visibleOptions === 5 ? "View More" : "View Less"}
+                </button>
+              )}
+            </>
+          ) : (
+            <p className="text-xs italic text-custom-text-400">No Matches Found</p>
+          )}
+        </div>
+      )}
+    </>
+  );
+});
\ No newline at end of file
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx
new file mode 100644
index 00000000000..e67eaaac70d
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/custom-properties.tsx
@@ -0,0 +1,142 @@
+"use client";
+
+import React, { useMemo, useState } from "react";
+// import sortBy from "lodash/sortBy";
+import { observer } from "mobx-react";
+import { useParams } from "next/navigation";
+import { IState } from "@plane/types";
+import { WorkspaceService } from "@/services/workspace.service";
+import { API_BASE_URL } from "@/helpers/common.helper";
+// import { Loader, StateGroupIcon } from "@plane/ui";
+import { FilterHeader, FilterOption } from "@/components/issues";
+
+type Props = {
+  appliedFilters: string[] | null;
+  handleUpdate: (val: string) => void;
+  searchQuery: string;
+};
+
+export const FilterCustomProperty: React.FC<Props> = observer((props) => {
+  const { workspaceSlug } = useParams();
+  const workspaceService = new WorkspaceService(API_BASE_URL);
+  const { appliedFilters, handleUpdate, searchQuery } = props;
+
+  const [mainPreviewEnabled, setMainPreviewEnabled] = useState(true);
+  const [groupPreviewEnabled, setGroupPreviewEnabled] = useState<Record<string, boolean>>({});
+  const [renderMoreGroupItems, setRenderMoreGroupItems] = useState<Record<string, boolean>>({});
+  const [groupedProperties, setGroupedProperties] = useState<Record<string, any[]>>({});
+
+  const appliedFiltersCount = appliedFilters?.length ?? 0;
+
+  const handleViewToggle = (groupKey: string) => {
+    setRenderMoreGroupItems((prev) => {
+      return {
+        ...prev,
+        [groupKey]: !prev[groupKey]
+      };
+    });
+  };
+
+  React.useEffect(() => {
+    const fetchCustomProperties = async (): Promise<void> => {
+      try {
+        const data = await workspaceService.getIssuesCustomProperties(workspaceSlug.toString());
+    
+        if (Array.isArray(data)) {
+          // Convert array to an object with group keys
+          const groupedData: Record<string, any[]> = data.reduce((acc, item) => {
+            const key = item.group || "default"; // Adjust based on API response
+            acc[key] = acc[key] ? [...acc[key], item] : [item];
+            return acc;
+          }, {} as Record<string, any[]>);
+    
+          setGroupedProperties(groupedData);
+        } else {
+          setGroupedProperties(data);
+        }
+    
+        Object.keys(data).forEach((groupKey) => {
+          setGroupPreviewEnabled((prev) => ({
+            ...prev,
+            [groupKey]: true,
+          }));
+        });
+      } catch (error) {
+        console.error("Error fetching custom properties:", error);
+      }
+    };
+    
+
+    fetchCustomProperties();
+  }, [workspaceSlug]);
+
+  const filteredGroupOptions = useMemo(() => {
+    return Object.keys(groupedProperties).reduce<Record<string, any[]>>((acc, groupKey) => {
+      const properties = groupedProperties[groupKey];
+
+      const filteredValues = properties
+        .filter((property) => property?.toLowerCase()?.includes(searchQuery.toLowerCase()))
+        .map((property) => property);
+
+      if (filteredValues?.length > 0) {
+        acc[groupKey] = filteredValues;
+      }
+
+      return acc;
+    }, {});
+  }, [searchQuery, groupedProperties]);
+
+  const toggleGroupPreview = (groupKey: string) => {
+    setGroupPreviewEnabled((prev) => ({
+      ...prev,
+      [groupKey]: !prev[groupKey],
+    }));
+  };
+
+  return (
+    <>
+      <FilterHeader
+        title={`Custom Properties${appliedFiltersCount > 0 ? ` (${appliedFiltersCount})` : ""}`}
+        isPreviewEnabled={mainPreviewEnabled}
+        handleIsPreviewEnabled={() => setMainPreviewEnabled(!mainPreviewEnabled)}
+      />
+      {mainPreviewEnabled && (
+        <div>
+          {Object.keys(filteredGroupOptions).map((groupKey) => {
+            const properties = filteredGroupOptions[groupKey];
+            return (
+              <div key={groupKey} className="pl-2">
+                <FilterHeader
+                  title={groupKey}
+                  isPreviewEnabled={groupPreviewEnabled[groupKey]}
+                  handleIsPreviewEnabled={() => toggleGroupPreview(groupKey)}
+                />
+                {groupPreviewEnabled[groupKey] && (
+                  <div>
+                    {properties
+                      .slice(0, renderMoreGroupItems[groupKey] ? properties.length : 5)
+                      .map((property) => (
+                        <FilterOption
+                          key={`${groupKey}:${property}`}
+                          isChecked={appliedFilters?.includes(`${groupKey}:${property}`) ? true : false}
+                          onClick={() => handleUpdate(`${groupKey}:${property}`)}
+                          title={property}
+                        />
+                      ))}
+                    {properties.length > 5 ? <button
+                      type="button"
+                      className="ml-8 text-xs font-medium text-custom-primary-100"
+                      onClick={() => handleViewToggle(groupKey)}
+                    >
+                      {renderMoreGroupItems[groupKey] ? "View less" : "View all"}
+                    </button> : null}
+                  </div>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      )}
+    </>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx b/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
index 0bf180aefa7..71ace44f61a 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/filters-selection.tsx
@@ -16,16 +16,18 @@ import {
   FilterState,
   FilterStateGroup,
   FilterTargetDate,
+  FilterAdditionalProperties,
   FilterCycle,
   FilterModule,
   FilterIssueGrouping,
 } from "@/components/issues";
 // constants
-import { ILayoutDisplayFiltersOptions } from "@/constants/issue";
+import { ILayoutDisplayFiltersOptions, ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
 // hooks
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { FilterIssueTypes } from "@/plane-web/components/issues";
+import { FilterCustomProperty } from "./custom-properties";
 
 type Props = {
   filters: IIssueFilterOptions;
@@ -242,6 +244,31 @@ export const FilterSelection: React.FC<Props> = observer((props) => {
             />
           </div>
         )}
+
+          {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) => (
+            <div className="py-2">
+              <FilterAdditionalProperties
+                key={prop.key}
+                appliedFilters={filters[prop.key as keyof IIssueFilterOptions] ?? null} 
+                additionalPropertyTitle={prop.title}
+                additionalPropertyKey={prop.key} 
+                handleUpdate={(val) => handleFiltersUpdate(prop.key as keyof IIssueFilterOptions, val)} 
+                searchQuery={filtersSearchQuery}
+              />
+            </div>
+          ))}
+
+        {/* custom_properties */}
+        {isFilterEnabled("custom_properties") && (
+          <div className="py-2">
+            <FilterCustomProperty
+              appliedFilters={filters.custom_properties ?? null}
+              handleUpdate={(val) => handleFiltersUpdate("custom_properties", val)}
+              // handleUpdate={(val) => handleFiltersUpdate("custom_properties", null, val)}
+              searchQuery={filtersSearchQuery}
+            />
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/web/core/components/issues/issue-layouts/filters/header/filters/index.ts b/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
index ab5756bf4d7..495020f9244 100644
--- a/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
+++ b/web/core/components/issues/issue-layouts/filters/header/filters/index.ts
@@ -11,3 +11,4 @@ export * from "./state";
 export * from "./cycle";
 export * from "./module";
 export * from "./target-date";
+export * from "./additional-properties";
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts b/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
index 3439d398b41..eec02b8ca18 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/index.ts
@@ -12,3 +12,4 @@ export * from "./sub-issue-column";
 export * from "./updated-on-column";
 export * from "./module-column";
 export * from "./cycle-column";
+export * from "./standard-property-column";
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx
new file mode 100644
index 00000000000..23959e4701a
--- /dev/null
+++ b/web/core/components/issues/issue-layouts/spreadsheet/columns/standard-property-column.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import { observer } from "mobx-react";
+// types
+import { TIssue } from "@plane/types";
+import { Row, Tooltip } from "@plane/ui";
+
+type Props = {
+  issue: TIssue;
+  property: string;
+};
+
+export const SpreadsheetStandardPropertyColumn: React.FC<Props> = observer((props) => {
+  const { issue, property } = props;
+
+  return (
+    <Tooltip tooltipContent={issue?.[property]} disabled={!issue?.[property]}>
+      <Row className="h-11 truncate border-b-[0.5px] border-custom-border-200 pt-[1.25em] text-xs hover:bg-custom-background-80">
+          {issue?.[property]}
+      </Row>
+    </Tooltip>
+  );
+});
diff --git a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
index dcd8773a0f1..9b8fb27e3db 100644
--- a/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
+++ b/web/core/components/issues/issue-layouts/spreadsheet/issue-column.tsx
@@ -43,6 +43,7 @@ export const IssueColumn = observer((props: Props) => {
       >
         <Column
           issue={issueDetail}
+          property={property}
           onChange={(issue: TIssue, data: Partial<TIssue>, updates: any) =>
             updateIssue &&
             updateIssue(issue.project_id, issue.id, data).then(() => {
diff --git a/web/core/components/issues/peek-overview/properties.tsx b/web/core/components/issues/peek-overview/properties.tsx
index fcc706cbb86..b938f268784 100644
--- a/web/core/components/issues/peek-overview/properties.tsx
+++ b/web/core/components/issues/peek-overview/properties.tsx
@@ -2,7 +2,8 @@
 
 import { FC } from "react";
 import { observer } from "mobx-react";
-import { Signal, Tag, Triangle, LayoutPanelTop, CalendarClock, CalendarCheck2, Users, UserCircle2 } from "lucide-react";
+import { Signal, Tag, Triangle, LayoutPanelTop, CalendarClock, CalendarCheck2, Users, UserCircle2, Info } from "lucide-react";
+import axios from "axios";
 // hooks
 // ui icons
 import { DiceIcon, DoubleCircleIcon, ContrastIcon } from "@plane/ui";
@@ -21,6 +22,7 @@ import {
   IssueParentSelect,
   IssueLabel,
   TIssueOperations,
+  CustomProperties
 } from "@/components/issues";
 // helpers
 import { cn } from "@/helpers/common.helper";
@@ -29,7 +31,9 @@ import { shouldHighlightIssueDueDate } from "@/helpers/issue.helper";
 import { useIssueDetail, useMember, useProject, useProjectState } from "@/hooks/store";
 // plane web components
 import { IssueAdditionalPropertyValuesUpdate } from "@/plane-web/components/issue-types/values";
-import { IssueWorklogProperty } from "@/plane-web/components/issues";
+import { IssueWorklogProperty} from "@/plane-web/components/issues";
+import { ISSUE_ADDITIONAL_PROPERTIES } from "@/constants/issue";
+import { CustomProperty } from "../custom-properties";
 
 interface IPeekOverviewProperties {
   workspaceSlug: string;
@@ -39,6 +43,7 @@ interface IPeekOverviewProperties {
   issueOperations: TIssueOperations;
 }
 
+
 export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((props) => {
   const { workspaceSlug, projectId, issueId, issueOperations, disabled } = props;
   // store hooks
@@ -53,15 +58,54 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
   if (!issue) return <></>;
   const createdByDetails = getUserDetails(issue?.created_by);
   const projectDetails = getProjectById(issue.project_id);
+  const customProperties = issue?.custom_properties || [];
+  const issue_type_id = issue?.type_id || "afd30f86-5ae5-428c-aa3a-e633ea973740";
   const isEstimateEnabled = projectDetails?.estimate;
   const stateDetails = getStateById(issue.state_id);
-
   const minDate = getDate(issue.start_date);
   minDate?.setDate(minDate.getDate());
 
   const maxDate = getDate(issue.target_date);
   maxDate?.setDate(maxDate.getDate());
 
+  const handleCustomPropertiesUpdate = async (updatedProperties: CustomProperty[]) => {
+    try {
+      const updateRequests = updatedProperties.map((property) => {
+        const customPropertyId = property?.id || "";
+        const apiUrl = `/api/v1/workspaces/${workspaceSlug}/issues/${issueId}/custom-properties/`;
+        if (customPropertyId) {
+          return axios.patch(
+            `${apiUrl}${customPropertyId}/`, 
+            { value: property.value },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        } else {
+          return axios.post(
+            apiUrl, 
+            {
+              key: property.key,
+              value: property.value,
+              issue_type_custom_property: property.issue_type_custom_property,
+            },
+            {
+              headers: {
+                'x-api-key': 'TEST_API_TOKEN',
+                'Content-Type': 'application/json'
+              }
+            }
+          );
+        }
+      });
+      await Promise.all(updateRequests);
+    } catch (error) {
+    }
+  };
+  
   return (
     <div>
       <h6 className="text-sm font-medium">Properties</h6>
@@ -299,6 +343,26 @@ export const PeekOverviewProperties: FC<IPeekOverviewProperties> = observer((pro
             isDisabled={disabled}
           />
         )}
+
+        {ISSUE_ADDITIONAL_PROPERTIES.map((prop: any) =>
+          issue[prop.key] ? (
+            <div key={prop?.key} className="flex w-full items-center gap-3 h-8">
+              <div className="flex items-center gap-1 w-1/4 flex-shrink-0 text-sm text-custom-text-300">
+                <Info className="h-4 w-4 flex-shrink-0" />
+                <span>{prop?.title}</span>
+              </div>
+              <div className="w-3/4 flex-grow group ml-2 text-sm">{issue[prop.key]}</div>
+            </div>
+          ) : null
+        )}
+
+        <CustomProperties
+          customProperties={Array.isArray(customProperties) ? customProperties : []}
+          issue_type_id={issue_type_id}
+          workspaceSlug={workspaceSlug}
+          updateCustomProperties={handleCustomPropertiesUpdate}
+          layout="quarter"
+        />
       </div>
     </div>
   );
diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsx
index a60a7d7e1b1..1310618f191 100644
--- a/web/core/components/workspace/sidebar/dropdown.tsx
+++ b/web/core/components/workspace/sidebar/dropdown.tsx
@@ -105,6 +105,7 @@ export const SidebarDropdown = observer(() => {
         {({ open }) => (
           <>
             <Menu.Button
+              disabled={true}
               className={cn(
                 "group/menu-button flex items-center justify-between gap-1 p-1 truncate rounded text-sm font-medium text-custom-sidebar-text-200 hover:bg-custom-sidebar-background-80 focus:outline-none",
                 {
@@ -205,15 +206,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..ed3dcd6dd93 100644
--- a/web/core/components/workspace/sidebar/help-section.tsx
+++ b/web/core/components/workspace/sidebar/help-section.tsx
@@ -15,7 +15,6 @@ import { useAppTheme, useCommandPalette, useInstance, useTransient, useUserSetti
 import { usePlatformOS } from "@/hooks/use-platform-os";
 // plane web components
 import { PlaneVersionNumber } from "@/plane-web/components/global";
-import { WorkspaceEditionBadge } from "@/plane-web/components/workspace";
 import { ENABLE_LOCAL_DB_CACHE } from "@/plane-web/constants/issues";
 
 export interface WorkspaceHelpSectionProps {
@@ -52,123 +51,9 @@ 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,
-          })}
-        >
-          <WorkspaceEditionBadge />
-        </div>
-        <div
-          className={`flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-evenly"}`}
+          className={`flex flex-shrink-0 items-center gap-1 ${isCollapsed ? "flex-col justify-center" : "justify-end ml-auto"}`}
         >
           <Tooltip tooltipContent={`${isCollapsed ? "Expand" : "Hide"}`} isMobile={isMobile}>
             <button
diff --git a/web/core/components/workspace/sidebar/projects-list-item.tsx b/web/core/components/workspace/sidebar/projects-list-item.tsx
index 2f809bb47d7..915b9eb713b 100644
--- a/web/core/components/workspace/sidebar/projects-list-item.tsx
+++ b/web/core/components/workspace/sidebar/projects-list-item.tsx
@@ -73,36 +73,6 @@ const navigation = (workspaceSlug: string, projectId: string) => [
     Icon: LayersIcon,
     access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
   },
-  {
-    name: "Cycles",
-    href: `/${workspaceSlug}/projects/${projectId}/cycles`,
-    Icon: ContrastIcon,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-  },
-  {
-    name: "Modules",
-    href: `/${workspaceSlug}/projects/${projectId}/modules`,
-    Icon: DiceIcon,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
-  },
-  {
-    name: "Views",
-    href: `/${workspaceSlug}/projects/${projectId}/views`,
-    Icon: Layers,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
-  {
-    name: "Pages",
-    href: `/${workspaceSlug}/projects/${projectId}/pages`,
-    Icon: FileText,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
-  {
-    name: "Intake",
-    href: `/${workspaceSlug}/projects/${projectId}/inbox`,
-    Icon: Intake,
-    access: [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
-  },
 ];
 
 export const SidebarProjectsListItem: React.FC<Props> = observer((props) => {
diff --git a/web/core/constants/analytics.ts b/web/core/constants/analytics.ts
index 58abd208c63..7435701544a 100644
--- a/web/core/constants/analytics.ts
+++ b/web/core/constants/analytics.ts
@@ -54,7 +54,7 @@ export const ANALYTICS_X_AXIS_VALUES: { value: TXAxisValues; label: string }[] =
   {
     value: "created_at",
     label: "Created date",
-  },
+  }
 ];
 
 export const ANALYTICS_Y_AXIS_VALUES: { value: TYAxisValues; label: string }[] = [
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 = {
diff --git a/web/core/constants/issue.ts b/web/core/constants/issue.ts
index 8629c05a253..b494741af90 100644
--- a/web/core/constants/issue.ts
+++ b/web/core/constants/issue.ts
@@ -9,6 +9,7 @@ import {
   TIssueOrderByOptions,
   TIssuePriorities,
   TIssueGroupingFilters,
+  TIssue
 } from "@plane/types";
 
 export const DRAG_ALLOWED_GROUPS: TIssueGroupByOptions[] = [
@@ -109,6 +110,19 @@ export const ISSUE_FILTER_OPTIONS: {
   // { key: "draft", title: "Draft Issues" },
 ];
 
+const whileListedCustomProperties = [
+  { key: "trip_reference_number", title: "Trip Reference Number" },
+  { key: "reference_number", title: "Reference Number" },
+  { key: "hub_code", title: "Hub Code" },
+  { key: "hub_name", title: "Hub Name" },
+  { key: "customer_code", title: "Customer Code" },
+  { key: "customer_name", title: "Customer Name" },
+  { key: "vendor_name", title: "Vendor Name" },
+  { key: "vendor_code", title: "Vendor Code" },
+  { key: "worker_code", title: "Worker Code" },
+  { key: "worker_name", title: "Worker Name" },
+];
+
 export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] = [
   "assignee",
   "start_date",
@@ -126,6 +140,7 @@ export const ISSUE_DISPLAY_PROPERTIES_KEYS: (keyof IIssueDisplayProperties)[] =
   "modules",
   "cycle",
   "issue_type",
+  ...whileListedCustomProperties.map(prop => prop.key),
 ];
 
 export const ISSUE_DISPLAY_PROPERTIES: {
@@ -146,6 +161,7 @@ export const ISSUE_DISPLAY_PROPERTIES: {
   { key: "estimate", title: "Estimate" },
   { key: "modules", title: "Modules" },
   { key: "cycle", title: "Cycle" },
+  ...whileListedCustomProperties,
 ];
 
 export const ISSUE_EXTRA_OPTIONS: {
@@ -307,6 +323,13 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "project",
         "start_date",
         "target_date",
+        "hub_code",
+        "customer_code",
+        "worker_code",
+        "vendor_code",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties",
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -354,6 +377,13 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "start_date",
         "target_date",
         "issue_type",
+        "hub_code",
+        "customer_code",
+        "worker_code",
+        "vendor_code",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties"
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -427,6 +457,14 @@ export const ISSUE_DISPLAY_FILTERS_BY_LAYOUT: {
         "start_date",
         "target_date",
         "issue_type",
+        "custom_properties",
+        "hub_code",
+        "customer_code",
+        "worker_code",
+        "vendor_code",
+        "trip_reference_number",
+        "reference_number",
+        "custom_properties"
       ],
       display_properties: ISSUE_DISPLAY_PROPERTIES_KEYS,
       display_filters: {
@@ -493,3 +531,19 @@ export const groupReactionEmojis = (reactions: any) => {
 
   return groupedEmojis;
 };
+
+export const ISSUE_ADDITIONAL_PROPERTIES: {
+    key: keyof TIssue;
+    title: string;
+  }[] = [
+    { key: "trip_reference_number", title: "Trip Ref Number" },
+    { key: "reference_number", title: "Reference Number" },
+    { key: "hub_code", title: "Hub Code" },
+    { key: "hub_name", title: "Hub Name" },
+    { key: "customer_code", title: "Customer Code" },
+    { key: "customer_name", title: "Customer Name" },
+    { key: "vendor_code", title: "Vendor Code" },
+    { key: "vendor_name", title: "Vendor Name" },
+    { key: "worker_code", title: "Worker Code" },
+    { key: "worker_name", title: "Worker Name" }
+  ];
\ No newline at end of file
diff --git a/web/core/constants/spreadsheet.ts b/web/core/constants/spreadsheet.ts
index e4e8d8ee57b..4e4661b9465 100644
--- a/web/core/constants/spreadsheet.ts
+++ b/web/core/constants/spreadsheet.ts
@@ -11,6 +11,7 @@ import {
   CalendarCheck2,
   CalendarClock,
   Users,
+  Tags,
 } from "lucide-react";
 // types
 import { IIssueDisplayProperties, TIssue, TIssueOrderByOptions } from "@plane/types";
@@ -32,6 +33,7 @@ import {
   SpreadsheetStateColumn,
   SpreadsheetSubIssueColumn,
   SpreadsheetUpdatedOnColumn,
+  SpreadsheetStandardPropertyColumn,
 } from "@/components/issues/issue-layouts/spreadsheet";
 
 export const SPREADSHEET_PROPERTY_DETAILS: {
@@ -176,6 +178,96 @@ export const SPREADSHEET_PROPERTY_DETAILS: {
     icon: LayersIcon,
     Column: SpreadsheetSubIssueColumn,
   },
+  trip_reference_number: {
+    title: "Trip Ref Number",
+    ascendingOrderKey: "trip_reference_number",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-trip_reference_number",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  reference_number: {
+    title: "Reference Number",
+    ascendingOrderKey: "reference_number",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-reference_number",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  hub_code: {
+    title: "Hub Code",
+    ascendingOrderKey: "hub_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-hub_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  hub_name: {
+    title: "Hub Name",
+    ascendingOrderKey: "hub_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-hub_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  customer_code: {
+    title: "Customer Code",
+    ascendingOrderKey: "customer_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-customer_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  customer_name: {
+    title: "Customer Name",
+    ascendingOrderKey: "customer_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-customer_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  vendor_name: {
+    title: "Vendor Name",
+    ascendingOrderKey: "vendor_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-vendor_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  vendor_code: {
+    title: "Vendor Code",
+    ascendingOrderKey: "vendor_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-vendor_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  worker_code: {
+    title: "Worker Code",
+    ascendingOrderKey: "worker_code",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-worker_code",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
+  worker_name: {
+    title: "Worker Name",
+    ascendingOrderKey: "worker_name",
+    ascendingOrderTitle: "A",
+    descendingOrderKey: "-worker_name",
+    descendingOrderTitle: "Z",
+    icon: Tags,
+    Column: SpreadsheetStandardPropertyColumn,
+  },
 };
 
 export const SPREADSHEET_PROPERTY_LIST: (keyof IIssueDisplayProperties)[] = [
@@ -193,6 +285,16 @@ export const SPREADSHEET_PROPERTY_LIST: (keyof IIssueDisplayProperties)[] = [
   "link",
   "attachment_count",
   "sub_issue_count",
+  "trip_reference_number",
+  "reference_number",
+  "hub_code",
+  "hub_name",
+  "customer_code",
+  "customer_name",
+  "vendor_name",
+  "vendor_code",
+  "worker_code",
+  "worker_name",
 ];
 
 export const SPREADSHEET_SELECT_GROUP = "spreadsheet-issues";
diff --git a/web/core/hooks/use-group-dragndrop.ts b/web/core/hooks/use-group-dragndrop.ts
index 08695d341d2..0a1c3ef697a 100644
--- a/web/core/hooks/use-group-dragndrop.ts
+++ b/web/core/hooks/use-group-dragndrop.ts
@@ -61,8 +61,8 @@ export const useGroupIssuesDragNDrop = (
     const moduleKey = ISSUE_FILTER_DEFAULT_DATA["module"];
     const cycleKey = ISSUE_FILTER_DEFAULT_DATA["cycle"];
 
-    const isModuleChanged = Object.keys(data).includes(moduleKey);
-    const isCycleChanged = Object.keys(data).includes(cycleKey);
+    const isModuleChanged = Object.keys(data).includes(moduleKey.toString());
+    const isCycleChanged = Object.keys(data).includes(cycleKey.toString());
 
     if (isCycleChanged && workspaceSlug) {
       if (data[cycleKey]) {
diff --git a/web/core/services/workspace.service.ts b/web/core/services/workspace.service.ts
index e1aa9b7cd2b..20a68c64abf 100644
--- a/web/core/services/workspace.service.ts
+++ b/web/core/services/workspace.service.ts
@@ -277,4 +277,25 @@ export class WorkspaceService extends APIService {
         throw error?.response?.data;
       });
   }
+
+  async getIssuesCustomProperties(workspaceSlug: string, config = {}): Promise<Record<string, any>[]> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/custom-properties/`,
+      config
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async getIssueAdditionalProperties(workspaceSlug: string, projectId: string , field: any): Promise<any> {
+    return this.get(
+      `/api/workspaces/${workspaceSlug}/projects/${projectId}/search?field=${field}`,
+    )
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
 }
diff --git a/web/core/store/issue/helpers/issue-filter-helper.store.ts b/web/core/store/issue/helpers/issue-filter-helper.store.ts
index 3db6dcbb37f..a0267aa31cf 100644
--- a/web/core/store/issue/helpers/issue-filter-helper.store.ts
+++ b/web/core/store/issue/helpers/issue-filter-helper.store.ts
@@ -82,6 +82,7 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
     const computedFilters: Partial<Record<TIssueParams, undefined | string[] | boolean | string>> = {
       // issue filters
       priority: filters?.priority || undefined,
+      custom_properties: filters?.custom_properties || undefined,
       state_group: filters?.state_group || undefined,
       state: filters?.state || undefined,
       assignees: filters?.assignees || undefined,
@@ -103,6 +104,12 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
       order_by: displayFilters?.order_by || undefined,
       type: displayFilters?.type || undefined,
       sub_issue: displayFilters?.sub_issue ?? true,
+      hub_code: filters?.hub_code || undefined,
+      worker_code: filters?.worker_code || undefined,
+      customer_code: filters?.customer_code || undefined,
+      trip_reference_number: filters?.trip_reference_number || undefined,
+      vendor_code: filters?.vendor_code || undefined,
+      reference_number: filters?.reference_number || undefined,
     };
 
     const issueFiltersParams: Partial<Record<TIssueParams, boolean | string>> = {};
@@ -144,6 +151,12 @@ export class IssueFilterHelperStore implements IIssueFilterHelperStore {
     project: filters?.project || null,
     subscriber: filters?.subscriber || null,
     issue_type: filters?.issue_type || null,
+    hub_code: filters?.hub_code || null,
+    worker_code: filters?.worker_code || null,
+    customer_code: filters?.customer_code || null,
+    trip_reference_number: filters?.trip_reference_number || null,
+    vendor_code: filters?.vendor_code || null,
+    reference_number: filters?.reference_number || null,
   });
 
   /**
diff --git a/web/core/store/issue/issue-details/issue.store.ts b/web/core/store/issue/issue-details/issue.store.ts
index db0ccc39af2..6a806ff2775 100644
--- a/web/core/store/issue/issue-details/issue.store.ts
+++ b/web/core/store/issue/issue-details/issue.store.ts
@@ -181,6 +181,13 @@ export class IssueStore implements IIssueStore {
       updated_by: issue?.updated_by,
       is_draft: issue?.is_draft,
       is_subscribed: issue?.is_subscribed,
+      custom_properties: issue?.custom_properties,
+      hub_code: issue?.hub_code, 
+      customer_code: issue?.customer_code, 
+      reference_number: issue?.reference_number, 
+      trip_reference_number: issue?.trip_reference_number, 
+      vendor_code: issue?.vendor_code, 
+      worker_code: issue?.worker_code
     };
 
     this.rootIssueDetailStore.rootIssueStore.issues.addIssue([issuePayload]);
diff --git a/web/helpers/issue.helper.ts b/web/helpers/issue.helper.ts
index d1fc970185e..5eee1804304 100644
--- a/web/helpers/issue.helper.ts
+++ b/web/helpers/issue.helper.ts
@@ -307,4 +307,14 @@ export const getComputedDisplayProperties = (
   modules: displayProperties?.modules ?? true,
   cycle: displayProperties?.cycle ?? true,
   issue_type: displayProperties?.issue_type ?? true,
+  trip_reference_number: displayProperties?.trip_reference_number ?? true,
+  reference_number: displayProperties?.reference_number ?? true,
+  hub_code: displayProperties?.hub_code ?? true,
+  hub_name: displayProperties?.hub_name ?? true,
+  customer_code: displayProperties?.customer_code ?? true,
+  customer_name: displayProperties?.customer_name ?? true,
+  vendor_name: displayProperties?.vendor_name ?? true,
+  vendor_code: displayProperties?.vendor_code ?? true,
+  worker_code: displayProperties?.worker_code ?? true,
+  worker_name: displayProperties?.worker_name ?? true,
 });
diff --git a/web/next.config.js b/web/next.config.js
index 14ba0d73579..f36c86494ca 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -15,7 +15,11 @@ const nextConfig = {
       {
         source: "/(.*)?",
         headers: [
-          { key: "X-Frame-Options", value: "SAMEORIGIN" },
+          { key: "X-Frame-Options", value: "ALLOWALL" },
+          {
+            key: "Content-Security-Policy",
+            value: "frame-ancestors 'self' https://*.shipsy.io http://*.localhost:3001 http://*.localhost:3002 http://5.223.42.156:3000/", // Replace with the domains allowed to embed your app
+          },
           // {
           //   key: "Referrer-Policy",
           //   value: "origin-when-cross-origin",