diff --git a/ckan-backend-dev/.env.example b/ckan-backend-dev/.env.example
index bf99d9683..fb3461e81 100644
--- a/ckan-backend-dev/.env.example
+++ b/ckan-backend-dev/.env.example
@@ -84,7 +84,7 @@ DATAPUSHER_REWRITE_RESOURCES=True
 DATAPUSHER_REWRITE_URL=http://ckan-dev:5000
 
 # Extensions
-CKAN__PLUGINS=image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri auth hierarchy_display hierarchy_form hierarchy_group_form issues envvars
+CKAN__PLUGINS=image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri auth hierarchy_display issues envvars
 CKAN__VIEWS__DEFAULT_VIEWS=image_view text_view webpage_view datatables_view
 CKAN__HARVEST__MQ__TYPE=redis
 CKAN__HARVEST__MQ__HOSTNAME=redis
@@ -101,7 +101,7 @@ CKANEXT__S3FILESTORE__HOST_NAME=http://minio:9000
 
 # scheming
 CKAN___SCHEMING__DATASET_SCHEMAS=ckanext.wri.schema:ckan_dataset.yaml
-CKAN___SCHEMING__ORGANIZATION_SCHEMAS=ckanext.scheming:custom_org_with_address.json
+CKAN___SCHEMING__ORGANIZATION_SCHEMAS=ckanext.wri.schema:custom_org_with_address.json
 CKAN___SCHEMING__GROUP_SCHEMAS=ckanext.scheming:custom_group_with_status.json
 CKAN___SCHEMING__PRESETS=ckanext.wri.schema:presets.json
 
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/create.py b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/create.py
index 39542ec30..250199ca6 100644
--- a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/create.py
+++ b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/create.py
@@ -14,6 +14,7 @@
     send_group_notification,
 )
 import ckan.logic as logic
+from ckanext.wri.logic.action.get import validate_visibility
 
 from ckan.common import _, config
 import ckan.plugins.toolkit as tk
@@ -404,6 +405,8 @@ def migration_status(context: Context, data_dict: DataDict):
 
 
 def package_create(context: Context, data_dict: DataDict):
+
+    validate_visibility(context, data_dict)
     data_dict["is_pending"] = True
     data_dict["is_approved"] = False
     data_dict["approval_status"] = "pending"
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/get.py b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/get.py
index 9d397df8a..cbf48fc70 100644
--- a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/get.py
+++ b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/get.py
@@ -9,11 +9,19 @@
 import re
 from itertools import zip_longest
 
-from ckan.common import config, asbool
+from ckan.common import config, asbool, aslist
 from ckan.model import Package
 from sqlalchemy import text, engine
 from shapely import wkb, wkt
+import ckan.model as model
+from ckan.logic.action.get import (
+    _unpick_search, 
+    organization_show as old_organization_show)
 
+from ckan.logic.action.patch import (
+    organization_patch as old_organization_patch,
+)
+from ckan.plugins.toolkit import chained_action
 
 import ckan
 import ckan.lib.dictization
@@ -30,7 +38,7 @@
 from ckan.lib.dictization import table_dictize
 
 from ckan.common import _
-from ckan.types import ActionResult, Context, DataDict
+from ckan.types import ActionResult, Context, DataDict, Query, Schema
 from typing_extensions import TypeAlias
 from ckanext.wri.helpers.data_api import get_shape_from_dataapi
 from ckanext.wri.model.notification import (
@@ -54,6 +62,10 @@
 import geoalchemy2
 import sqlalchemy
 from sqlalchemy import text
+import ckan.authz as authz
+from sqlalchemy import or_
+from sqlalchemy.orm import aliased
+import copy
 
 _select = sqlalchemy.sql.select
 _or_ = sqlalchemy.or_
@@ -755,10 +767,14 @@ def group_activity_list_wri(context: Context, data_dict: DataDict):
     return results
 
 
+
 @logic.side_effect_free
 def user_list_wri(context: Context, data_dict: DataDict):
     model = context["model"]
-    results = get_action("user_list")(context, data_dict)
+    user = context.get("user")
+    is_sysadmin = authz.is_sysadmin(user)
+    # results = get_action("user_list")(context, data_dict)
+
     query = model.Session.query(
         model.User,
         model.User.name.label("name"),
@@ -779,28 +795,36 @@ def user_list_wri(context: Context, data_dict: DataDict):
     query = query.filter(model.User.name != site_id)
     query = query.filter(model.User.state != model.State.DELETED)
     query = query.all()
+
     results = []
     org_details = {}
+
+   
     for q in query:
-        user = model_dictize.user_dictize(q[0], context)
+        user_dict = model_dictize.user_dictize(q[0], context)
 
         member_query = (
             model.Session.query(model.Member)
             .filter(
                 model.Member.state == "active",
                 model.Member.table_name == "user",
-                model.Member.table_id == user["id"],
+                model.Member.table_id == user_dict["id"],
             )
             .all()
         )
 
-        user["organizations"] = []
+        
+        user_dict["organizations"] = []
+        
 
         for member in member_query:
+            
             organization = None
             if member.group_id in org_details:
                 organization = org_details[member.group_id]
+                
             else:
+                # Query the organization details
                 org_result = (
                     model.Session.query(model.Group)
                     .filter(
@@ -809,27 +833,82 @@ def user_list_wri(context: Context, data_dict: DataDict):
                     )
                     .first()
                 )
+
                 if org_result:
-                    organization = model_dictize.group_dictize(org_result, context)
-                    org_details[member.group_id] = organization
+                    # Now perform the organization visibility check here
+                    group_extra_alias = aliased(model.GroupExtra)
+                    org_query = model.Session.query(model.Group).outerjoin(
+                        group_extra_alias, model.Group.id == group_extra_alias.group_id
+                    )
+
+                    # Non-sysadmin users get only public organizations or private if they belong to the org
+                    if not is_sysadmin:
+                        user_id = authz.get_user_id_for_username(user, allow_none=True)
+                        # Allow access to public orgs or private ones the user belongs to
+                        org_query = org_query.filter(
+                            model.Group.id == member.group_id
+                        ).filter(
+                            sqlalchemy.or_(
+                                sqlalchemy.and_(
+                                    group_extra_alias.key == "visibility",
+                                    group_extra_alias.value == "public",
+                                    model.Member.table_id == user_id,
+                                    model.Member.group_id == model.Group.id,
+                                    model.Member.table_name == "user",
+                                    model.Member.state == "active"
+                                ),
+                                sqlalchemy.and_(
+                                    group_extra_alias.key == None,
+                                    model.Member.table_id == user_id,
+                                    model.Member.group_id == model.Group.id,
+                                    model.Member.table_name == "user",
+                                    model.Member.state == "active"
+                                ),
+                                
+                                sqlalchemy.and_(
+                                    group_extra_alias.key == "visibility",
+                                    group_extra_alias.value == "private",
+                                    model.Member.table_id == user_id,
+                                    model.Member.group_id == model.Group.id,
+                                    model.Member.table_name == "user",
+                                    model.Member.state == "active"
+                                ),
+                            )
+                        )
+
+                    # Execute the organization query
+                    filtered_org = org_query.first()
+
+                    if filtered_org:
+                        organization = model_dictize.group_dictize(org_result, context,
+                                                                   include_groups=False,
+                                                                   include_users=True,
+                                                                   include_extras=False,
+                                                                   include_tags=False,
+                                                                   packages_field=None)
+                        org_details[member.group_id] = organization
 
             if organization:
-                user_org = next(
-                    filter(lambda x: x["id"] == user["id"], organization["users"])
-                )
-                organization["capacity"] = user_org["capacity"]
-                user["organizations"].append(organization)
+                org_copy = copy.deepcopy(organization)
+                org_copy["capacity"] = member.capacity
+                user_dict["organizations"].append(org_copy)
 
-        results.append(user)
+        results.append(user_dict)
 
     return results
 
 
-def get_hierarchy_group(context: Context, groups: Any, group_type: str, q: Any):
-    def recurcive_tree_ids(org, group_hierarchy_ids=[]):
+def get_hierarchy_group(context: Context, groups: Any, group_type: str, q: Any, private_orgs: Any = None):
+    def recurcive_tree_ids(org, group_hierarchy_ids=[],):
         group_hierarchy_ids.append(org["name"])
+
+        if private_orgs:
+            org["children"] = [
+                child for child in org["children"] if child["name"] not in private_orgs
+            ]
+        
         for child in org["children"]:
-            recurcive_tree_ids(child)
+            recurcive_tree_ids(child, group_hierarchy_ids)
         return group_hierarchy_ids
 
     group_hierarchy_ids = []
@@ -852,8 +931,13 @@ def recurcive_tree_ids(org, group_hierarchy_ids=[]):
 @logic.side_effect_free
 def organization_list_wri(context: Context, data_dict: DataDict):
     orgs = get_action("organization_list")(context, data_dict)
+    user = context['user']
+    is_sysadmin = authz.is_sysadmin(user)
     q = data_dict.get("q", False)
-    results = get_hierarchy_group(context, orgs, "organization", q)
+    private_orgs = None
+    if not is_sysadmin:
+       private_orgs = get_private_organizations(context)
+    results = get_hierarchy_group(context, orgs, "organization", q, private_orgs)
     return results
 
 
@@ -1202,3 +1286,412 @@ def resource_search(context: Context, data_dict: DataDict):
 
 # TODO:  customize package_show to include spatial_geom
 # conditionally (optimization of the data file geo indexing)
+
+@logic.side_effect_free
+def organization_list_for_user(context: Context,
+                               data_dict: DataDict) -> ActionResult.OrganizationListForUser:
+    
+    model = context['model']
+    if data_dict.get('id'):
+        user_obj = model.User.get(data_dict['id'])
+        if not user_obj:
+            raise NotFound
+        user = user_obj.name
+    else:
+        user = context['user']
+
+    _check_access('organization_list_for_user', context, data_dict)
+    sysadmin = authz.is_sysadmin(user)
+
+    orgs_q = model.Session.query(model.Group) \
+        .filter(model.Group.is_organization == True) \
+        .filter(model.Group.state == 'active')
+
+    if sysadmin:
+        orgs_and_capacities = [(org, 'admin') for org in orgs_q.all()]
+    else:
+        # for non-Sysadmins check they have the required permission
+
+        permission = data_dict.get('permission', 'manage_group')
+
+        roles = authz.get_roles_with_permission(permission)
+
+        if not roles:
+            return []
+        user_id = authz.get_user_id_for_username(user, allow_none=True)
+        if not user_id:
+            return []
+
+        q: Query[tuple[model.Member, model.Group]] = model.Session.query(model.Member, model.Group) \
+            .filter(model.Member.table_name == 'user') \
+            .filter(
+                model.Member.capacity.in_(roles)
+            ) \
+            .filter(model.Member.table_id == user_id) \
+            .filter(model.Member.state == 'active') \
+            .join(model.Group)
+
+        group_ids: set[str] = set()
+        roles_that_cascade = cast(
+            "list[str]",
+            authz.check_config_permission('roles_that_cascade_to_sub_groups')
+        )
+        group_ids_to_capacities: dict[str, str] = {}
+        for member, group in q.all():
+            if member.capacity in roles_that_cascade:
+                children_group_ids = [
+                    grp_tuple[0] for grp_tuple
+                    in group.get_children_group_hierarchy(type='organization')
+                ]
+                for group_id in children_group_ids:
+                    group_ids_to_capacities[group_id] = member.capacity
+                group_ids |= set(children_group_ids)
+
+            group_ids_to_capacities[group.id] = member.capacity
+            group_ids.add(group.id)
+
+        if not group_ids:
+            return []
+
+        orgs_q = orgs_q.filter(model.Group.id.in_(group_ids))
+        orgs_and_capacities = [
+            (org, group_ids_to_capacities[org.id]) for org in orgs_q.all()]
+
+    context['with_capacity'] = True
+    orgs_list = model_dictize.group_list_dictize(orgs_and_capacities, context,
+        with_package_counts=asbool(data_dict.get('include_dataset_count')),
+        include_extras=asbool(data_dict.get('include_extras')))
+    
+    for org in orgs_list:
+        for extra in org.get('extras', []):
+            if extra['key'] == 'visibility':
+                org['visibility'] = extra['value']
+                break
+    return orgs_list
+
+
+
+@logic.side_effect_free
+def organization_list(context: Context,
+                      data_dict: DataDict) -> ActionResult.OrganizationList:
+    
+    '''Return a list of the names of the site's organizations.
+
+    :param type: the type of organization to list (optional,
+        default: ``'organization'``),
+        See docs for :py:class:`~ckan.plugins.interfaces.IGroupForm`
+    :type type: string
+    :param order_by: the field to sort the list by, must be ``'name'`` or
+      ``'packages'`` (optional, default: ``'name'``) Deprecated use sort.
+    :type order_by: string
+    :param sort: sorting of the search results.  Optional.  Default:
+        "title asc" string of field name and sort-order. The allowed fields are
+        'name', 'package_count' and 'title'
+    :type sort: string
+    :param limit: the maximum number of organizations returned (optional)
+        Default: ``1000`` when all_fields=false unless set in site's
+        configuration ``ckan.group_and_organization_list_max``
+        Default: ``25`` when all_fields=true unless set in site's
+        configuration ``ckan.group_and_organization_list_all_fields_max``
+    :type limit: int
+    :param offset: when ``limit`` is given, the offset to start
+        returning organizations from
+    :type offset: int
+    :param organizations: a list of names of the groups to return,
+        if given only groups whose names are in this list will be
+        returned (optional)
+    :type organizations: list of strings
+    :param all_fields: return group dictionaries instead of just names. Only
+        core fields are returned - get some more using the include_* options.
+        Returning a list of packages is too expensive, so the `packages`
+        property for each group is deprecated, but there is a count of the
+        packages in the `package_count` property.
+        (optional, default: ``False``)
+    :type all_fields: bool
+    :param include_dataset_count: if all_fields, include the full package_count
+        (optional, default: ``True``)
+    :type include_dataset_count: bool
+    :param include_extras: if all_fields, include the organization extra fields
+        (optional, default: ``False``)
+    :type include_extras: bool
+    :param include_groups: if all_fields, include the organizations the
+        organizations are in
+        (optional, default: ``False``)
+    :type include_groups: bool
+    :param include_users: if all_fields, include the organization users
+        (optional, default: ``False``).
+    :type include_users: bool
+
+    :rtype: list of strings
+
+    '''
+    '''
+    log.error("========CALLED ORG LIST========")    
+    '''     
+    _check_access('organization_list', context, data_dict)
+    data_dict['groups'] = data_dict.pop('organizations', [])
+    data_dict.setdefault('type', 'organization')
+    return _group_or_org_list(context, data_dict, is_org=True)
+
+
+
+def _group_or_org_list(
+        context: Context, data_dict: DataDict, is_org: bool = False):
+    model = context['model']
+    api = context.get('api_version')
+    groups = data_dict.get('groups')
+    group_type = data_dict.get('type', 'group')
+    ref_group_by = 'id' if api == 2 else 'name'
+    pagination_dict = {}
+    limit = data_dict.get('limit')
+    if limit:
+        pagination_dict['limit'] = data_dict['limit']
+    offset = data_dict.get('offset')
+    if offset:
+        pagination_dict['offset'] = data_dict['offset']
+    if pagination_dict:
+        pagination_dict, errors = _validate(
+            data_dict, ckan.logic.schema.default_pagination_schema(), context)
+        if errors:
+            raise ValidationError(errors)
+    sort = data_dict.get('sort') or config.get('ckan.default_group_sort')
+    q = data_dict.get('q', '').strip()
+
+    all_fields = asbool(data_dict.get('all_fields', None))
+
+    if all_fields:
+        try:
+            max_limit = config.get(
+                'ckan.group_and_organization_list_all_fields_max')
+        except ValueError:
+            max_limit = 25
+    else:
+        try:
+            max_limit = config.get('ckan.group_and_organization_list_max')
+        except ValueError:
+            max_limit = 1000
+
+    if limit is None or int(limit) > max_limit:
+        limit = max_limit
+
+    order_by = data_dict.get('order_by', '')
+    if order_by:
+        log.warn('`order_by` deprecated please use `sort`')
+        if not data_dict.get('sort'):
+            sort = order_by
+
+    if sort.strip() in ('packages', 'package_count'):
+        sort = 'package_count desc'
+
+    sort_info = _unpick_search(sort,
+                               allowed_fields=['name', 'packages',
+                                               'package_count', 'title'],
+                               total=1)
+
+    if sort_info and sort_info[0][0] == 'package_count':
+        query = model.Session.query(model.Group.id,
+                                    model.Group.name,
+                                    sqlalchemy.func.count(model.Group.id))
+
+        query = query.filter(model.Member.group_id == model.Group.id) \
+                     .filter(model.Member.table_id == model.Package.id) \
+                     .filter(model.Member.table_name == 'package') \
+                     .filter(model.Package.state == 'active')
+    else:
+        query = model.Session.query(model.Group.id,
+                                    model.Group.name)
+
+    query = query.filter(model.Group.state == 'active')
+
+    # Filter organizations based on visibility
+    user = context['user']
+    is_sysadmin = authz.is_sysadmin(user)
+
+    # Use aliased() to refer to the group_extra table
+    group_extra_alias = aliased(model.GroupExtra)
+
+    query = query.outerjoin(group_extra_alias, model.Group.id == group_extra_alias.group_id)
+
+    if not is_sysadmin:
+        # User is logged in
+        if user:
+            user_id = authz.get_user_id_for_username(user, allow_none=True)
+
+            # Correct filtering logic
+            query = query.filter(sqlalchemy.or_(
+                # Organization with visibility set to public
+                sqlalchemy.and_(
+                    group_extra_alias.key == 'visibility',
+                    group_extra_alias.value == 'public'
+                ),
+                # Organization with no visibility entry
+                group_extra_alias.key == None,
+                # Organization with visibility set to private if the user is a member
+                sqlalchemy.and_(
+                    group_extra_alias.key == 'visibility',
+                    group_extra_alias.value == 'private',
+                    model.Session.query(model.Member)
+                        .filter(model.Member.group_id == model.Group.id)  # Correlate with the main query
+                        .filter(model.Member.capacity == 'member')  # User must have 'member' capacity
+                        .filter(model.Member.table_name == 'user')  # Member should be a user
+                        .filter(model.Member.table_id == user_id) # User ID matches
+                        .filter(model.Member.state == 'active')
+                        .exists()  # Only include if user is a member
+                )
+            ))
+        # User is anonymous
+        else:
+            query = query.filter(sqlalchemy.or_(
+                # Organizations with visibility set to public
+                sqlalchemy.and_(
+                    group_extra_alias.key == 'visibility',
+                    group_extra_alias.value == 'public'
+                ),
+                # Organizations with no visibility entry (group_extra is None)
+                group_extra_alias.key == None
+            ))
+
+    if groups:
+        groups = aslist(groups, sep=",")
+        query = query.filter(model.Group.name.in_(groups))
+    if q:
+        q = u'%{0}%'.format(q)
+        query = query.filter(_or_(
+            model.Group.name.ilike(q),
+            model.Group.title.ilike(q),
+            model.Group.description.ilike(q),
+        ))
+
+    query = query.filter(model.Group.is_organization == is_org)
+    query = query.filter(model.Group.type == group_type)
+    query = query.distinct()
+
+    if sort_info:
+        sort_field = sort_info[0][0]
+        sort_direction = sort_info[0][1]
+        sort_model_field: Any = sqlalchemy.func.count(model.Group.id)
+        if sort_field == 'package_count':
+            query = query.group_by(model.Group.id, model.Group.name)
+        elif sort_field == 'name':
+            sort_model_field = model.Group.name
+        elif sort_field == 'title':
+            sort_model_field = model.Group.title
+
+        if sort_direction == 'asc':
+            query = query.order_by(sqlalchemy.asc(sort_model_field))
+        else:
+            query = query.order_by(sqlalchemy.desc(sort_model_field))
+
+    if limit:
+        query = query.limit(limit)
+    if offset:
+        query = query.offset(offset)
+
+    groups = query.all()
+
+    if all_fields:
+        action = 'organization_show' if is_org else 'group_show'
+        group_list = []
+        for group in groups:
+            data_dict['id'] = group.id
+            for key in ('include_extras', 'include_users',
+                        'include_groups', 'include_followers'):
+                if key not in data_dict:
+                    data_dict[key] = False
+            rslt = old_organization_show(context, data_dict)
+            group_list.append(rslt)
+    else:
+        group_list = [getattr(group, ref_group_by) for group in groups]
+
+    return group_list
+
+
+def get_private_organizations(context: Context):
+    model = context['model']
+    user = context.get('user')
+    
+    # Start the query for private organizations
+    query = model.Session.query(model.Group.id, model.Group.name)
+    query = query.filter(model.Group.state == 'active')
+    query = query.filter(model.Group.is_organization == True)
+
+    # Use aliased() to refer to the group_extra table for the 'visibility' check
+    group_extra_alias = aliased(model.GroupExtra)
+    query = query.outerjoin(group_extra_alias, model.Group.id == group_extra_alias.group_id)
+    query = query.filter(group_extra_alias.key == 'visibility', group_extra_alias.value == 'private')
+
+    # Check if the user is logged in
+    if user:
+        user_id = authz.get_user_id_for_username(user, allow_none=True)
+        
+        
+        # Exclude private organizations the user belongs to
+        subquery = model.Session.query(model.Member.group_id).filter(
+            model.Member.table_name == 'user',
+            model.Member.table_id == user_id,
+            model.Member.capacity == 'member',  # Ensure user is a 'member'
+            model.Member.state == 'active'
+        ).subquery()
+
+        query = query.filter(~model.Group.id.in_(subquery))
+    
+    # Fetch the final result
+    private_orgs = query.all()
+    
+    return [org.name for org in private_orgs]
+
+
+@logic.side_effect_free
+def organization_patch(context, data_dict):
+
+    visibility = data_dict.get('visibility', "public")
+
+    if visibility == "private":
+        rdata_dict = {
+            "q": "", 
+            "fq": f"(organization:({data_dict.get('name')}) AND visibility_type:(public OR internal))", 
+            "include_private": False  # Include private datasets in the search
+        }
+        public_package = get_action("package_search")(context, rdata_dict)
+        if public_package.get("count") > 0:
+            raise ValidationError({"message": _("Organization has public datasets and cannot be made private")})
+    return old_organization_patch(context, data_dict)
+
+def validate_visibility(context, data_dict):
+    
+    visibility = data_dict.get('visibility_type', "public")
+    owner_org = data_dict.get('owner_org', None)
+    id = data_dict.get('id', None)
+    if visibility in ["public", "internal"] and id:
+        package_show = get_action("package_show")(context, {"id": id})
+        id_org = package_show.get("owner_org", None)
+        if id_org:
+            org = get_action("organization_show")(context, {"id": id_org})
+            org_visibility = org.get("visibility", "public")
+            if org_visibility == "public":
+                raise ValidationError({"message": _("Organization has private visibility and cannot be made public")})
+        
+    elif visibility in ["public", "internal"] and owner_org:
+        org = get_action("organization_show")(context, {"id": owner_org})
+        org_visibility = org.get("visibility", "public")
+        if org_visibility == "private":
+            raise ValidationError({"message": _("Organization has private visibility and cannot create public datasets")})
+
+
+
+
+@logic.side_effect_free
+def organization_show(context, data_dict):
+    data_dict = old_organization_show(context, data_dict)
+    user = context.get("user")
+    if data_dict.get("visibility", "public") in ["public", "internal"] or authz.is_sysadmin(user):
+        return data_dict
+    
+    if user:
+        users = data_dict.get("users", [])
+        user_exists = any(userorg["name"] == user for userorg in users)
+        if user_exists:
+            return data_dict
+    raise NotFound("Organization not found")
+
+
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/update.py b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/update.py
index 1980b25cd..cce6d794e 100644
--- a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/update.py
+++ b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/logic/action/update.py
@@ -25,6 +25,7 @@
 from ckan.common import _
 import json
 import requests
+from ckanext.wri.logic.action.get import validate_visibility
 
 # encoding: utf-8
 
@@ -190,6 +191,7 @@ def issue_delete(context: Context, data_dict: DataDict):
 
 
 def package_patch(context: Context, data_dict: DataDict):
+    validate_visibility(context, data_dict)
     dataset_id = data_dict.get("id")
     try:
         pending_dataset_dict = tk.get_action("pending_dataset_show")(
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py
index b5ff0f13f..4971033d6 100644
--- a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py
+++ b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/plugin.py
@@ -62,6 +62,10 @@
     issue_search_wri,
     package_collaborator_list_wri,
     resource_search,
+    organization_list_for_user,
+    organization_list,
+    organization_patch,
+    organization_show
 )
 
 from ckanext.wri.logic.action.delete import pending_dataset_delete
@@ -233,7 +237,11 @@ def get_actions(self):
             "old_package_patch": old_package_patch,
             "old_package_update": old_package_update,
             "resource_update": resource_update,
+            "organization_list_for_user": organization_list_for_user,
             "resource_create": resource_create,
+            'organization_list': organization_list,
+            'organization_patch': organization_patch,
+            'organization_show': organization_show
             # "package_delete": package_delete,
         }
 
@@ -439,6 +447,7 @@ def info(self):
 
     def can_view(self):
         return True
+    
 
 
 class WriApiTracking(plugins.SingletonPlugin):
diff --git a/ckan-backend-dev/src/ckanext-wri/ckanext/wri/schema/custom_org_with_address.json b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/schema/custom_org_with_address.json
new file mode 100644
index 000000000..e9344cc9a
--- /dev/null
+++ b/ckan-backend-dev/src/ckanext-wri/ckanext/wri/schema/custom_org_with_address.json
@@ -0,0 +1,55 @@
+{
+    "scheming_version": 1,
+    "organization_type": "organization",
+    "about_url": "http://github.com/ckan/ckanext-scheming",
+    "fields": [
+      {
+        "field_name": "title",
+        "label": "Name",
+        "validators": "ignore_missing unicode_safe",
+        "form_snippet": "large_text.html",
+        "form_attrs": {"data-module": "slug-preview-target"},
+        "form_placeholder": "My theme"
+      },
+      {
+        "field_name": "name",
+        "label": "URL",
+        "validators": "not_empty unicode_safe name_validator group_name_validator",
+        "form_snippet": "slug.html",
+        "form_placeholder": "my-theme"
+      },
+      {
+        "field_name": "notes",
+        "label": "Description",
+        "form_snippet": "markdown.html",
+        "form_placeholder": "A little information about my group..."
+      },
+      {
+        "field_name": "url",
+        "label": "Image URL",
+        "form_placeholder": "http://example.com/my-image.jpg"
+      },
+      {
+        "field_name": "not_used",
+        "label": "Parent organization",
+        "display_snippet": null,
+        "form_snippet": "org_hierarchy.html",
+        "validators": "ignore_missing"
+    },
+      {
+        "field_name": "visibility",
+        "label": "visibility",
+        "output_validators": "ignore_missing",
+        "choices": [
+            {
+                "label": "public",
+                "value": "public"
+            },
+            {
+                "label": "private",
+                "value": "private"
+            }
+          ]
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/deployment/ckan/Dockerfile b/deployment/ckan/Dockerfile
index d2581dd36..3076df5a5 100644
--- a/deployment/ckan/Dockerfile
+++ b/deployment/ckan/Dockerfile
@@ -62,7 +62,7 @@ RUN for d in $APP_DIR/patches/*; do \
 USER ckan
 RUN cd ${APP_DIR}/src/ckanext-wri && pip3 install -r requirements.txt && pip3 install -r dev-requirements.txt && pip3 install -e .
 
-ENV CKAN__PLUGINS image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri auth hierarchy_display hierarchy_form hierarchy_group_form issues envvars
+ENV CKAN__PLUGINS image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri auth hierarchy_display issues envvars
 
 RUN ckan config-tool ${CKAN_INI} "ckan.plugins = ${CKAN__PLUGINS}"
 RUN ckan config-tool ${CKAN_INI} "ckan.auth.create_user_via_web = false"
diff --git a/deployment/frontend/src/components/_shared/SimpleSelect.tsx b/deployment/frontend/src/components/_shared/SimpleSelect.tsx
index beee6ae0d..3b063d2e8 100644
--- a/deployment/frontend/src/components/_shared/SimpleSelect.tsx
+++ b/deployment/frontend/src/components/_shared/SimpleSelect.tsx
@@ -113,7 +113,13 @@ export default function SimpleSelect<T extends FieldValues, V extends Object>({
                                                         active
                                                             ? 'bg-blue-800 text-white'
                                                             : 'text-gray-900',
-                                                        'relative cursor-default select-none py-2 pl-3 pr-9'
+                                                        `relative cursor-default select-none py-2 pl-3 pr-9 ${
+                                                            option?.visibility &&
+                                                            option.visibility ===
+                                                                'private'
+                                                                ? 'opacity-50'
+                                                                : ''
+                                                        }`
                                                     )
                                                 }
                                                 value={option}
diff --git a/deployment/frontend/src/components/dashboard/datasets/admin/CreateDatasetForm.tsx b/deployment/frontend/src/components/dashboard/datasets/admin/CreateDatasetForm.tsx
index f647256ac..19f3b0b5c 100644
--- a/deployment/frontend/src/components/dashboard/datasets/admin/CreateDatasetForm.tsx
+++ b/deployment/frontend/src/components/dashboard/datasets/admin/CreateDatasetForm.tsx
@@ -47,6 +47,7 @@ export default function CreateDatasetForm() {
                 value: '',
                 label: '',
                 id: '',
+                visibility: '',
             },
             update_frequency: {
                 value: 'monthly',
diff --git a/deployment/frontend/src/components/dashboard/datasets/admin/EditDatasetForm.tsx b/deployment/frontend/src/components/dashboard/datasets/admin/EditDatasetForm.tsx
index 6ee0e7e60..4a605f70c 100644
--- a/deployment/frontend/src/components/dashboard/datasets/admin/EditDatasetForm.tsx
+++ b/deployment/frontend/src/components/dashboard/datasets/admin/EditDatasetForm.tsx
@@ -139,6 +139,7 @@ export default function EditDatasetForm({ dataset }: { dataset: WriDataset }) {
 
         return 0
     }) as unknown as ResourceFormType[]
+
     const formObj = useForm<DatasetFormType>({
         resolver: zodResolver(DatasetSchema),
         mode: 'onBlur',
@@ -169,8 +170,9 @@ export default function EditDatasetForm({ dataset }: { dataset: WriDataset }) {
                       value: dataset.organization.name,
                       label: dataset.organization.title,
                       id: dataset.organization.id,
+                      visibility: dataset.organization.visibility,
                   }
-                : { value: '', label: 'No Team', id: '' },
+                : { value: '', label: 'No Team', id: '', visibility: '' },
             license_id: license
                 ? { value: license.id, label: license.title }
                 : undefined,
diff --git a/deployment/frontend/src/components/dashboard/datasets/admin/metadata/Overview.tsx b/deployment/frontend/src/components/dashboard/datasets/admin/metadata/Overview.tsx
index 8d7a3c8bc..707cd7133 100644
--- a/deployment/frontend/src/components/dashboard/datasets/admin/metadata/Overview.tsx
+++ b/deployment/frontend/src/components/dashboard/datasets/admin/metadata/Overview.tsx
@@ -129,11 +129,14 @@ export function OverviewForm({
                                                 label: 'No team',
                                                 value: '',
                                                 id: '',
+                                                visibility: '',
                                             },
                                             ...data.map((team) => ({
                                                 label: team.title ?? team.name,
                                                 value: team.name,
                                                 id: team.id,
+                                                visibility:
+                                                    team.visibility ?? 'public',
                                             })),
                                         ]}
                                         placeholder="Select a team"
@@ -308,7 +311,7 @@ export function OverviewForm({
                     </InputGroup>
                     <InputGroup label="Citation" className="items-start">
                         <TextArea
-                            aria-label='Citation'
+                            aria-label="Citation"
                             placeholder=""
                             type="text"
                             {...register('citation')}
@@ -328,6 +331,7 @@ export function OverviewForm({
                             formObj={formObj}
                             options={visibilityOptions}
                         />
+                        <ErrorDisplay name="visibility_type" errors={errors} />
                     </InputGroup>
                     <InputGroup label="License">
                         {match(possibleLicenses)
@@ -372,7 +376,10 @@ export function OverviewForm({
                     <div
                         className={classNames(
                             'items-end flex-col justify-end space-y-5',
-                            watch('visibility_type') && watch('visibility_type')?.value === 'public' ? 'flex' : 'hidden'
+                            watch('visibility_type') &&
+                                watch('visibility_type')?.value === 'public'
+                                ? 'flex'
+                                : 'hidden'
                         )}
                     >
                         <div className="relative flex justify-end">
diff --git a/deployment/frontend/src/components/dashboard/teams/forms/EditTeamForm.tsx b/deployment/frontend/src/components/dashboard/teams/forms/EditTeamForm.tsx
index 3a417d8f3..9acfa042e 100644
--- a/deployment/frontend/src/components/dashboard/teams/forms/EditTeamForm.tsx
+++ b/deployment/frontend/src/components/dashboard/teams/forms/EditTeamForm.tsx
@@ -10,10 +10,10 @@ import notify from '@/utils/notify'
 import { api } from '@/utils/api'
 import { ErrorAlert } from '@/components/_shared/Alerts'
 import { useRouter } from 'next/router'
-import dynamic from 'next/dynamic';
+import dynamic from 'next/dynamic'
 const Modal = dynamic(() => import('@/components/_shared/Modal'), {
     ssr: false,
-});
+})
 import { ExclamationTriangleIcon } from '@heroicons/react/24/outline'
 import { Dialog } from '@headlessui/react'
 import Link from 'next/link'
@@ -45,6 +45,10 @@ export default function EditTeamForm({ team }: { team: TeamOutput }) {
                 value: team.groups[0]?.name ?? '',
                 label: team.groups[0]?.name ?? '',
             },
+            visibility: {
+                value: team.visibility || 'public',
+                label: team.visibility || 'public',
+            },
             members: team.users?.map((member) => ({
                 user: {
                     value: member.name,
@@ -184,47 +188,38 @@ export default function EditTeamForm({ team }: { team: TeamOutput }) {
                         </Tab.List>
                         <Tab.Panels>
                             <Tab.Panel>
-
-                                    <form
-                                        onSubmit={formObj.handleSubmit((data) => {
-                                            editTeam.mutate(data)
-                                        })}
-                                    >
-                                        <div className="w-full py-8 border-b border-blue-800 shadow">
-                                            <div className="px-2 sm:px-8">
-                                                <TeamForm
-                                                    formObj={formObj}
-                                                    editing={true}
-                                                />
-                                            </div>
+                                <form
+                                    onSubmit={formObj.handleSubmit((data) => {
+                                        editTeam.mutate(data)
+                                    })}
+                                >
+                                    <div className="w-full py-8 border-b border-blue-800 shadow">
+                                        <div className="px-2 sm:px-8">
+                                            <TeamForm
+                                                formObj={formObj}
+                                                editing={true}
+                                            />
                                         </div>
-                                        {errorMessage && (
-                                            <div className="py-4">
-                                                <ErrorAlert text={errorMessage} />
-                                            </div>
-                                        )}
-                                    </form>
+                                    </div>
+                                    {errorMessage && (
+                                        <div className="py-4">
+                                            <ErrorAlert text={errorMessage} />
+                                        </div>
+                                    )}
+                                </form>
                             </Tab.Panel>
                             <Tab.Panel
-                                    as="div"
-                                    className="flex flex-col gap-y-12 mt-8"
-                                >
-                                    <Members
-                                        team={team}
-                                        formObj={formObj}
-                                    />
+                                as="div"
+                                className="flex flex-col gap-y-12 mt-8"
+                            >
+                                <Members team={team} formObj={formObj} />
                             </Tab.Panel>
                         </Tab.Panels>
                     </div>
                 </Tab.Group>
                 <div className="flex-col sm:flex-row mt-5 gap-y-4 mx-auto flex w-full max-w-[1380px] gap-x-4 justify-end font-acumin text-2xl font-semibold text-black px-4  sm:px-6 xxl:px-0">
-                    <Button
-                        type="button"
-                        variant="outline"
-                    >
-                        <Link href="/dashboard/teams">
-                            Cancel
-                        </Link>
+                    <Button type="button" variant="outline">
+                        <Link href="/dashboard/teams">Cancel</Link>
                     </Button>
                     <LoaderButton
                         loading={editTeam.isLoading}
diff --git a/deployment/frontend/src/components/dashboard/teams/forms/TeamForm.tsx b/deployment/frontend/src/components/dashboard/teams/forms/TeamForm.tsx
index a83aba57a..9e78fb2d3 100644
--- a/deployment/frontend/src/components/dashboard/teams/forms/TeamForm.tsx
+++ b/deployment/frontend/src/components/dashboard/teams/forms/TeamForm.tsx
@@ -130,6 +130,24 @@ export default function TeamForm({
                         ))}
                     <ErrorDisplay name="parent" errors={errors} />
                 </InputGroup>
+                <InputGroup
+                    label="Visibility"
+                    labelClassName="pt-[0.9rem]"
+                    className="items-start"
+                >
+                    <SimpleSelect
+                        key={editing ? 'edit' : 'create'}
+                        id="visibility"
+                        formObj={formObj}
+                        name="visibility"
+                        options={[
+                            { label: 'Public', value: 'public' },
+                            { label: 'Private', value: 'private' },
+                        ]}
+                        placeholder="Select visibility"
+                    />
+                    <ErrorDisplay name="parent" errors={errors} />
+                </InputGroup>
             </div>
         </div>
     )
diff --git a/deployment/frontend/src/components/team/EditCard.tsx b/deployment/frontend/src/components/team/EditCard.tsx
index 23a1fc592..e38ad7166 100644
--- a/deployment/frontend/src/components/team/EditCard.tsx
+++ b/deployment/frontend/src/components/team/EditCard.tsx
@@ -2,7 +2,7 @@ import { WriOrganization, WriUser } from '@/schema/ckan.schema'
 import React from 'react'
 import Link from 'next/link'
 import { PencilSquareIcon } from '@heroicons/react/24/outline'
-import { Organization } from '@portaljs/ckan'
+import { Organization } from '@/schema/ckan.schema'
 import Spinner from '../_shared/Spinner'
 
 export default function EditCard({
diff --git a/deployment/frontend/src/interfaces/dataset.interface.ts b/deployment/frontend/src/interfaces/dataset.interface.ts
index 30afc2e77..89c66831f 100644
--- a/deployment/frontend/src/interfaces/dataset.interface.ts
+++ b/deployment/frontend/src/interfaces/dataset.interface.ts
@@ -1,5 +1,6 @@
 import { DataDictionaryFormType } from '@/schema/dataset.schema'
-import { Activity, Group, Organization } from '@portaljs/ckan'
+import { Activity, Group } from '@portaljs/ckan'
+import { Organization } from '@/schema/ckan.schema'
 import { APILayerSpec } from './layer.interface'
 import { PlotParams } from 'react-plotly.js'
 
diff --git a/deployment/frontend/src/pages/dashboard/datasets/[datasetName]/edit.tsx b/deployment/frontend/src/pages/dashboard/datasets/[datasetName]/edit.tsx
index 427ce61d3..d3014a157 100644
--- a/deployment/frontend/src/pages/dashboard/datasets/[datasetName]/edit.tsx
+++ b/deployment/frontend/src/pages/dashboard/datasets/[datasetName]/edit.tsx
@@ -91,7 +91,7 @@ export default function EditDatasetPage(
         id: datasetId,
         isPending: pendingExist,
     })
-  console.log('DATASET', dataset)
+
     const deleteDataset = api.dataset.deleteDataset.useMutation({
         onSuccess: async () => {
             await utils.dataset.getOneActualOrPendingDataset.invalidate({
diff --git a/deployment/frontend/src/schema/ckan.schema.ts b/deployment/frontend/src/schema/ckan.schema.ts
index 2f48feac6..6a4a764a7 100644
--- a/deployment/frontend/src/schema/ckan.schema.ts
+++ b/deployment/frontend/src/schema/ckan.schema.ts
@@ -159,12 +159,14 @@ export interface Organization {
     activity_stream?: Array<CkanActivity>
     users?: Array<User>
     tags?: Array<Tag>
+    visibility?: 'public' | 'private'
 }
 
 export interface WriOrganization extends Organization {
     groups?: Group[]
     users?: WriUser[]
     capacity?: string
+    parent?: string | null
 }
 
 export interface WriUser extends CkanUser {
diff --git a/deployment/frontend/src/schema/dataset.schema.ts b/deployment/frontend/src/schema/dataset.schema.ts
index c0375df56..f7dc70d7a 100644
--- a/deployment/frontend/src/schema/dataset.schema.ts
+++ b/deployment/frontend/src/schema/dataset.schema.ts
@@ -117,6 +117,7 @@ export const DatasetSchemaObject = z.object({
         value: z.string(),
         label: z.string(),
         id: z.string(),
+        visibility: z.string(),
     }),
     project: z.string().optional().nullable().or(emptyStringToUndefined),
     application: z.string().optional().nullable(),
@@ -170,22 +171,34 @@ export const DatasetSchemaObject = z.object({
         .optional()
         .nullable()
         .or(emptyStringToUndefined),
-    authors: z.array(
-        z.object({
-            name: z.string().min(1, { message: 'Author Name is required' }),
-            email: z.string().email().min(1, {
-                message: 'Author Email is required',
-            }),
-        })
-    ).min(1, { message: 'At least one (1) Author Name and Author Email is required.' }),
-    maintainers: z.array(
-        z.object({
-            name: z.string().min(1, { message: 'Maintainer Name is required' }),
-            email: z.string().email().min(1, {
-                message: 'Maintainer Email is required',
-            }),
-        })
-    ).min(1, { message: 'At least one (1) Maintainer Name and Maintainer Email is required.' }),
+    authors: z
+        .array(
+            z.object({
+                name: z.string().min(1, { message: 'Author Name is required' }),
+                email: z.string().email().min(1, {
+                    message: 'Author Email is required',
+                }),
+            })
+        )
+        .min(1, {
+            message:
+                'At least one (1) Author Name and Author Email is required.',
+        }),
+    maintainers: z
+        .array(
+            z.object({
+                name: z
+                    .string()
+                    .min(1, { message: 'Maintainer Name is required' }),
+                email: z.string().email().min(1, {
+                    message: 'Maintainer Email is required',
+                }),
+            })
+        )
+        .min(1, {
+            message:
+                'At least one (1) Maintainer Name and Maintainer Email is required.',
+        }),
     function: z.string().optional().nullable(),
     restrictions: z.string().optional().nullable(),
     reason_for_adding: z.string().optional().nullable(),
@@ -298,7 +311,8 @@ export const DatasetSchema = DatasetSchemaObject.refine(
             return true
         },
         {
-            message: 'At least one (1) Author Name and Author Email is required.',
+            message:
+                'At least one (1) Author Name and Author Email is required.',
             path: ['authors'],
         }
     )
@@ -313,6 +327,21 @@ export const DatasetSchema = DatasetSchemaObject.refine(
             path: ['maintainers'],
         }
     )
+    .refine(
+        (obj) => {
+            if (
+                (obj.visibility_type.value === 'public' ||
+                    obj.visibility_type.value === 'internal') &&
+                obj.team.visibility === 'private'
+            )
+                return false
+            return true
+        },
+        {
+            message: 'Public dataset cannot be assigned to private team',
+            path: ['visibility_type'],
+        }
+    )
 
 export const DatasetSchemaForEdit = DatasetSchemaObject.partial()
 export type VisibilityTypeUnion = z.infer<typeof visibilityTypeSchema>
diff --git a/deployment/frontend/src/schema/team.schema.ts b/deployment/frontend/src/schema/team.schema.ts
index 22da63efd..e3d0d6099 100644
--- a/deployment/frontend/src/schema/team.schema.ts
+++ b/deployment/frontend/src/schema/team.schema.ts
@@ -3,7 +3,6 @@ import z from 'zod'
 
 const capacitySchema = z.enum(['admin', 'editor', 'member'])
 
-
 export const MemberSchema = z.object({
     user: z.object({ value: z.string(), label: z.string() }),
     team_id: z.string(),
@@ -32,7 +31,18 @@ export const TeamSchema = z.object({
         })
         .optional(),
     members: z.array(MemberSchema).default([]),
-    users: z.array(z.object({ name: z.string(), capacity: z.string() })).default([]),
+    users: z
+        .array(z.object({ name: z.string(), capacity: z.string() }))
+        .default([]),
+    visibility: z
+        .object({
+            value: z.string(),
+            label: z.string(),
+        })
+        .default({
+            value: 'public',
+            label: 'Public',
+        }),
 })
 
 export type TeamFormType = z.infer<typeof TeamSchema>
diff --git a/deployment/frontend/src/server/api/routers/User.ts b/deployment/frontend/src/server/api/routers/User.ts
index 3fb8df0a9..c8c4481ac 100644
--- a/deployment/frontend/src/server/api/routers/User.ts
+++ b/deployment/frontend/src/server/api/routers/User.ts
@@ -100,24 +100,6 @@ export const UserRouter = createTRPCRouter({
             if (!data.success && data.error) throw Error(data.error.message)
 
             let users = data.result
-            if (!ctx.session.user.sysadmin) {
-                let user = users.find((user) => user.id === ctx.session.user.id)
-                if (user) {
-                    let o_users = [user]
-                    let user_org = user.organizations
-                    if (user_org) {
-                        o_users = []
-                        for (const org of user_org) {
-                            for (const user of org.users!) {
-                                o_users.push(
-                                    users.find((u) => u.id === user.id)!
-                                )
-                            }
-                        }
-                    }
-                    users = o_users
-                }
-            }
 
             let result: IUsers[] = users.map((user) => {
                 let rslt = {
@@ -313,8 +295,7 @@ export const UserRouter = createTRPCRouter({
             )
             const apiToken: CkanResponse<ApiToken> = await res.json()
             if (!apiToken.success && apiToken.error) {
-                if (apiToken.error.message)
-                    throw Error(apiToken.error.message)
+                if (apiToken.error.message) throw Error(apiToken.error.message)
                 throw Error(JSON.stringify(apiToken.error))
             }
             return apiToken.result
@@ -335,8 +316,7 @@ export const UserRouter = createTRPCRouter({
             )
             const apiToken: CkanResponse<{ token: string }> = await res.json()
             if (!apiToken.success && apiToken.error) {
-                if (apiToken.error.message)
-                    throw Error(apiToken.error.message)
+                if (apiToken.error.message) throw Error(apiToken.error.message)
                 throw Error(JSON.stringify(apiToken.error))
             }
             return apiToken.result
diff --git a/deployment/frontend/src/server/api/routers/teams.ts b/deployment/frontend/src/server/api/routers/teams.ts
index af1458ca0..a51c9cc1a 100644
--- a/deployment/frontend/src/server/api/routers/teams.ts
+++ b/deployment/frontend/src/server/api/routers/teams.ts
@@ -5,7 +5,7 @@ import {
 } from '@/server/api/trpc'
 import { env } from '@/env.mjs'
 import { CkanResponse, Collaborator } from '@/schema/ckan.schema'
-import { Organization } from '@portaljs/ckan'
+import { Organization } from '@/schema/ckan.schema'
 import { TeamSchema } from '@/schema/team.schema'
 import { z } from 'zod'
 import { replaceNames } from '@/utils/replaceNames'
@@ -37,12 +37,12 @@ export const teamRouter = createTRPCRouter({
                     user.sysadmin
                         ? `${
                               env.CKAN_URL
-                          }/api/action/organization_list?all_fields=True&limit=${
+                          }/api/action/organization_list?all_fields=True&include_extras=true&limit=${
                               (i + 1) * 25
                           }&offset=${i * 25}`
                         : `${
                               env.CKAN_URL
-                          }/api/action/organization_list_for_user?all_fields=True&limit=${
+                          }/api/action/organization_list_for_user?all_fields=True&include_extras=true&limit=${
                               (i + 1) * 25
                           }&offset=${i * 25}`,
                     {
@@ -99,6 +99,7 @@ export const teamRouter = createTRPCRouter({
                         input.parent && input.parent.value !== ''
                             ? [{ name: input.parent.value }]
                             : [],
+                    visibility: input.visibility.value,
                 })
                 const teamRes = await fetch(
                     `${env.CKAN_URL}/api/action/organization_patch`,
@@ -130,7 +131,7 @@ export const teamRouter = createTRPCRouter({
         .query(async ({ ctx, input }) => {
             const user = ctx.session.user
             const teamRes = await fetch(
-                `${env.CKAN_URL}/api/action/organization_show?id=${input.id}&include_users=True`,
+                `${env.CKAN_URL}/api/action/organization_show?id=${input.id}&include_users=True&include_extras=true`,
                 {
                     headers: {
                         'Content-Type': 'application/json',
@@ -139,7 +140,9 @@ export const teamRouter = createTRPCRouter({
                 }
             )
             const team: CkanResponse<
-                WriOrganization & { groups: Organization[] }
+                WriOrganization & {
+                    groups: Organization[]
+                }
             > = await teamRes.json()
             return {
                 ...team.result,
@@ -206,7 +209,9 @@ export const teamRouter = createTRPCRouter({
                         input.parent && input.parent.value !== ''
                             ? [{ name: input.parent.value }]
                             : [],
+                    visibility: input.visibility.value,
                 })
+
                 const teamRes = await fetch(
                     `${env.CKAN_URL}/api/action/organization_create`,
                     {
diff --git a/deployment/frontend/src/utils/apiUtils.ts b/deployment/frontend/src/utils/apiUtils.ts
index f0ae23445..f199b1084 100644
--- a/deployment/frontend/src/utils/apiUtils.ts
+++ b/deployment/frontend/src/utils/apiUtils.ts
@@ -101,10 +101,8 @@ export async function searchHierarchy({
             )
 
             const data = (await response.json()) as CkanResponse<GroupTree[]>
-            console.log('TESTING', data)
             groups = data.success === true ? data.result : []
         }
-
         return groups
     } catch (e) {
         throw new Error(e as string)
@@ -310,7 +308,9 @@ export async function getAllDatasetFq({
         }
 
         if (facetFields) {
-            const _facetFields = facetFields.filter(f => f !== 'metadata_modified')
+            const _facetFields = facetFields.filter(
+                (f) => f !== 'metadata_modified'
+            )
             url += `&facet.field=["${_facetFields.join('","')}"]`
         }
 
@@ -532,6 +532,20 @@ export async function getOneDataset(
         throw Error(JSON.stringify(dataset.error))
     }
 
+    if (dataset.result.owner_org) {
+        const org = await getOrgDetails({
+            orgId: dataset.result.owner_org,
+            apiKey: session?.user.apikey ?? '',
+        })
+
+        const visibility = org?.visibility || 'public'
+
+        const organization = dataset.result.organization!
+        organization.visibility = visibility
+        dataset.result = { ...dataset.result, organization }
+    }
+
+
     if (dataset.result.rw_id && dataset.result.approval_status !== 'pending') {
         const rwRes = await fetch(
             `https://api.resourcewatch.org/v1/dataset/${dataset.result.rw_id}`,
@@ -683,7 +697,20 @@ export async function getOnePendingDataset(
         }
         throw Error(JSON.stringify(data.error))
     }
-    const dataset = data.result.package_data
+    let dataset = data.result.package_data
+
+    if (dataset.owner_org) {
+        const org = await getOrgDetails({
+            orgId: dataset.owner_org,
+            apiKey: session?.user.apikey ?? '',
+        })
+
+        const visibility = org?.visibility || 'public'
+
+        const organization = dataset.organization!
+        organization.visibility = visibility
+        dataset = { ...dataset, organization }
+    }
 
     // if (dataset.rw_id) {
     const resourceLayer = dataset.resources.filter(
diff --git a/deployment/helm-templates/values.yaml.dev.template b/deployment/helm-templates/values.yaml.dev.template
index 6d531362e..7a4f77324 100644
--- a/deployment/helm-templates/values.yaml.dev.template
+++ b/deployment/helm-templates/values.yaml.dev.template
@@ -30,13 +30,13 @@ ckan:
       CKAN__SITE_TITLE: WRI OpenData Platform Dev
       CKAN__STORAGE_PATH: /tmp
       CKAN__VIEWS__DEFAULT_VIEWS: recline_view text_view image_view pdf_view geojson_view
-      CKAN__PLUGINS: image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri wri_api_tracking auth hierarchy_display hierarchy_form hierarchy_group_form issues envvars
+      CKAN__PLUGINS: image_view text_view webpage_view resource_proxy datatables_view datastore datapusher activity s3filestore scheming_datasets scheming_organizations scheming_groups wri wri_api_tracking auth hierarchy_display issues envvars
       CKAN__AUTH__CREATE_UNOWNED_DATASET: "True"
       CKAN__AUTH__ALLOW_DATASET_COLLABORATORS: "True"
       CKAN__AUTH__ALLOW_ADMIN_COLLABORATORS: "True"
       CKAN__AUTH__ALLOW_COLLABORATORS_TO_CHANGE_OWNER_ORG: "True"
       CKAN___SCHEMING__DATASET_SCHEMAS: ckanext.wri.schema:ckan_dataset.yaml
-      CKAN___SCHEMING__ORGANIZATION_SCHEMAS: ckanext.scheming:custom_org_with_address.json
+      CKAN___SCHEMING__ORGANIZATION_SCHEMAS: ckanext.wri.schema:custom_org_with_address.json
       CKAN___SCHEMING__GROUP_SCHEMAS: ckanext.scheming:custom_group_with_status.json
       CKAN___SCHEMING__PRESETS: ckanext.wri.schema:presets.json
       CKANEXT__AUTH__INCLUDE_FRONTEND_LOGIN_TOKEN: "True"
diff --git a/e2e-tests/cypress/e2e/private_teams.cy.js b/e2e-tests/cypress/e2e/private_teams.cy.js
new file mode 100644
index 000000000..36f3f65d8
--- /dev/null
+++ b/e2e-tests/cypress/e2e/private_teams.cy.js
@@ -0,0 +1,146 @@
+const ckanUserName = Cypress.env("CKAN_USERNAME");
+const ckanUserPassword = Cypress.env("CKAN_PASSWORD");
+const orgSuffix = Cypress.env("ORG_NAME_SUFFIX");
+const datasetSuffix = Cypress.env("DATASET_NAME_SUFFIX");
+const uuid = () => Math.random().toString(36).slice(2) + "-test";
+const normalUserEmail = Math.random().toString(36).slice(2) + "@test.com";
+const normalUser = `${uuid()}${Cypress.env("USER_NAME_SUFFIX")}_member`;
+const normalUserPassword = "test1234";
+
+
+
+const parentOrg = `${uuid()}${Cypress.env("ORG_NAME_SUFFIX")}`;
+const org = `${uuid()}${Cypress.env("ORG_NAME_SUFFIX")}`;
+
+describe("Create and edit team", () => {
+
+  before(() => {
+    cy.createUserApi(normalUser, normalUserEmail, normalUserPassword);
+  });
+    
+    beforeEach(function () {
+      cy.login(ckanUserName, ckanUserPassword);
+    });
+  
+    it("Should create team", () => {
+      cy.visit("/dashboard/teams/new");
+      //get input with name=title
+      cy.get("input[name=title]").type(org);
+      //check if input with name url has the content of "test-team"
+      cy.get("input[name=name]").should("have.value", org);
+      cy.get("textarea[name=description]").type("Test description");
+      //get button with aria-haspopup=true
+
+      cy.get('button[aria-haspopup=listbox]')
+      .should('have.length', 2) 
+      cy.get("button#visibility").click();
+      cy.get("li").contains("Private").click();
+      cy.get("button[type=submit]").click();
+
+      cy.visit(`/teams/${org}`).then(() => {
+        cy.contains(org).should("exist");
+      });
+    });
+
+    it("Should not access public team outside", () => {
+      cy.logout();
+      cy.login(normalUser, normalUserPassword);
+      cy.visit("/teams");
+      cy.contains(org).should("not.exist");
+
+      cy.visit(`/teams/${org}`);
+      cy.contains("Team not found").should("exist");
+
+    });
+
+    it("Should not create public dataset with private team", () => {
+        cy.visit("/dashboard/datasets/new");
+    
+        cy.get("input[name=title]").type(datasetSuffix);
+        cy.get("input[name=name]").should("have.value", datasetSuffix);
+        cy.get("input[name=url]").type("https://google.com");
+        cy.get("#language").click();
+        cy.get("li").contains("English").click();
+        cy.get("#visibility_type").click();
+        cy.get("li").contains("Public").click();
+        cy.get("#team").click();
+        cy.get("li").contains(org).click();
+        cy.get("input[name=application]").type("GFW");
+        cy.get("button").contains("Tags").click();
+        cy.get("#tagsSearchInput").type("Tag 1{enter}", { force: true }).clear();
+        cy.get("input[name=project]").focus().type("Project 1");
+        cy.get("input[name=technical_notes]").type("https://google.com");
+        cy.get("textarea[name=short_description]").type("test");
+
+        cy.contains("Add Author").click();
+        cy.get('input[name="authors.0.name"]').type("Test Author 1");
+        cy.get('input[name="authors.0.email"]').type("test-author-1@example.com");
+
+        cy.contains("Add Maintainer").click();
+        cy.get('input[name="maintainers.0.name"]').type("Test Maintainer 1");
+        cy.get('input[name="maintainers.0.email"]').type("test-maintainer-1@example.com");
+        
+        cy.contains("Next: Datafiles").click();
+        cy.contains("Public dataset cannot be assigned to private team").should("exist");
+    });
+
+    it("Should edit team and assign public dataset and edit team back to private", () => {
+
+        cy.visit(`/dashboard/teams/${org}/edit`).then(() => {
+            cy.get("input[name=title]").should("have.value", org);
+            cy.get('button[aria-haspopup=listbox]')
+            .should('have.length', 2) 
+            cy.get("button#visibility").click();
+            cy.get("li").contains("Public").click();
+            cy.get("button[type=submit]").click();
+        });
+        cy.visit(`/dashboard/datasets/new`);
+        cy.get("input[name=title]").type(datasetSuffix);
+        cy.get("input[name=name]").should("have.value", datasetSuffix);
+        cy.get("input[name=url]").type("https://google.com");
+        cy.get("#language").click();
+        cy.get("li").contains("English").click();
+        cy.get("#visibility_type").click();
+        cy.get("li").contains("Public").click();
+        cy.get("#team").click();
+        cy.get("li").contains(org).click();
+        cy.get("input[name=application]").type("GFW");
+        cy.get("button").contains("Tags").click();
+        cy.get("#tagsSearchInput").type("Tag 1{enter}", { force: true }).clear();
+        cy.get("input[name=project]").focus().type("Project 1");
+        cy.get("input[name=technical_notes]").type("https://google.com");
+        cy.get("textarea[name=short_description]").type("test");
+
+        cy.contains("Add Author").click();
+        cy.get('input[name="authors.0.name"]').type("Test Author 1");
+        cy.get('input[name="authors.0.email"]').type("test-author-1@example.com");
+
+        cy.contains("Add Maintainer").click();
+        cy.get('input[name="maintainers.0.name"]').type("Test Maintainer 1");
+        cy.get('input[name="maintainers.0.email"]').type("test-maintainer-1@example.com");
+        
+        cy.contains("Next: Datafiles").click();
+        cy.contains("Next: Map Visualizations").click();
+        cy.contains("Next: Preview").click();
+        cy.get('button[type="submit"]').click();
+        cy.wait(10000);
+
+        cy.visit(`/dashboard/teams/${org}/edit`).then(() => {
+            cy.get("input[name=title]").should("have.value", org);
+            cy.get('button[aria-haspopup=listbox]')
+              .should('have.length', 2) 
+              cy.get("button#visibility").click();
+              cy.get("li").contains("Private").click();
+            cy.get("button[type=submit]").click();
+            cy.wait(10000);
+            cy.contains("Team has public datasets and cannot be made private").should("exist");
+        });
+        
+    })
+
+
+  after(() => {
+    cy.deleteDatasetAPI(datasetSuffix);
+    cy.deleteOrganizationAPI(org);
+  });
+});
\ No newline at end of file
diff --git a/e2e-tests/cypress/e2e/team_crud.cy.js b/e2e-tests/cypress/e2e/team_crud.cy.js
index deaafcc82..40319ee8b 100644
--- a/e2e-tests/cypress/e2e/team_crud.cy.js
+++ b/e2e-tests/cypress/e2e/team_crud.cy.js
@@ -24,7 +24,8 @@ describe("Create and edit team", () => {
     cy.get("input[name=name]").should("have.value", org);
     cy.get("textarea[name=description]").type("Test description");
     //get button with aria-haspopup=true
-    cy.get("button[aria-haspopup=listbox]").click();
+    cy.get("button[aria-haspopup=listbox]").contains('span', 'Select a parent').click();
+
     // get li element that contains the text "test-organization"
     cy.get("li").contains(parentOrg).click();
     //get button of type submit and click it