diff --git a/src/api/groups.service.ts b/src/api/groups.service.ts
index 3164d5830..094936570 100644
--- a/src/api/groups.service.ts
+++ b/src/api/groups.service.ts
@@ -11,6 +11,7 @@ import { _adaptParamsToGetQuery } from '@/api/utils.service'
 import useAPI from '@/composables/useAPI'
 import { ProjectModel } from '@/models/project.model'
 import { PeopleGroupModel } from '@/models/invitation.model'
+import { BaseLocationModel, LocationModel } from '@/models/location.model'
 
 // HIERARCHY
 export async function getHierarchyGroups(organizationCode: string, config = {}) {
@@ -167,3 +168,69 @@ export async function getSubGroup(organizationCode: string, groupId: number, con
     config
   )
 }
+
+export async function getGroupProjectsLocation(
+  organizationCode: string,
+  groupId: number,
+  config = {}
+) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/projects-locations/`,
+    config
+  )
+}
+
+export async function getGroupLocation(organizationCode: string, groupId: number, config = {}) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/locations/`,
+    config
+  )
+}
+
+export async function removeGroupLocation(
+  organizationCode: string,
+  groupId: number,
+  locationId: number,
+  config = {}
+) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/locations/${locationId}/`,
+    {
+      ...config,
+      method: 'DELETE',
+    }
+  )
+}
+
+export async function patchGroupLocation(
+  organizationCode: string,
+  groupId: number,
+  locationId: number,
+  payload: Partial<BaseLocationModel>,
+  config = {}
+) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/locations/${locationId}/`,
+    {
+      ...config,
+      body: payload,
+      method: 'PATCH',
+    }
+  )
+}
+
+export async function postGroupLocation(
+  organizationCode: string,
+  groupId: number,
+  payload: BaseLocationModel,
+  config = {}
+) {
+  return await useAPI<PaginationResult<LocationModel>>(
+    `organization/${organizationCode}/people-group/${groupId}/locations/`,
+    {
+      ...config,
+      body: payload,
+      method: 'POST',
+    }
+  )
+}
diff --git a/src/api/locations.services.ts b/src/api/locations.services.ts
index a4300637a..88a69acec 100644
--- a/src/api/locations.services.ts
+++ b/src/api/locations.services.ts
@@ -1,6 +1,5 @@
 import type { LocationModel, ProjectLocationForm } from '@/models/location.model'
 import useAPI from '@/composables/useAPI'
-import utils from '@/functs/functions'
 import { Locations } from '@/interfaces/maps'
 
 export async function getProjectLocations(projectId: number) {
@@ -11,13 +10,8 @@ export async function getProjectLocation(projectId: string, locationId: number)
   return await useAPI<LocationModel>(`project/${projectId}/location/${locationId}/`)
 }
 
-export async function getLocations(params, next) {
-  if (next) {
-    // TODO: nuxt check next works
-    return await useAPI<Locations>(next, {}) //.data.value
-  }
-
-  return await useAPI<Locations>(`location/`, { ...utils.adaptParam(params) }) //.data.value
+export async function getLocations(organizationCode: string, config = {}) {
+  return await useAPI<Locations>(`organization/${organizationCode}/location/`, config)
 }
 
 export async function postLocations(projectId: string, body: ProjectLocationForm) {
diff --git a/src/api/v2/group.service.ts b/src/api/v2/group.service.ts
index 7695aa184..68a4e3d73 100644
--- a/src/api/v2/group.service.ts
+++ b/src/api/v2/group.service.ts
@@ -5,6 +5,7 @@ import {
   getGroupMember as fetchGetGroupMember,
   getGroupSimilar as fetchGetGroupSimilar,
   getSubGroup as fetchGetSubGroup,
+  getGroupProjectsLocation as fetchGroupProjectsLocation,
 } from '@/api/groups.service'
 import useAsyncAPI from '@/composables/useAsyncAPI'
 import useAsyncPaginationAPI from '@/composables/useAsyncPaginationAPI'
@@ -142,3 +143,26 @@ export const getSubGroup = (
     }
   )
 }
+
+export const getGroupProjectsLocation = (
+  organizationCode: RefOrRaw<OrganizationModel['code']>,
+  groupId: RefOrRaw<GroupModel['id']>,
+  config = {}
+) => {
+  const { translateProjectLocations } = useAutoTranslate()
+  const key = computed(() => `${unref(organizationCode)}::group::${unref(groupId)}::locations`)
+
+  return useAsyncAPI(
+    key,
+    ({ config }) =>
+      fetchGroupProjectsLocation(unref(organizationCode), unref(groupId), {
+        ...DEFAULT_CONFIG,
+        ...config,
+      }),
+    {
+      translate: translateProjectLocations,
+      watch: onlyRefs([organizationCode, groupId]),
+      ...config,
+    }
+  )
+}
diff --git a/src/api/v2/location.service.ts b/src/api/v2/location.service.ts
new file mode 100644
index 000000000..606b7ec6f
--- /dev/null
+++ b/src/api/v2/location.service.ts
@@ -0,0 +1,31 @@
+import { getLocations as fetchGetLocations } from '@/api/locations.services'
+import useAsyncAPI from '@/composables/useAsyncAPI'
+import { onlyRefs } from '@/functs/onlyRefs'
+import { Locations } from '@/interfaces/maps'
+import { RefOrRaw } from '@/interfaces/utils'
+import { OrganizationModel } from '@/models/organization.model'
+
+const DEFAULT_CONFIG = {}
+
+export const getLocations = (
+  organizationCode: RefOrRaw<OrganizationModel['code']>,
+  config = {}
+) => {
+  const { translatePeopleGroupLocations, translateProjectLocations } = useAutoTranslate()
+  const key = computed(() => `${unref(organizationCode)}::locations`)
+
+  const translateAllModel = (data: ComputedRef<Locations>) => {
+    return computed(() => {
+      return {
+        groups: unref(translatePeopleGroupLocations(data.value?.groups)),
+        projects: unref(translateProjectLocations(data.value?.projects)),
+      }
+    })
+  }
+
+  return useAsyncAPI(key, () => fetchGetLocations(unref(organizationCode), { ...DEFAULT_CONFIG }), {
+    translate: translateAllModel,
+    watch: onlyRefs([organizationCode]),
+    ...config,
+  })
+}
diff --git a/src/app/useGroupPagesRoutes.ts b/src/app/useGroupPagesRoutes.ts
index 10975e914..486fd6a16 100644
--- a/src/app/useGroupPagesRoutes.ts
+++ b/src/app/useGroupPagesRoutes.ts
@@ -38,6 +38,11 @@ export default function useGroupPagesRoutes() {
             documentType: 'conferences',
           }),
         },
+        {
+          path: 'locations',
+          name: 'groupLocations',
+          component: () => import('../pages/GroupPageV2/Tabs/Locations/GroupLocationsTab.vue'),
+        },
         // retro compat
         {
           path: 'Edit',
diff --git a/src/components/group/GroupForm/GroupForm.vue b/src/components/group/GroupForm/GroupForm.vue
index 18e9b7256..4bdd08899 100644
--- a/src/components/group/GroupForm/GroupForm.vue
+++ b/src/components/group/GroupForm/GroupForm.vue
@@ -81,7 +81,7 @@
     <!-- tags -->
     <div class="description">
       <label>
-        {{ $t('group.form.tags') }}
+        {{ $t('tag.title') }}
         <LpiButton
           class="add-btn"
           :btn-icon="form.tags?.length ? 'Pen' : 'Plus'"
@@ -97,7 +97,7 @@
     <!-- Sdg -->
     <div class="description">
       <label>
-        {{ $t('group.form.sdg-label') }}
+        {{ $t('sdg.title') }}
         <LpiButton
           class="add-btn"
           :btn-icon="form.sdgs?.length ? 'Pen' : 'Plus'"
@@ -110,6 +110,30 @@
       <SdgsDrawer v-model="form.sdgs" :is-opened="openSdg" @close="openSdg = false" />
     </div>
 
+    <!-- locations -->
+    <div class="description">
+      <label>
+        {{ $t('group.location') }}
+        <LpiButton
+          class="add-btn"
+          :btn-icon="form.locations.length ? 'Pen' : 'Plus'"
+          data-test="add-location"
+          :label="$t(form.locations.length ? 'group.form.edit' : 'group.form.add')"
+          @click="openModal()"
+        />
+      </label>
+      <LocationList :locations="form.locations" editable @delete="removeLocations" />
+      <LocationDrawer
+        :is-opened="stateModal"
+        :locations="form.locations"
+        editable
+        :location-types="['address']"
+        @close="closeModal()"
+        @submit="submitLocations"
+        @delete="removeLocations"
+      />
+    </div>
+
     <template v-if="!isReducedMode">
       <!-- Team -->
       <div class="team">
@@ -186,7 +210,13 @@
 </template>
 
 <script>
-import { deleteGroup, getHierarchyGroups } from '@/api/groups.service.ts'
+import {
+  deleteGroup,
+  getHierarchyGroups,
+  patchGroupLocation,
+  postGroupLocation,
+  removeGroupLocation,
+} from '@/api/groups.service.ts'
 import useOrganizationsStore from '@/stores/useOrganizations.ts'
 import { useRuntimeConfig } from '#imports'
 import { usePatatoids } from '@/composables/usePatatoids'
@@ -194,6 +224,9 @@ import SdgsDrawer from '@/components/sdgs/SdgsDrawer.vue'
 import SdgList from '@/components/sdgs/SdgList.vue'
 import TagsDrawer from '@/components/tags/TagsDrawer.vue'
 import TagsFilterSummary from '@/components/search/Filters/TagsFilterSummary.vue'
+import LocationDrawer from '@/components/map/LocationDrawer.vue'
+import LocationList from '@/components/map/LocationList.vue'
+
 export default {
   name: 'GroupForm',
 
@@ -202,6 +235,8 @@ export default {
     SdgsDrawer,
     TagsDrawer,
     TagsFilterSummary,
+    LocationDrawer,
+    LocationList,
   },
 
   props: {
@@ -274,6 +309,7 @@ export default {
         members: [],
         sdgs: [],
         tags: [],
+        locations: [],
         featuredProjects: [],
         header_image: null,
         imageSizes: null,
@@ -358,6 +394,44 @@ export default {
         name: 'HomeRoot',
       })
     },
+    async removeLocations(location) {
+      // remove location (if already exists, send request)
+      if (location.id) {
+        await removeGroupLocation(
+          this.organizationsStore.current.code,
+          this.$route.params.groupId,
+          location.id
+        )
+        this.form.locations = this.form.locations.filter((el) => el.id !== location.id)
+      } else {
+        this.form.locations = this.form.locations.filter((el) => el !== location)
+      }
+      this.closeModal()
+    },
+    async submitLocations(location) {
+      const groupId = this.$route.params.groupId
+      let locationElement = location
+
+      if (groupId) {
+        if (location.id) {
+          this.form.locations = this.form.locations.filter((el) => el.id !== location.id)
+          locationElement = await patchGroupLocation(
+            this.organizationsStore.current.code,
+            this.$route.params.groupId,
+            location.id,
+            location
+          )
+        } else {
+          locationElement = await postGroupLocation(
+            this.organizationsStore.current.code,
+            this.$route.params.groupId,
+            location
+          )
+        }
+      }
+      this.form.locations = [...this.form.locations, locationElement]
+      this.closeModal()
+    },
   },
 }
 </script>
@@ -391,7 +465,8 @@ export default {
 
   .team,
   .parent-group,
-  .project {
+  .project,
+  .location {
     margin-bottom: $space-xl;
   }
 
diff --git a/src/components/group/Map/GroupLocationToolTip.vue b/src/components/group/Map/GroupLocationToolTip.vue
new file mode 100644
index 000000000..729cbd18f
--- /dev/null
+++ b/src/components/group/Map/GroupLocationToolTip.vue
@@ -0,0 +1,20 @@
+<template>
+  <CardLocationTooltip
+    :location="location"
+    :label="$t('group.view')"
+    :to="{ name: 'Group', params: { groupId: group.id } }"
+    :image="group.header_image"
+    :default-picture="DEFAULT_GROUP_PATATOID"
+    :title="group.$t.name"
+    :description="group.$t.short_description ?? group.$t.description"
+  />
+</template>
+
+<script setup lang="ts">
+import { AnyTranslatedLocation } from '@/models/location.model'
+import { TranslatedPeopleGroupModel } from '@/models/invitation.model'
+import { DEFAULT_GROUP_PATATOID } from '@/composables/usePatatoids'
+import CardLocationTooltip from '@/components/map/CardLocationTooltip.vue'
+
+defineProps<{ location: AnyTranslatedLocation; group: TranslatedPeopleGroupModel }>()
+</script>
diff --git a/src/components/group/Modules/GroupHeader.vue b/src/components/group/Modules/GroupHeader.vue
index 141b1198a..73945b1b1 100644
--- a/src/components/group/Modules/GroupHeader.vue
+++ b/src/components/group/Modules/GroupHeader.vue
@@ -62,6 +62,16 @@
         </div>
       </div>
       <div v-if="hasExtras" class="group-info-extras">
+        <div v-if="hasLinks" class="group-info-links">
+          <button
+            v-if="group.locations.length"
+            class="group-recap-element group-location reset-btn"
+            @click="openModal()"
+          >
+            <IconImage name="MapMarker" />
+            <span class="group-recap-title">{{ t('group.location') }}</span>
+          </button>
+        </div>
         <SdgList
           class="group-info-sdgs"
           :sdgs="group.sdgs"
@@ -74,6 +84,13 @@
           }"
         />
       </div>
+      <!-- drawer views -->
+      <LocationDrawer
+        v-if="group.locations.length"
+        :is-opened="stateModal"
+        :locations="group.locations"
+        @close="closeModal()"
+      />
     </template>
   </BaseGroupPreview>
 </template>
@@ -84,6 +101,7 @@ import { TranslatedPeopleGroupModel } from '@/models/invitation.model'
 import BaseGroupPreview from '@/components/group/Modules/BaseGroupPreview.vue'
 import SdgList from '@/components/sdgs/SdgList.vue'
 import TagsList from '@/components/tags/TagsList.vue'
+import LocationDrawer from '@/components/map/LocationDrawer.vue'
 import { getGroupMember } from '@/api/v2/group.service'
 import GroupMemberItem from '@/components/group/Modules/Members/GroupMemberItem.vue'
 import FetchLoader from '@/components/base/FetchLoader.vue'
@@ -100,6 +118,7 @@ const props = withDefaults(
 )
 
 const { t } = useNuxtI18n()
+const { openModal, closeModal, stateModal } = useModal()
 const organizationCode = useOrganizationCode()
 const groupId = computed(() => props.group.id)
 
@@ -122,8 +141,11 @@ const groupVisibilityIcon = computed(() =>
   props.group.publication_status === 'public' ? 'Eye' : 'EyeSlash'
 )
 
+const hasLinks = computed(() => {
+  return props.group.locations.length
+})
 const hasExtras = computed(() => {
-  return props.group.sdgs.length
+  return props.group.sdgs.length || hasLinks.value
 })
 
 // preview leader
@@ -216,6 +238,10 @@ const closeProfile = () => (leaderIdDrawer.value = null)
 .group-recap-title {
   font-weight: bold;
 }
+
+.group-location {
+  cursor: pointer;
+}
 </style>
 
 <style lang="scss">
diff --git a/src/components/group/Modules/Locations/GroupLocationBase.vue b/src/components/group/Modules/Locations/GroupLocationBase.vue
new file mode 100644
index 000000000..3d61b2b4c
--- /dev/null
+++ b/src/components/group/Modules/Locations/GroupLocationBase.vue
@@ -0,0 +1,60 @@
+<template>
+  <FetchLoader :status="status" skeleton only-error>
+    <MapRecap ref="map" :locations="locations" expand :editable="isEdit" @expand="opened = true">
+      <template #tooltip="{ location }">
+        <ProjectLocationTooltip
+          :location="location as TranslatedLocation"
+          :project="location.project"
+        />
+      </template>
+    </MapRecap>
+    <LocationDrawer
+      :is-opened="opened"
+      :editable="isEdit"
+      :locations="locations"
+      :use-cluster="true"
+      @close="opened = false"
+    />
+    <LocationList
+      v-if="!props.preview"
+      focus
+      :editable="isEdit"
+      :locations="locations"
+      @focus="onFocus"
+    />
+  </FetchLoader>
+</template>
+
+<script setup lang="ts">
+import { getGroupProjectsLocation } from '@/api/v2/group.service'
+import LocationDrawer from '@/components/map/LocationDrawer.vue'
+import LocationList from '@/components/map/LocationList.vue'
+import MapRecap from '@/components/map/MapRecap.vue'
+import ProjectLocationTooltip from '@/components/project/map/ProjectLocationTooltip.vue'
+import { TranslatedPeopleGroupModel } from '@/models/invitation.model'
+import { TranslatedLocation } from '@/models/location.model'
+
+const props = withDefaults(
+  defineProps<{
+    group: TranslatedPeopleGroupModel
+    editable?: boolean
+    preview?: boolean
+  }>(),
+  {
+    editable: false,
+    preview: false,
+  }
+)
+
+const isEdit = computed(() => props.editable && !props.preview)
+const opened = ref(false)
+const organizationCode = useOrganizationCode()
+const groupId = computed(() => props.group.id)
+
+const mapRef = useTemplateRef('map')
+const onFocus = (location) => mapRef.value?.map?.flyTo(location)
+
+const { status, data: locations } = getGroupProjectsLocation(organizationCode, groupId, {
+  default: () => [],
+})
+</script>
diff --git a/src/components/group/Modules/Locations/GroupLocationPreview.vue b/src/components/group/Modules/Locations/GroupLocationPreview.vue
new file mode 100644
index 000000000..821a5e958
--- /dev/null
+++ b/src/components/group/Modules/Locations/GroupLocationPreview.vue
@@ -0,0 +1,33 @@
+<template>
+  <BaseGroupPreview
+    id="projects_locations"
+    :title="$t(GroupModuleTitle.projects_locations)"
+    :total="group.modules.projects_locations"
+    :icon="GroupModuleIcon.projects_locations"
+  >
+    <template #header>
+      <SeeMoreArrow
+        class="see-more-btn reset-btn"
+        :to="{
+          name: 'groupLocations',
+          params: { groupId: group.id },
+        }"
+      />
+    </template>
+    <template #content>
+      <GroupLocationBase :group="group" preview />
+    </template>
+  </BaseGroupPreview>
+</template>
+
+<script setup lang="ts">
+import {
+  GroupModuleIcon,
+  GroupModuleTitle,
+  TranslatedPeopleGroupModel,
+} from '@/models/invitation.model'
+import BaseGroupPreview from '@/components/group/Modules/BaseGroupPreview.vue'
+import GroupLocationBase from '@/components/group/Modules/Locations/GroupLocationBase.vue'
+
+defineProps<{ group: TranslatedPeopleGroupModel }>()
+</script>
diff --git a/src/components/map/CardLocationTooltip.vue b/src/components/map/CardLocationTooltip.vue
index b70ea9d63..c084a91fa 100644
--- a/src/components/map/CardLocationTooltip.vue
+++ b/src/components/map/CardLocationTooltip.vue
@@ -66,6 +66,10 @@ const description = computed(() => cropIfTooLong(props.description, 85))
     background-color: color-mix(in srgb, $location-impact, transparent 90%);
   }
 
+  &.address {
+    background-color: color-mix(in srgb, $location-address, transparent 90%);
+  }
+
   &.team {
     background-color: color-mix(in srgb, $location-team, transparent 90%);
   }
diff --git a/src/components/map/GeneralMap.vue b/src/components/map/GeneralMap.vue
index 23a759115..011078354 100644
--- a/src/components/map/GeneralMap.vue
+++ b/src/components/map/GeneralMap.vue
@@ -4,7 +4,16 @@
       <BaseMap ref="map" :config="CONFIG" use-cluster>
         <template #default="slotProps">
           <MapPointer
-            v-for="location in locations"
+            v-for="location in locations.groups"
+            :key="location.id"
+            :location="location"
+            @mounted="slotProps.addPointer"
+            @unmounted="slotProps.removePointer"
+          >
+            <GroupLocationToolTip :location="location" :group="location.people_group" />
+          </MapPointer>
+          <MapPointer
+            v-for="location in locations.projects"
             :key="location.id"
             :location="location"
             @mounted="slotProps.addPointer"
@@ -19,6 +28,7 @@
 </template>
 
 <script setup lang="ts">
+import GroupLocationToolTip from '@/components/group/Map/GroupLocationToolTip.vue'
 import BaseMap from '@/components/map/BaseMap.vue'
 import MapPointer from '@/components/map/MapPointer.vue'
 import ProjectLocationTooltip from '@/components/project/map/ProjectLocationTooltip.vue'
@@ -32,11 +42,6 @@ const props = withDefaults(
   { loading: true }
 )
 
-watch(
-  () => props.locations,
-  () => console.log(props.locations)
-)
-
 const CONFIG = {
   zoom: 1,
   maxZoom: 17,
diff --git a/src/components/map/LocationDrawer.vue b/src/components/map/LocationDrawer.vue
index 9570442a1..fe928c54e 100644
--- a/src/components/map/LocationDrawer.vue
+++ b/src/components/map/LocationDrawer.vue
@@ -97,10 +97,7 @@
                       @mounted="slotProps.addPointer"
                       @unmounted="slotProps.removePointer"
                     >
-                      <LocationTooltip
-                        v-if="location.title || location.description"
-                        :location="location"
-                      />
+                      <LocationTooltip :location="location" />
                     </MapPointer>
                   </template>
                   <template v-if="slotProps.map && suggestedLocations">
diff --git a/src/components/map/LocationForm.vue b/src/components/map/LocationForm.vue
index 0efec98a5..92186e755 100644
--- a/src/components/map/LocationForm.vue
+++ b/src/components/map/LocationForm.vue
@@ -78,6 +78,10 @@ const locationTypeOptions = computed(() => {
       value: 'impact',
       label: t('location.impact'),
     },
+    {
+      value: 'address',
+      label: t('location.address'),
+    },
   ]
   if (props.locationTypes) {
     return arr.filter(({ value }) => props.locationTypes.includes(value))
diff --git a/src/components/map/LocationList.vue b/src/components/map/LocationList.vue
index 7945a6c80..a02f01801 100644
--- a/src/components/map/LocationList.vue
+++ b/src/components/map/LocationList.vue
@@ -14,6 +14,7 @@
             :location="location"
             :editable="editable"
             :default-title="`${$t('location.default-title')} #${idx + 1}`"
+            :focus="focus"
             @focus="$emit('focus', $event)"
             @delete="$emit('delete', $event)"
             @edit="$emit('edit', $event)"
@@ -37,8 +38,9 @@ const props = withDefaults(
   defineProps<{
     locations: TranslatedLocation[]
     editable?: boolean
+    focus?: boolean
   }>(),
-  { editable: true }
+  { editable: true, focus: true }
 )
 
 defineEmits(['edit', 'focus', 'delete'])
diff --git a/src/components/map/LocationTooltip.vue b/src/components/map/LocationTooltip.vue
index 39cdb65de..58f6ea061 100644
--- a/src/components/map/LocationTooltip.vue
+++ b/src/components/map/LocationTooltip.vue
@@ -57,6 +57,10 @@ const closePopUp = inject('closePopUp')
     border-color: $location-team;
   }
 
+  &.address {
+    border-color: $location-address;
+  }
+
   > * {
     padding: 0 1rem;
   }
diff --git a/src/components/map/LocationType.vue b/src/components/map/LocationType.vue
index 058961fc8..8b6c14874 100644
--- a/src/components/map/LocationType.vue
+++ b/src/components/map/LocationType.vue
@@ -23,6 +23,8 @@ const typeLabel = computed(() => {
       return t('location.impact')
     case 'team':
       return t('location.team')
+    case 'address':
+      return t('location.address')
   }
 })
 
@@ -48,6 +50,10 @@ const pointerIcon = computed(() => IconMapLocationType(props.locationType))
     &.team {
       background-color: $location-team;
     }
+
+    &.address {
+      background-color: $location-address;
+    }
   }
 
   .location-title {
diff --git a/src/components/map/MapRecap.vue b/src/components/map/MapRecap.vue
index 92ff45ae0..f80ae0396 100644
--- a/src/components/map/MapRecap.vue
+++ b/src/components/map/MapRecap.vue
@@ -16,10 +16,7 @@
                   @unmounted="slotProps.removePointer(location)"
                 >
                   <slot name="tooltip" :location="location">
-                    <LocationTooltip
-                      v-if="location.title || location.description"
-                      :location="location"
-                    />
+                    <LocationTooltip :location="location" />
                   </slot>
                 </MapPointer>
               </template>
diff --git a/src/composables/useAutoTranslate.ts b/src/composables/useAutoTranslate.ts
index 82bd5fd75..a0275dd4e 100644
--- a/src/composables/useAutoTranslate.ts
+++ b/src/composables/useAutoTranslate.ts
@@ -1,10 +1,11 @@
-import { TranslatedPeopleGroupModel } from '@/models/invitation.model'
+import { GeneralLocationPeopleGroup, TranslatedPeopleGroupModel } from '@/models/invitation.model'
 import { TranslatedOrganizationModel } from '@/models/organization.model'
 import { TranslatedPeopleModel } from '@/models/people.model'
 import { TranslatedProject } from '@/models/project.model'
 import { AttachmentFileModel, TranslatedAttachmentFile } from '@/models/attachment-file.model'
 import { AttachmentLinkModel, TranslatedAttachmentLink } from '@/models/attachment-link.model'
 import { TranslatedDocument } from '@/interfaces/researcher'
+import { TranslatedLocation } from '@/models/location.model'
 
 // type can be computed or object
 type RefOrRaw<DataT> = ComputedRef<DataT> | Ref<DataT> | DataT
@@ -119,8 +120,38 @@ export default function useAutoTranslate() {
   const translateGoal = (goal) => translateEntity(goal, ['title', 'description'])
   const translateGoals = (goals) => translateEntities(goals, translateGoal)
 
-  const translateLocation = (location) => translateEntity(location, ['title', 'description'])
-  const translateLocations = (locations) => translateEntities(locations, translateLocation)
+  const translateLocation = (location) =>
+    translateEntity<TranslatedLocation>(location, ['title', 'description'])
+  const translateLocations = (locations) =>
+    translateEntities<TranslatedLocation>(locations, translateLocation)
+
+  const translateProjectLocation = (location) => {
+    return computed<TranslatedLocation>(() => {
+      if (!location) {
+        return location
+      }
+      return {
+        ...unref(translateLocation(location)),
+        project: unref(translateProject(location.project)),
+      }
+    })
+  }
+  const translateProjectLocations = (Locations) =>
+    translateEntities<TranslatedLocation>(Locations, translateProjectLocation)
+
+  const translatePeopleGroupLocation = (location) => {
+    return computed<GeneralLocationPeopleGroup>(() => {
+      if (!location) {
+        return location
+      }
+      return {
+        ...unref(translateLocation(location)),
+        people_group: unref(translateGroup(location.people_group)),
+      }
+    })
+  }
+  const translatePeopleGroupLocations = (Locations) =>
+    translateEntities<GeneralLocationPeopleGroup>(Locations, translatePeopleGroupLocation)
 
   const translateProjectMessage = (message) => translateEntity(message, ['content'])
   const translateProjectMessages = (messages) =>
@@ -152,7 +183,19 @@ export default function useAutoTranslate() {
   // -----------------
   // groups
   const translateGroup = (group) =>
-    translateEntity<TranslatedPeopleGroupModel>(group, ['name', 'description', 'short_description'])
+    computed(() => {
+      const _group = unref(
+        translateEntity<TranslatedPeopleGroupModel>(group, [
+          'name',
+          'description',
+          'short_description',
+        ])
+      )
+      return {
+        ..._group,
+        locations: _group?.locations ? unref(translateLocations(_group.locations)) : null,
+      }
+    })
   const translateGroups = (groups) =>
     translateEntities<TranslatedPeopleGroupModel>(groups, translateGroup)
 
@@ -279,6 +322,9 @@ export default function useAutoTranslate() {
     translateProjectMessage,
     translateProjectMessages,
 
+    translateProjectLocation,
+    translateProjectLocations,
+
     // people
     translateUser,
     translateUsers,
@@ -290,6 +336,8 @@ export default function useAutoTranslate() {
     // groups
     translateGroup,
     translateGroups,
+    translatePeopleGroupLocation,
+    translatePeopleGroupLocations,
 
     // org
     translateOrganization,
diff --git a/src/design/scss/map.scss b/src/design/scss/map.scss
index f42470ce0..c58aa3a12 100644
--- a/src/design/scss/map.scss
+++ b/src/design/scss/map.scss
@@ -51,6 +51,10 @@
       border-color: $location-team;
     }
 
+    &.address {
+      border-color: $location-address;
+    }
+
     &__dot {
       width: 20px;
       height: 20px;
@@ -65,6 +69,10 @@
       &.team {
         background: $location-team;
       }
+
+      &.address {
+        background: $location-address;
+      }
     }
 
     &__label {
@@ -130,6 +138,10 @@
       &.team {
         background: $location-team;
       }
+
+      &.address {
+        background: $location-address;
+      }
     }
   }
 
@@ -277,6 +289,10 @@
         background-color: $location-impact;
       }
 
+      &.address svg {
+        background-color: $location-address;
+      }
+
       &:last-child {
         margin-right: 0.4rem;
       }
diff --git a/src/design/scss/variables.scss b/src/design/scss/variables.scss
index f3b919e79..9fc2e4ca1 100644
--- a/src/design/scss/variables.scss
+++ b/src/design/scss/variables.scss
@@ -114,6 +114,7 @@ $card_height: pxToRem(260px);
 // LOCATION
 $location-impact: $primary;
 $location-team: $violet;
+$location-address: $blue;
 
 :root {
   --primary: #{$primary};
diff --git a/src/form/location.ts b/src/form/location.ts
index d7aa4a0f8..f7a642a22 100644
--- a/src/form/location.ts
+++ b/src/form/location.ts
@@ -6,7 +6,7 @@ import { LocationForm } from '@/models/location.model'
 const DEFAULT_FORM: LocationForm = {
   lat: null,
   lng: null,
-  type: 'team',
+  type: 'address',
   title: '',
   description: '',
 }
diff --git a/src/functs/maps.ts b/src/functs/maps.ts
index 8e3bc03ef..dde25a1d7 100644
--- a/src/functs/maps.ts
+++ b/src/functs/maps.ts
@@ -7,5 +7,7 @@ export const IconMapLocationType = (locationType: LocationType): IconImageChoice
       return 'Sun'
     case 'team':
       return 'Users'
+    case 'address':
+      return 'Home'
   }
 }
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 173415a68..4e0d006cc 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -1011,7 +1011,8 @@
     "conferences": "Conferèncias",
     "publications": "Publicacions",
     "similars": "Grups similars",
-    "presentation": "Presentació"
+    "presentation": "Presentació",
+    "location": "Adreça"
   },
   "header": {
     "private": "Privat: només visible per als membres de l' equip",
@@ -2018,7 +2019,8 @@
       "title": "Associacions pels Objectius"
     },
     "add-short": "Afegeix un sdg",
-    "sdg-fulltext": "objectiu sostenible del desenvolupament"
+    "sdg-fulltext": "objectiu sostenible del desenvolupament",
+    "title": "SDG"
   },
   "stats": {
     "cumulated-projects": "Projectes curatius",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 04f99542e..f45f67c27 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -1011,7 +1011,8 @@
     "conferences": "Konferenzen",
     "publications": "Veröffentlichungen",
     "similars": "Gruppen ähnliche",
-    "presentation": "Präsentation"
+    "presentation": "Präsentation",
+    "location": "Anschrift"
   },
   "header": {
     "private": "Private: nur für Teammitglieder sichtbar",
@@ -2018,7 +2019,8 @@
       "title": "Partnerschaften für die Ziele"
     },
     "add-short": "SDG hinzufügen",
-    "sdg-fulltext": "Nachhaltigkeitsziele"
+    "sdg-fulltext": "Nachhaltigkeitsziele",
+    "title": "SDG"
   },
   "stats": {
     "cumulated-projects": "Neue Projekte kumulieren",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 1ce155d23..62379e920 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -926,6 +926,7 @@
     "conferences": "Conferences",
     "publications": "Publications",
     "similars": "Groups similars",
+    "location": "Address",
     "share": "Share",
     "the-team": "The team ({users})",
     "news": "Announcements",
@@ -1011,7 +1012,8 @@
         "label": "Editor",
         "help": "Editor"
       }
-    }
+    },
+    "projects-locations": "Project locations"
   },
   "header": {
     "private": "Private: visible only to team members",
@@ -2018,7 +2020,8 @@
       "title": "Partnerships for the Goals"
     },
     "add-short": "Add a sdg",
-    "sdg-fulltext": "sustainable development goals"
+    "sdg-fulltext": "sustainable development goals",
+    "title": "SDG"
   },
   "stats": {
     "cumulated-projects": "Cumulative new projects",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index d3448b2b6..927abd89e 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -1011,7 +1011,8 @@
     "conferences": "Conferencias",
     "publications": "Publicaciones",
     "similars": "Grupos similares",
-    "presentation": "Presentación"
+    "presentation": "Presentación",
+    "location": "Dirección"
   },
   "header": {
     "private": "Privada: visible sólo a los miembros del equipo",
@@ -2018,7 +2019,8 @@
       "title": "Asociaciones para los Objetivos"
     },
     "add-short": "añadir un ODS",
-    "sdg-fulltext": "Objetivos de desarrollo sostenible"
+    "sdg-fulltext": "Objetivos de desarrollo sostenible",
+    "title": "ODS"
   },
   "stats": {
     "cumulated-projects": "Proyectos nuevos acumulativos",
diff --git a/src/i18n/locales/et.json b/src/i18n/locales/et.json
index 5a80c7e50..9874e563c 100644
--- a/src/i18n/locales/et.json
+++ b/src/i18n/locales/et.json
@@ -1011,7 +1011,8 @@
     "conferences": "Konverentsid",
     "publications": "Trükised",
     "similars": "Rühmad sarnased",
-    "presentation": "Esitlus"
+    "presentation": "Esitlus",
+    "location": "Aadress"
   },
   "header": {
     "private": "Privaatne: nähtav ainult meeskonnaliikmetele",
@@ -2018,7 +2019,8 @@
       "title": "Partnerlus eesmärkide nimel"
     },
     "add-short": "Lisa sdg",
-    "sdg-fulltext": "säästva arengu eesmärgid"
+    "sdg-fulltext": "säästva arengu eesmärgid",
+    "title": "SDG"
   },
   "stats": {
     "cumulated-projects": "Uued kumulatiivsed projektid",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 29de6bf91..365058649 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -1011,7 +1011,9 @@
     "conferences": "Conférences",
     "publications": "Publications",
     "similars": "Groupes similaires",
-    "presentation": "Présentation"
+    "presentation": "Présentation",
+    "projects-locations": "Localisations des projects",
+    "location": "Adresse"
   },
   "header": {
     "private": "Privée: visible uniquement par les membres de l’équipe",
@@ -2018,7 +2020,8 @@
       "title": "Partenariats pour la Réalisation des Objectifs"
     },
     "add-short": "Ajouter un odd",
-    "sdg-fulltext": "objectifs de développement durable"
+    "sdg-fulltext": "objectifs de développement durable",
+    "title": "ODD"
   },
   "stats": {
     "cumulated-projects": "Nouveaux projets cumulés",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 9ca397af3..e81ea6a71 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -1011,7 +1011,8 @@
     "conferences": "Conferenties",
     "publications": "Publicaties",
     "similars": "Groepen vergelijkbaar",
-    "presentation": "Presentatie"
+    "presentation": "Presentatie",
+    "location": "Adres"
   },
   "header": {
     "private": "Privé: alleen zichtbaar voor teamleden",
@@ -2018,7 +2019,8 @@
       "title": "Partnerschappen voor de doelstellingen"
     },
     "add-short": "Een sdg toevoegen",
-    "sdg-fulltext": "Duurzame ontwikkelingsdoelstellingen"
+    "sdg-fulltext": "Duurzame ontwikkelingsdoelstellingen",
+    "title": "SDG"
   },
   "stats": {
     "cumulated-projects": "Cumulatieve nieuwe projecten",
diff --git a/src/interfaces/maps.ts b/src/interfaces/maps.ts
index ae9cc84b6..de6b8991f 100644
--- a/src/interfaces/maps.ts
+++ b/src/interfaces/maps.ts
@@ -1,3 +1,4 @@
+import { GeneralLocationPeopleGroup, PeopleGroupModel } from '@/models/invitation.model'
 import {
   AnyLocation,
   BaseLocationModel,
@@ -15,6 +16,12 @@ export type MapPointerOption = {
   tooltip?: HTMLElement
 }
 
-export type Locations = LocationModel[]
+export type Locations = {
+  groups: PeopleGroupModel[]
+  projects: LocationModel[]
+}
 
-export type TranslatedLocations = TranslatedLocation[]
+export type TranslatedLocations = {
+  groups: GeneralLocationPeopleGroup[]
+  projects: TranslatedLocation[]
+}
diff --git a/src/models/invitation.model.ts b/src/models/invitation.model.ts
index f27361ab5..3b593de86 100644
--- a/src/models/invitation.model.ts
+++ b/src/models/invitation.model.ts
@@ -1,6 +1,7 @@
 import { IconImageChoice } from '@/functs/IconImage'
 import { Translated } from '@/interfaces/translated'
 import { Image } from '@/models/image.model'
+import { BaseLocationModel, BaseTranslatedLocationModel } from '@/models/location.model'
 import { OrganizationModel } from '@/models/organization.model'
 import { TagModel } from '@/models/tag.model'
 
@@ -25,6 +26,7 @@ export interface PeopleGroupModel {
   hierarchy: any
   sdgs: number[]
   tags: TagModel[]
+  locations: BaseLocationModel[]
   modules: {
     members: number
     featured_projects: number
@@ -32,15 +34,22 @@ export interface PeopleGroupModel {
     conferences: number
     similars: number
     subgroups: number
+    projects_locations: number
   }
 }
 
 export type PeopleGroupModulesKeys = keyof PeopleGroupModel['modules']
 
-export type TranslatedPeopleGroupModel = Translated<
-  PeopleGroupModel,
-  'name' | 'description' | 'short_description'
->
+export type TranslatedPeopleGroupModel = Omit<
+  Translated<PeopleGroupModel, 'name' | 'description' | 'short_description'>,
+  'locations'
+> & {
+  locations: BaseTranslatedLocationModel[]
+}
+
+export type GeneralLocationPeopleGroup = BaseTranslatedLocationModel & {
+  people_group: TranslatedPeopleGroupModel
+}
 
 export const GroupModuleIcon: { [key in PeopleGroupModulesKeys]: IconImageChoice } = {
   conferences: 'Article',
@@ -49,6 +58,7 @@ export const GroupModuleIcon: { [key in PeopleGroupModulesKeys]: IconImageChoice
   members: 'Users',
   similars: 'PeopleGroup',
   subgroups: 'nodeTree',
+  projects_locations: 'Map',
 }
 
 export const GroupModuleTitle: { [key in PeopleGroupModulesKeys]: string } = {
@@ -58,6 +68,7 @@ export const GroupModuleTitle: { [key in PeopleGroupModulesKeys]: string } = {
   members: 'group.members',
   similars: 'group.similars',
   subgroups: 'group.subgroups',
+  projects_locations: 'group.projects-locations',
 }
 
 export interface ProfilePictureVariationsModel {
diff --git a/src/models/types.ts b/src/models/types.ts
index 1adc739c8..6846c1dd2 100644
--- a/src/models/types.ts
+++ b/src/models/types.ts
@@ -10,4 +10,4 @@ export type ProjectMemberRoleType = 'owners' | 'members' | 'reviewers'
 
 export type StatusType = 'na' | 'ongoing' | 'complete' | 'cancel'
 
-export type LocationType = 'team' | 'impact'
+export type LocationType = 'team' | 'impact' | 'address'
diff --git a/src/pages/GroupPageV2/GroupPage.vue b/src/pages/GroupPageV2/GroupPage.vue
index 241bcbbbc..a48403980 100644
--- a/src/pages/GroupPageV2/GroupPage.vue
+++ b/src/pages/GroupPageV2/GroupPage.vue
@@ -164,6 +164,20 @@ const groupTabsDisplay = computed(() => {
       condition: groupModules.value.conferences,
       icon: GroupModuleIcon.conferences,
     },
+    {
+      isEditing: false,
+      key: 'group-locations',
+      dataTest: 'group-locations',
+      label: t(GroupModuleTitle.projects_locations),
+      view: `/group/${route.params.groupId}/locations`,
+      altView: `/group/${route.params.groupId}/locations/edit`,
+      props: {
+        group: group.value,
+        isLoading: groupLoading.value,
+      },
+      condition: groupModules.value.projects_locations,
+      icon: GroupModuleIcon.projects_locations,
+    },
   ]
 })
 
diff --git a/src/pages/GroupPageV2/Tabs/GroupEditTab.vue b/src/pages/GroupPageV2/Tabs/GroupEditTab.vue
index 0a2ecd4b4..9577c160d 100644
--- a/src/pages/GroupPageV2/Tabs/GroupEditTab.vue
+++ b/src/pages/GroupPageV2/Tabs/GroupEditTab.vue
@@ -64,6 +64,7 @@ const form = ref({
   members: [],
   sdgs: [],
   tags: [],
+  locations: [],
   featuredProjects: [],
   header_image: null,
   imageSizes: null,
@@ -144,14 +145,14 @@ const updateHeader = async (groupId) => {
       payloadHeader.append('file', form.value.header_image, form.value.header_image.name)
 
       await postGroupHeader(orgCode.value, groupId, payloadHeader)
-      await refreshNuxtData(`${organizationCode}::group::${groupData.value.id}`)
+      await refreshNuxtData(`${organizationCode}::group::${groupId}`)
 
       // TODO: make this in POST when backend allows it
       payloadHeader.delete('file')
     } else if (form.value.imageSizes) {
       // TODO else ?
       await patchGroupHeader(orgCode.value, groupId, payloadHeader)
-      await refreshNuxtData(`${organizationCode}::group::${groupData.value.id}`)
+      await refreshNuxtData(`${organizationCode}::group::${groupId}`)
     }
   }
 }
@@ -185,6 +186,7 @@ const buildPayload = () => {
     sdgs: form.value.sdgs,
     tags: form.value.tags.map((tag) => tag.id),
     parent: form.value.parentGroup?.id || null, // undefined ,
+    locations: form.value.locations,
     organization: orgCode.value,
     publication_status: form.value.publication_status,
     team,
@@ -310,6 +312,7 @@ onMounted(async () => {
       form.value.description = _groupData.description
       form.value.short_description = _groupData.short_description
       form.value.email = _groupData.email
+      form.value.locations = _groupData.locations
 
       form.value.sdgs = [..._groupData.sdgs]
       form.value.tags = structuredClone(_groupData.tags)
diff --git a/src/pages/GroupPageV2/Tabs/GroupSnapshotTab.vue b/src/pages/GroupPageV2/Tabs/GroupSnapshotTab.vue
index 13669ce1e..76462dd05 100644
--- a/src/pages/GroupPageV2/Tabs/GroupSnapshotTab.vue
+++ b/src/pages/GroupPageV2/Tabs/GroupSnapshotTab.vue
@@ -14,6 +14,11 @@
       :group="group"
       :is-loading="isLoading"
     />
+    <GroupLocationPreview
+      v-if="group.modules.projects_locations"
+      :group="group"
+      :is-loading="isLoading"
+    />
     <GroupDocumentsPreview
       v-if="group.modules.publications"
       document-type="publications"
diff --git a/src/pages/GroupPageV2/Tabs/Locations/GroupLocationsTab.vue b/src/pages/GroupPageV2/Tabs/Locations/GroupLocationsTab.vue
new file mode 100644
index 000000000..b1a2c6231
--- /dev/null
+++ b/src/pages/GroupPageV2/Tabs/Locations/GroupLocationsTab.vue
@@ -0,0 +1,17 @@
+<template>
+  <BaseGroupTab :title="$t(GroupModuleTitle.projects_locations)" :count="countElement">
+    <GroupLocationBase :group="group" />
+  </BaseGroupTab>
+</template>
+
+<script setup lang="ts">
+import GroupLocationBase from '@/components/group/Modules/Locations/GroupLocationBase.vue'
+import { GroupModuleTitle, TranslatedPeopleGroupModel } from '@/models/invitation.model'
+import BaseGroupTab from '@/pages/GroupPageV2/Tabs/BaseGroupTab.vue'
+
+const props = defineProps<{
+  group: TranslatedPeopleGroupModel
+}>()
+
+const countElement = computed<number>(() => props.group.modules?.projects_locations)
+</script>
diff --git a/src/pages/MapPage/MapPage.vue b/src/pages/MapPage/MapPage.vue
index bf57f7848..d1a9bfd9b 100755
--- a/src/pages/MapPage/MapPage.vue
+++ b/src/pages/MapPage/MapPage.vue
@@ -1,76 +1,44 @@
+<template>
+  <div id="projects-map">
+    <Transition name="fade">
+      <div v-if="isLoading" class="map-loader">
+        <LoaderComplex :label="$t('location.loading')" />
+      </div>
+    </Transition>
+    <GeneralMap :locations="data" :loading="isLoading" />
+    <div v-if="!isLoading && isEmpty" class="empty-map">
+      {{ $t('map.empty') }}
+    </div>
+  </div>
+</template>
+
 <script setup lang="ts">
-import { getLocations } from '@/api/locations.services'
-import useOrganizationsStore from '@/stores/useOrganizations'
-import { getOrganizationByCode } from '@/api/organizations.service'
+import { getLocations } from '@/api/v2/location.service'
+import GeneralMap from '@/components/map/GeneralMap.vue'
+import { useLpiHead2 } from '@/composables/useLpiHead'
 
-const isClient = import.meta.client
-const organizationsStore = useOrganizationsStore()
+const organizationCode = useOrganizationCode()
 const { t } = useNuxtI18n()
 
-const projectLocations = ref([])
-const loading = ref(true)
-
-const loadLocations = async (page = null) => {
-  loading.value = true
-  const locations = await getLocations({ organizations: [organizationsStore.current.code] }, page)
-  projectLocations.value.push(...locations)
-  // if (
-  //     locations.total_page > 1 &&
-  //     !!locations.next_page &&
-  //     locations.current_page < locations.total_page // weird backend bug: if no location we still get a next page
-  // ) {
-  //     await this.loadLocations(locations.next)
-  // } else
-  // if (this.$refs && this.$refs.map) this.$refs.map.centerMap()
-  /*
-   ** The previous line checks if the refs are still set, in case the user leaves the page to fast
-   ** Not checking this might create an error after the API calls are done.
-   */
-  loading.value = false
-}
+const { isLoading, data } = getLocations(organizationCode)
+
+watch(data, () => console.log(data))
+
+const isEmpty = computed(() => data.value.groups.length + data.value.projects.length === 0)
 
 onBeforeUnmount(() => {
-  document.getElementsByTagName('body')[0].classList.remove('map-no-scroll')
+  document.body.classList.remove('map-no-scroll')
 })
 
 onMounted(async () => {
-  document.getElementsByTagName('body')[0].classList.add('map-no-scroll')
-  await loadLocations()
+  document.body.classList.add('map-no-scroll')
 })
 
-try {
-  const runtimeConfig = useRuntimeConfig()
-  const organization = await getOrganizationByCode(runtimeConfig.public.appApiOrgCode)
-  const { image, dimensions } = useImageAndDimension(organization?.banner_image, 'medium')
-  useLpiHead(
-    useRequestURL().toString(),
-    computed(() => t('map.page-title')),
-    computed(() => t('map.page-title')),
-    image,
-    dimensions
-  )
-} catch (err) {
-  console.log(err)
-}
+useLpiHead2({
+  title: computed(() => t('map.page-title')),
+  description: computed(() => t('map.page-title')),
+})
 </script>
-<template>
-  <div id="projects-map">
-    <Transition name="fade">
-      <div v-if="loading" class="map-loader">
-        <LoaderComplex :label="$t('location.loading')" />
-      </div>
-    </Transition>
-    <LazyGeneralMap v-if="isClient" :locations="projectLocations" :loading="loading" />
-    <div v-if="!loading && !projectLocations.length" class="empty-map">
-      {{ $t('map.empty') }}
-    </div>
-  </div>
-</template>
-
-<style lang="scss">
-// do NOT scope this style, it will break the map
-@import '@/design/scss/map';
-</style>
 
 <style lang="scss" scoped>
 #projects-map {
@@ -133,8 +101,4 @@ try {
     }
   }
 }
-
-body.map-no-scroll {
-  overflow: hidden;
-}
 </style>
diff --git a/src/server/routes/geocoding.ts b/src/server/routes/geocoding.ts
index 34d7ef2c3..d1dbf4144 100644
--- a/src/server/routes/geocoding.ts
+++ b/src/server/routes/geocoding.ts
@@ -24,7 +24,7 @@ async function fetchFromPhoton(address, locale, runtimeConfig) {
         lat,
         lng,
         description: '',
-        type: 'team',
+        type: 'address',
       } satisfies Geocoding
     })
 
@@ -55,7 +55,7 @@ async function fetchFromGoogle(address, locale, runtimeConfig) {
         lat,
         lng,
         description: '',
-        type: 'team',
+        type: 'address',
       } satisfies Geocoding
     })
   return suggestedLocations
diff --git a/src/skeletons/group.skeletons.ts b/src/skeletons/group.skeletons.ts
index 124acc222..73b7c61e5 100644
--- a/src/skeletons/group.skeletons.ts
+++ b/src/skeletons/group.skeletons.ts
@@ -15,6 +15,7 @@ export const groupSkeleton = (def?: Partial<PeopleGroupModel>): Omit<PeopleGroup
   hierarchy: [],
   sdgs: [],
   tags: [],
+  locations: [],
   children: [],
   modules: {
     members: 0,
@@ -23,6 +24,7 @@ export const groupSkeleton = (def?: Partial<PeopleGroupModel>): Omit<PeopleGroup
     conferences: 0,
     similars: 0,
     subgroups: 0,
+    projects_locations: 0,
   },
   ...(def || {}),
 })
diff --git a/tests/factories/group.factory.ts b/tests/factories/group.factory.ts
index e057e672e..c37315feb 100644
--- a/tests/factories/group.factory.ts
+++ b/tests/factories/group.factory.ts
@@ -4,6 +4,7 @@ import { GroupModel, GroupModelInput } from '@/models/group.model'
 import { PeopleGroupModel, TranslatedPeopleGroupModel } from '@/models/invitation.model'
 import { ImageFactory } from './image.factory'
 import { OrganizationOutputFactory } from './organization.factory'
+import { BaseTranslatedLocationModelFactory } from './location.factory'
 
 export const groupFactory = createFactory<GroupModel>((faker) => ({
   ...BaseFactory.generate(),
@@ -30,6 +31,7 @@ export const peopleGroupFactory = createFactory<PeopleGroupModel>((faker) => ({
   publication_status: faker.datatype.string(),
   organization: OrganizationOutputFactory.generate(),
   children: [],
+  locations: [],
   modules: {
     members: 0,
     featured_projects: 0,
@@ -37,6 +39,7 @@ export const peopleGroupFactory = createFactory<PeopleGroupModel>((faker) => ({
     conferences: 0,
     subgroups: 0,
     similars: 0,
+    projects_locations: 0,
   },
   sdgs: [],
   tags: [],
@@ -45,6 +48,7 @@ export const peopleGroupFactory = createFactory<PeopleGroupModel>((faker) => ({
 
 export const groupTranslatedFactory = createFactory<TranslatedPeopleGroupModel>((faker) => ({
   ...peopleGroupFactory.generate(),
+  locations: BaseTranslatedLocationModelFactory.generateMany(3),
   $t: {
     name: faker.name.title(),
     description: faker.lorem.text(100),
diff --git a/tests/factories/location.factory.ts b/tests/factories/location.factory.ts
index 1f791e483..46231b099 100644
--- a/tests/factories/location.factory.ts
+++ b/tests/factories/location.factory.ts
@@ -1,6 +1,6 @@
 import { createFactory } from 'faker-create-factory'
 
-import { LocationModel } from '@/models/location.model'
+import { BaseTranslatedLocationModel, LocationModel } from '@/models/location.model'
 import BaseFactory from './base.factory'
 
 const LocationFactory = createFactory<LocationModel>((faker) => ({
@@ -14,4 +14,26 @@ const LocationFactory = createFactory<LocationModel>((faker) => ({
   project: null,
 }))
 
+export const BaseTranslatedLocationModelFactory = createFactory<BaseTranslatedLocationModel>(
+  (faker) => ({
+    ...BaseFactory.generate(),
+    id: faker.datatype.number(),
+    title: faker.lorem.text(),
+    description: faker.lorem.text(),
+    lat: Number(faker.address.latitude()),
+    lng: Number(faker.address.longitude()),
+    type: 'team',
+    $t: {
+      title: faker.lorem.text(),
+      description: faker.lorem.text(),
+    },
+  })
+)
+export const BaseTranslatedLocationFactory = createFactory<BaseTranslatedLocationModel>(
+  (faker) => ({
+    ...BaseTranslatedLocationModelFactory.generate(),
+    project: null,
+  })
+)
+
 export default LocationFactory
diff --git a/tests/unit/pages/GroupPage/Tabs/GroupSnapshotTab.spec.ts b/tests/unit/pages/GroupPage/Tabs/GroupSnapshotTab.spec.ts
index 59bb2b864..2e00abbce 100644
--- a/tests/unit/pages/GroupPage/Tabs/GroupSnapshotTab.spec.ts
+++ b/tests/unit/pages/GroupPage/Tabs/GroupSnapshotTab.spec.ts
@@ -13,6 +13,7 @@ import GroupSimilarsPreview from '@/components/group/Modules/Extras/GroupSimilar
 import GroupSubPreview from '@/components/group/Modules/GroupSub/GroupSubPreview.vue'
 import GroupDocumentsPreview from '@/components/group/Modules/Documents/GroupDocumentsPreview.vue'
 import OrganizationTagFactory from '../../../../factories/tag.factory'
+import GroupLocationPreview from '@/components/group/Modules/Locations/GroupLocationPreview.vue'
 
 describe('GroupSnapshotTab', () => {
   it('display modules', async () => {
@@ -40,6 +41,7 @@ describe('GroupSnapshotTab', () => {
     expect(wrapper.findComponent(GroupMembersPreview).exists()).toBe(false)
     expect(wrapper.findComponent(GroupProjectsPreview).exists()).toBe(false)
     expect(wrapper.findComponent(GroupDocumentsPreview).exists()).toBe(false)
+    expect(wrapper.findComponent(GroupLocationPreview).exists()).toBe(false)
 
     // add modules numbers
     const newGroup = groupTranslatedFactory.generate()
@@ -49,6 +51,7 @@ describe('GroupSnapshotTab', () => {
     newGroup.modules.publications = 8
     newGroup.modules.similars = 8
     newGroup.modules.subgroups = 8
+    newGroup.modules.projects_locations = 8
     newGroup.$t.description = 'description'
 
     wrapper.setProps({
@@ -64,5 +67,6 @@ describe('GroupSnapshotTab', () => {
     expect(wrapper.findComponent(GroupMembersPreview).exists()).toBe(true)
     expect(wrapper.findComponent(GroupProjectsPreview).exists()).toBe(true)
     expect(wrapper.findComponent(GroupDocumentsPreview).exists()).toBe(true)
+    expect(wrapper.findComponent(GroupLocationPreview).exists()).toBe(true)
   })
 })