diff --git a/plugins/polio/api/campaigns/campaigns.py b/plugins/polio/api/campaigns/campaigns.py
index ff709f002a..329a10825b 100644
--- a/plugins/polio/api/campaigns/campaigns.py
+++ b/plugins/polio/api/campaigns/campaigns.py
@@ -293,26 +293,35 @@ def update(self, instance: Campaign, validated_data):
         rounds = validated_data.pop("rounds", [])
         initial_org_unit = validated_data.get("initial_org_unit")
         account = self.context["request"].user.iaso_profile.account
+        separate_scopes_per_round = validated_data.get("separate_scopes_per_round", instance.separate_scopes_per_round)
+        switch_to_scope_per_round = separate_scopes_per_round and not instance.separate_scopes_per_round
+        switch_to_scope_per_campaign = not separate_scopes_per_round and instance.separate_scopes_per_round
+        keep_scope_per_round = separate_scopes_per_round and instance.separate_scopes_per_round
+        keep_scope_per_campaign = not separate_scopes_per_round and not instance.separate_scopes_per_round
 
-        for scope in campaign_scopes:
-            vaccine = scope.get("vaccine", "")
-            org_units = scope.get("group", {}).get("org_units")
-            scope, created = instance.scopes.get_or_create(vaccine=vaccine)
-            source_version_id = None
-            name = f"scope for campaign {instance.obr_name}" + (f" - {vaccine}" if vaccine else "")
-            if org_units:
-                source_version_ids = set([ou.version_id for ou in org_units])
-                if len(source_version_ids) != 1:
-                    raise serializers.ValidationError("All orgunit should be in the same source version")
-                source_version_id = list(source_version_ids)[0]
-            if not scope.group:
-                scope.group = Group.objects.create(name=name, source_version_id=source_version_id)
-            else:
-                scope.group.source_version_id = source_version_id
-                scope.group.name = name
-                scope.group.save()
+        if switch_to_scope_per_round and instance.scopes.exists():
+            instance.scopes.all().delete()
 
-            scope.group.org_units.set(org_units)
+        if switch_to_scope_per_campaign or keep_scope_per_campaign:
+            for scope in campaign_scopes:
+                vaccine = scope.get("vaccine", "")
+                org_units = scope.get("group", {}).get("org_units")
+                scope, created = instance.scopes.get_or_create(vaccine=vaccine)
+                source_version_id = None
+                name = f"scope for campaign {instance.obr_name} - {vaccine or ''}"
+                if org_units:
+                    source_version_ids = set([ou.version_id for ou in org_units])
+                    if len(source_version_ids) != 1:
+                        raise serializers.ValidationError("All orgunit should be in the same source version")
+                    source_version_id = list(source_version_ids)[0]
+                if not scope.group:
+                    scope.group = Group.objects.create(name=name, source_version_id=source_version_id)
+                else:
+                    scope.group.source_version_id = source_version_id
+                    scope.group.name = name
+                    scope.group.save()
+
+                scope.group.org_units.set(org_units)
 
         round_instances = []
         # find existing round either by id or number
@@ -355,27 +364,30 @@ def update(self, instance: Campaign, validated_data):
             round_instance = round_serializer.save()
             round_instances.append(round_instance)
             round_datelogs = []
-            for scope in scopes:
-                vaccine = scope.get("vaccine", "")
-                org_units = scope.get("group", {}).get("org_units")
-                source_version_id = None
-                if org_units:
-                    source_version_ids = set([ou.version_id for ou in org_units])
-                    if len(source_version_ids) != 1:
-                        raise serializers.ValidationError("All orgunit should be in the same source version")
-                    source_version_id = list(source_version_ids)[0]
-                name = f"scope for round {round_instance.number} campaign {instance.obr_name}" + (
-                    f" - {vaccine}" if vaccine else ""
-                )
-                scope, created = round_instance.scopes.get_or_create(vaccine=vaccine)
-                if not scope.group:
-                    scope.group = Group.objects.create(name=name)
-                else:
-                    scope.group.source_version_id = source_version_id
-                    scope.group.name = name
-                    scope.group.save()
+            if switch_to_scope_per_campaign and round.scopes.exists():
+                round.scopes.all().delete()
+            if switch_to_scope_per_round or keep_scope_per_round:
+                for scope in scopes:
+                    vaccine = scope.get("vaccine", "")
+                    org_units = scope.get("group", {}).get("org_units")
+                    source_version_id = None
+                    if org_units:
+                        source_version_ids = set([ou.version_id for ou in org_units])
+                        if len(source_version_ids) != 1:
+                            raise serializers.ValidationError("All orgunit should be in the same source version")
+                        source_version_id = list(source_version_ids)[0]
+                    name = f"scope for round {round_instance.number} campaign {instance.obr_name}" + (
+                        f" - {vaccine}" if vaccine else ""
+                    )
+                    scope, created = round_instance.scopes.get_or_create(vaccine=vaccine)
+                    if not scope.group:
+                        scope.group = Group.objects.create(name=name)
+                    else:
+                        scope.group.source_version_id = source_version_id
+                        scope.group.name = name
+                        scope.group.save()
 
-                scope.group.org_units.set(org_units)
+                    scope.group.org_units.set(org_units)
 
         # When some rounds need to be deleted, the payload contains only the rounds to keep.
         # So we have to detect if somebody wants to delete a round to prevent deletion of
diff --git a/plugins/polio/api/vaccines/repository.py b/plugins/polio/api/vaccines/repository.py
index b08938de21..266538666c 100644
--- a/plugins/polio/api/vaccines/repository.py
+++ b/plugins/polio/api/vaccines/repository.py
@@ -1,7 +1,6 @@
 """API endpoints and serializers for vaccine repository management."""
 
 from datetime import datetime, timedelta
-
 from django.db.models import Max, Min, OuterRef, Subquery
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
@@ -10,9 +9,11 @@
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.mixins import ListModelMixin
 from rest_framework.viewsets import GenericViewSet
+from django.db.models import OuterRef, Subquery, Q, Value, Case, When, CharField
 
 from iaso.api.common import Paginator
 from plugins.polio.models import (
+    VACCINES,
     CampaignType,
     OutgoingStockMovement,
     Round,
@@ -22,56 +23,6 @@
 )
 
 
-class VaccineRepositorySerializer(serializers.Serializer):
-    country_name = serializers.CharField(source="campaign.country.name")
-    campaign_obr_name = serializers.CharField(source="campaign.obr_name")
-    round_id = serializers.IntegerField(source="id")
-    round_number = serializers.IntegerField(source="number")
-    start_date = serializers.DateField(source="started_at")
-    end_date = serializers.DateField(source="ended_at")
-
-    vrf_data = serializers.SerializerMethodField()
-    pre_alert_data = serializers.SerializerMethodField()
-    form_a_data = serializers.SerializerMethodField()
-
-    def get_vrf_data(self, obj):
-        vrfs = VaccineRequestForm.objects.filter(campaign=obj.campaign, rounds=obj)
-        return [
-            {
-                "date": vrf.date_vrf_reception,
-                "file": vrf.document.url if vrf.document else None,
-                "is_missing": vrf.vrf_type == VaccineRequestFormType.MISSING,
-                "is_not_required": vrf.vrf_type == VaccineRequestFormType.NOT_REQUIRED,
-                "id": vrf.id,
-            }
-            for vrf in vrfs
-        ]
-
-    def get_pre_alert_data(self, obj):
-        pre_alerts = VaccinePreAlert.objects.filter(request_form__campaign=obj.campaign, request_form__rounds=obj)
-        return [
-            {
-                "date": pa.date_pre_alert_reception,
-                "file": pa.document.url if pa.document else None,
-                "vrf_id": pa.request_form.id,
-            }
-            for pa in pre_alerts
-        ]
-
-    def get_form_a_data(self, obj):
-        form_as = OutgoingStockMovement.objects.filter(campaign=obj.campaign, round=obj)
-        return [
-            {
-                "date": fa.form_a_reception_date,
-                "file": fa.document.url if fa.document else None,
-                "is_late": fa.form_a_reception_date > (obj.ended_at + timedelta(days=14))
-                if fa.form_a_reception_date and obj.ended_at
-                else None,
-            }
-            for fa in form_as
-        ]
-
-
 class VaccineReportingFilterBackend(filters.BaseFilterBackend):
     """Filter backend for vaccine reporting that handles campaign status, country, and file type filtering."""
 
@@ -79,19 +30,6 @@ def filter_queryset(self, request, queryset, view):
         # Filter by campaign status
         campaign_status = request.query_params.get("campaign_status", None)
 
-        # Get campaign dates subquery
-        campaign_dates = (
-            Round.objects.filter(campaign=OuterRef("campaign"))
-            .values("campaign")
-            .annotate(campaign_started_at=Min("started_at"), campaign_ended_at=Max("ended_at"))
-        )
-
-        # Add campaign dates to main queryset
-        queryset = queryset.annotate(
-            campaign_started_at=Subquery(campaign_dates.values("campaign_started_at")),
-            campaign_ended_at=Subquery(campaign_dates.values("campaign_ended_at")),
-        )
-
         if campaign_status:
             today = datetime.now().date()
             if campaign_status.upper() == "ONGOING":
@@ -157,6 +95,65 @@ def filter_queryset(self, request, queryset, view):
         return queryset.distinct()
 
 
+class VaccineRepositorySerializer(serializers.Serializer):
+    country_name = serializers.CharField(source="campaign__country__name")
+    campaign_obr_name = serializers.CharField(source="campaign__obr_name")
+    round_id = serializers.IntegerField(source="id")
+    number = serializers.IntegerField()
+    start_date = serializers.DateField(source="started_at")
+    end_date = serializers.DateField(source="ended_at")
+    vaccine_name = serializers.CharField()
+
+    vrf_data = serializers.SerializerMethodField()
+    pre_alert_data = serializers.SerializerMethodField()
+    form_a_data = serializers.SerializerMethodField()
+
+    def get_vrf_data(self, obj):
+        vrfs = VaccineRequestForm.objects.filter(
+            campaign__id=obj["campaign__id"], rounds=obj["id"], vaccine_type=obj["vaccine_name"]
+        )
+        return [
+            {
+                "date": vrf.date_vrf_reception,
+                "file": vrf.document.url if vrf.document else None,
+                "is_missing": vrf.vrf_type == VaccineRequestFormType.MISSING,
+                "is_not_required": vrf.vrf_type == VaccineRequestFormType.NOT_REQUIRED,
+                "id": vrf.id,
+            }
+            for vrf in vrfs
+        ]
+
+    def get_pre_alert_data(self, obj):
+        pre_alerts = VaccinePreAlert.objects.filter(
+            request_form__campaign=obj["campaign__id"],
+            request_form__rounds=obj["id"],
+            request_form__vaccine_type=obj["vaccine_name"],
+        )
+        return [
+            {
+                "date": pa.date_pre_alert_reception,
+                "file": pa.document.url if pa.document else None,
+                "vrf_id": pa.request_form.id,
+            }
+            for pa in pre_alerts
+        ]
+
+    def get_form_a_data(self, obj):
+        form_as = OutgoingStockMovement.objects.filter(
+            campaign=obj["campaign__id"], round=obj["id"], vaccine_stock__vaccine=obj["vaccine_name"]
+        )
+        return [
+            {
+                "date": fa.form_a_reception_date,
+                "file": fa.document.url if fa.document else None,
+                "is_late": fa.form_a_reception_date > (obj["ended_at"] + timedelta(days=14))
+                if fa.form_a_reception_date and obj["ended_at"]
+                else None,
+            }
+            for fa in form_as
+        ]
+
+
 class VaccineRepositoryViewSet(GenericViewSet, ListModelMixin):
     """
     ViewSet for retrieving vaccine repository data.
@@ -165,7 +162,7 @@ class VaccineRepositoryViewSet(GenericViewSet, ListModelMixin):
     serializer_class = VaccineRepositorySerializer
     pagination_class = Paginator
     filter_backends = [OrderingFilter, SearchFilter, VaccineReportingFilterBackend]
-    ordering_fields = ["campaign__country__name", "campaign__obr_name", "started_at"]
+    ordering_fields = ["campaign__country__name", "campaign__obr_name", "started_at", "vaccine_name", "number"]
     ordering = ["-started_at"]
     search_fields = ["campaign__country__name", "campaign__obr_name"]
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
@@ -260,14 +257,59 @@ def get_queryset(self):
         """
         Get the queryset for Round objects with their campaigns.
         """
+        rounds_queryset = (
+            Round.objects.filter(
+                campaign__isnull=False,
+                campaign__deleted_at__isnull=True,
+                campaign__campaign_types__name=CampaignType.POLIO,
+            )
+            .select_related(
+                "campaign",
+                "campaign__country",
+            )
+            .prefetch_related("scopes", "campaign__scopes")
+        )
 
-        rounds_queryset = Round.objects.filter(
-            campaign__isnull=False,
-            campaign__deleted_at__isnull=True,
-            campaign__campaign_types__name=CampaignType.POLIO,
-        ).select_related(
-            "campaign",
-            "campaign__country",
+        # Get campaign dates subquery
+        campaign_dates = (
+            Round.objects.filter(campaign=OuterRef("campaign"))
+            .values("campaign")
+            .annotate(campaign_started_at=Min("started_at"), campaign_ended_at=Max("ended_at"))
+        )
+
+        # Add campaign dates to main queryset
+        rounds_queryset = rounds_queryset.annotate(
+            campaign_started_at=Subquery(campaign_dates.values("campaign_started_at")),
+            campaign_ended_at=Subquery(campaign_dates.values("campaign_ended_at")),
+        )
+
+        # This query assumes that campaign__scopes is empty if separate scopes per round and vice-versa
+        # Fixed in POLIO-1770
+        rounds_queryset = rounds_queryset.values(
+            "campaign__country__name",
+            "campaign__country__id",
+            "campaign__obr_name",
+            "campaign__scopes__id",
+            "campaign__scopes__vaccine",
+            "campaign__separate_scopes_per_round",
+            "id",
+            "campaign__id",
+            "started_at",
+            "ended_at",
+            "number",
+            "scopes__id",
+            "scopes__vaccine",
+            "campaign_started_at",
+            "campaign_ended_at",
+        )
+
+        # 393 results without filter
+        rounds_queryset = rounds_queryset.annotate(
+            vaccine_name=Case(
+                When(campaign__separate_scopes_per_round=False, then="campaign__scopes__vaccine"),
+                default="scopes__vaccine",
+                output_field=CharField(),
+            )
         )
 
         return rounds_queryset
diff --git a/plugins/polio/js/src/constants/messages.ts b/plugins/polio/js/src/constants/messages.ts
index c58f74982a..5724b09aa4 100644
--- a/plugins/polio/js/src/constants/messages.ts
+++ b/plugins/polio/js/src/constants/messages.ts
@@ -2446,6 +2446,26 @@ const MESSAGES = defineMessages({
         id: 'iaso.polio.repository.title',
         defaultMessage: 'Vaccine Management Repository',
     },
+    scopesWillBeDeleted: {
+        id: 'iaso.polio.campaign.label.scopesWillBeDeleted',
+        defaultMessage: 'The previous scopes will be deleted',
+    },
+    scopeWarningTitle: {
+        id: 'iaso.polio.campaign.label.scopeWarningTitle',
+        defaultMessage: 'Scope type has been changed',
+    },
+    proceed: {
+        id: 'blsq.label.proceed',
+        defaultMessage: 'proceed',
+    },
+    doYouWantToClose: {
+        id: 'blsq.dialog.doYouWantToClose',
+        defaultMessage: 'Do you want to close?',
+    },
+    unsavedDataWillBeLost: {
+        id: 'blsq.dialog.unsavedDataWillBeLost',
+        defaultMessage: 'Unsaved data will be lost',
+    },
 });
 
 export default MESSAGES;
diff --git a/plugins/polio/js/src/constants/translations/en.json b/plugins/polio/js/src/constants/translations/en.json
index 83f1b9f785..c9eb2c12d1 100644
--- a/plugins/polio/js/src/constants/translations/en.json
+++ b/plugins/polio/js/src/constants/translations/en.json
@@ -1,5 +1,8 @@
 {
     "aso.polio.label.stockCorrection": "Stock correction",
+    "blsq.dialog.doYouWantToClose": "Do you want to close?",
+    "blsq.dialog.unsavedDataWillBeLost": "Unsaved data will be lost",
+    "blsq.label.proceed": "proceed",
     "iaso.forms.error.positiveInteger": "Please use a positive integer",
     "iaso.forms.error.requiredUuid": "Please use an UUID",
     "iaso.forms.options.budgetTypeError": "Value should be one of \"submission\", \"comments\" or \"validation\"",
@@ -73,6 +76,8 @@
     "iaso.polio.campaign.form": "Form",
     "iaso.polio.campaign.initial_org_unit": "Org Unit",
     "iaso.polio.campaign.key": "Key",
+    "iaso.polio.campaign.label.scopesWillBeDeleted": "The previous scopes will be deleted",
+    "iaso.polio.campaign.label.scopeWarningTitle": "Scope type has been changed",
     "iaso.polio.campaign.lqasMap": "LQAS map",
     "iaso.polio.campaign.mobilePayment": "Mobile Payment",
     "iaso.polio.campaign.restoreError": "Error restoring campaign",
@@ -262,10 +267,10 @@
     "iaso.polio.forms.options.approval": "Approval",
     "iaso.polio.forms.options.approval_ongoing": "Approval ongoing",
     "iaso.polio.import_file.label": "Excel Line File",
-    "iaso.polio.label.12months": "Last 12 months",
     "iaso.polio.label.3months": "Last 3 months",
     "iaso.polio.label.6months": "Last 6 months",
     "iaso.polio.label.9months": "Last 9 months",
+    "iaso.polio.label.12months": "Last 12 months",
     "iaso.polio.label.add": "Add",
     "iaso.polio.label.addDestruction": "Add destruction",
     "iaso.polio.label.addLink": "Add link",
diff --git a/plugins/polio/js/src/constants/translations/fr.json b/plugins/polio/js/src/constants/translations/fr.json
index 6bcd31293d..753cc964c4 100644
--- a/plugins/polio/js/src/constants/translations/fr.json
+++ b/plugins/polio/js/src/constants/translations/fr.json
@@ -1,4 +1,7 @@
 {
+    "blsq.dialog.doYouWantToClose": "Voulez-vous fermer?",
+    "blsq.dialog.unsavedDataWillBeLost": "Les données non-sauvegardées seront perdues",
+    "blsq.label.proceed": "continuer",
     "iaso.forms.error.positiveInteger": "Veuillez utiliser un nombre entier positif",
     "iaso.forms.error.requiredUuid": "Veuillez utiliser un UUID",
     "iaso.forms.options.budgetTypeError": "Choisir une valeur parmis \"soumission\", \"commentaires\" ou \"validation\"",
@@ -72,6 +75,8 @@
     "iaso.polio.campaign.form": "Formulaire",
     "iaso.polio.campaign.initial_org_unit": "Org Unit",
     "iaso.polio.campaign.key": "Clé",
+    "iaso.polio.campaign.label.scopesWillBeDeleted": "Les périmètres précédents vont être effacés",
+    "iaso.polio.campaign.label.scopeWarningTitle": "Changement de type de périmètre",
     "iaso.polio.campaign.lqasMap": "Carte LQAS",
     "iaso.polio.campaign.mobilePayment": "Paiement mobile",
     "iaso.polio.campaign.restoreError": "Erreur lors de la restauration de la campagne",
@@ -261,10 +266,10 @@
     "iaso.polio.forms.options.approval": "Approbation",
     "iaso.polio.forms.options.approval_ongoing": "Approbation en cours",
     "iaso.polio.import_file.label": "Excel Line File",
-    "iaso.polio.label.12months": "12 derniers mois",
     "iaso.polio.label.3months": "3 derniers mois",
     "iaso.polio.label.6months": "6 derniers mois",
     "iaso.polio.label.9months": "9 derniers mois",
+    "iaso.polio.label.12months": "12 derniers mois",
     "iaso.polio.label.add": "Ajouter",
     "iaso.polio.label.addDestruction": "Ajouter une destruction",
     "iaso.polio.label.addLink": "Ajouter un lien",
diff --git a/plugins/polio/js/src/domains/Campaigns/MainDialog/CreateEditDialog.tsx b/plugins/polio/js/src/domains/Campaigns/MainDialog/CreateEditDialog.tsx
index e8ce938adc..3658ed59a5 100644
--- a/plugins/polio/js/src/domains/Campaigns/MainDialog/CreateEditDialog.tsx
+++ b/plugins/polio/js/src/domains/Campaigns/MainDialog/CreateEditDialog.tsx
@@ -32,6 +32,7 @@ import { useSaveCampaign } from '../hooks/api/useSaveCampaign';
 import { useValidateCampaign } from '../hooks/useValidateCampaign';
 import { PolioDialogTabs } from './PolioDialogTabs';
 import { usePolioDialogTabs } from './usePolioDialogTabs';
+import { WarningModal } from './WarningModal';
 
 type Props = {
     isOpen: boolean;
@@ -58,6 +59,7 @@ const CreateEditDialog: FunctionComponent<Props> = ({
         isOpen,
     );
     const [isBackdropOpen, setIsBackdropOpen] = useState(false);
+    const [isScopeWarningOpen, setIsScopeWarningOpen] = useState(false);
     const [isUpdated, setIsUpdated] = useState(false);
     const { formatMessage } = useSafeIntl();
     const classes: Record<string, string> = useStyles();
@@ -132,6 +134,30 @@ const CreateEditDialog: FunctionComponent<Props> = ({
         }
         onClose();
     };
+
+    const handleConfirm = useCallback(() => {
+        // If scope type has changed
+        if (
+            formik.values.separate_scopes_per_round !==
+                formik.initialValues.separate_scopes_per_round &&
+            formik.values.id
+        ) {
+            // Open warning modal
+            setIsScopeWarningOpen(true);
+        } else {
+            formik.handleSubmit();
+        }
+        // All hooks deps present, but ES-lint wants to add formik object, which is too much
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        formik.handleSubmit,
+        formik.values.id,
+        formik.values.separate_scopes_per_round,
+        formik.initialValues.separate_scopes_per_round,
+    ]);
+
+    const scopeWarningTitle = formatMessage(MESSAGES.scopeWarningTitle);
+    const scopeWarningBody = formatMessage(MESSAGES.scopesWillBeDeleted);
     const tabs = usePolioDialogTabs(formik, selectedCampaign);
     const [selectedTab, setSelectedTab] = useState(0);
 
@@ -163,6 +189,14 @@ const CreateEditDialog: FunctionComponent<Props> = ({
                 closeDialog={() => setIsBackdropOpen(false)}
                 onConfirm={() => handleClose()}
             />
+            <WarningModal
+                title={scopeWarningTitle}
+                body={scopeWarningBody}
+                open={isScopeWarningOpen}
+                closeDialog={() => setIsScopeWarningOpen(false)}
+                onConfirm={() => formik.handleSubmit()}
+                dataTestId="scopewarning-modal"
+            />
             <Box pt={1}>
                 <Grid container spacing={0}>
                     <Grid item xs={12} md={8}>
@@ -224,7 +258,7 @@ const CreateEditDialog: FunctionComponent<Props> = ({
                     {formatMessage(MESSAGES.close)}
                 </Button>
                 <Button
-                    onClick={() => formik.handleSubmit()}
+                    onClick={handleConfirm}
                     color="primary"
                     variant="contained"
                     autoFocus
diff --git a/plugins/polio/js/src/domains/Campaigns/MainDialog/WarningModal.tsx b/plugins/polio/js/src/domains/Campaigns/MainDialog/WarningModal.tsx
new file mode 100644
index 0000000000..acfe39f1c5
--- /dev/null
+++ b/plugins/polio/js/src/domains/Campaigns/MainDialog/WarningModal.tsx
@@ -0,0 +1,57 @@
+import React, { FunctionComponent } from 'react';
+import { Box, Divider, Typography } from '@mui/material';
+import {
+    ConfirmCancelModal,
+    IntlMessage,
+    useSafeIntl,
+} from 'bluesquare-components';
+import MESSAGES from '../../../constants/messages';
+
+type Props = {
+    onConfirm: () => void;
+    open: boolean;
+    closeDialog: () => void;
+    dataTestId?: string;
+    id?: string;
+    title?: string;
+    confirmMessage?: IntlMessage;
+    cancelMessage?: IntlMessage;
+    body: string;
+};
+
+export const WarningModal: FunctionComponent<Props> = ({
+    onConfirm,
+    open,
+    closeDialog,
+    dataTestId = 'warning-modal',
+    id = 'warning-modal',
+    title: titleProps,
+    confirmMessage = MESSAGES.proceed,
+    cancelMessage = MESSAGES.cancel,
+    body,
+}) => {
+    const { formatMessage } = useSafeIntl();
+    const title = titleProps || formatMessage(MESSAGES.doYouWantToClose);
+
+    return (
+        <ConfirmCancelModal
+            onConfirm={onConfirm}
+            onCancel={() => null}
+            open={open}
+            closeDialog={closeDialog}
+            dataTestId={dataTestId}
+            id={id}
+            onClose={() => null}
+            titleMessage={title}
+            confirmMessage={confirmMessage}
+            cancelMessage={cancelMessage}
+        >
+            <>
+                <Divider />
+                <Box mt={2}>
+                    <Typography>{body}</Typography>
+                </Box>
+            </>
+        </ConfirmCancelModal>
+    );
+};
diff --git a/plugins/polio/js/src/domains/VaccineModule/Repository/hooks/useVaccineRepositoryColumns.tsx b/plugins/polio/js/src/domains/VaccineModule/Repository/hooks/useVaccineRepositoryColumns.tsx
index f1d48cacf4..ec9cb7a651 100644
--- a/plugins/polio/js/src/domains/VaccineModule/Repository/hooks/useVaccineRepositoryColumns.tsx
+++ b/plugins/polio/js/src/domains/VaccineModule/Repository/hooks/useVaccineRepositoryColumns.tsx
@@ -1,5 +1,5 @@
+import React, { useMemo } from 'react';
 import { Column, useSafeIntl } from 'bluesquare-components';
-import { useMemo } from 'react';
 import { DateCell } from '../../../../../../../../hat/assets/js/apps/Iaso/components/Cells/DateTimeCell';
 import { DocumentsCells } from '../components/DocumentsCell';
 import { FormADocumentsCells } from '../components/FormADocumentCells';
@@ -24,8 +24,17 @@ export const useVaccineRepositoryColumns = (): Column[] => {
             },
             {
                 Header: formatMessage(MESSAGES.roundNumbers),
-                id: 'round_number',
-                accessor: 'round_number',
+                id: 'number',
+                accessor: 'number',
+                width: 20,
+                Cell: settings => (
+                    <span>{`${settings.row.original.number}`}</span>
+                ),
+            },
+            {
+                Header: formatMessage(MESSAGES.vaccine),
+                id: 'vaccine_name',
+                accessor: 'vaccine_name',
                 width: 20,
             },
             {
@@ -51,7 +60,7 @@ export const useVaccineRepositoryColumns = (): Column[] => {
                 Header: 'Form A',
                 accessor: 'form_a_data',
                 Cell: FormADocumentsCells,
-                width: 30,
+                width: 20,
             },
         ],
         [formatMessage],
diff --git a/plugins/polio/js/src/domains/VaccineModule/Repository/messages.ts b/plugins/polio/js/src/domains/VaccineModule/Repository/messages.ts
index bf7ca09002..93b24ae1a9 100644
--- a/plugins/polio/js/src/domains/VaccineModule/Repository/messages.ts
+++ b/plugins/polio/js/src/domains/VaccineModule/Repository/messages.ts
@@ -61,6 +61,10 @@ const MESSAGES = defineMessages({
         id: 'iaso.polio.label.vrfTypeMissing',
         defaultMessage: 'Missing',
     },
+    vaccine: {
+        id: 'iaso.polio.vaccine',
+        defaultMessage: 'Vaccine',
+    },
 });
 
 export default MESSAGES;
diff --git a/plugins/polio/migrations/0206_delete_unused_scopes.py b/plugins/polio/migrations/0206_delete_unused_scopes.py
new file mode 100644
index 0000000000..32ccf90d7e
--- /dev/null
+++ b/plugins/polio/migrations/0206_delete_unused_scopes.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2024-11-29 09:51
+
+from django.db import migrations
+
+
+def delete_unused_scopes(apps, schema_editor):
+    CampaignScope = apps.get_model("polio", "CampaignScope")
+    RoundScope = apps.get_model("polio", "RoundScope")
+
+    CampaignScope.objects.filter(campaign__separate_scopes_per_round=True).delete()
+    RoundScope.objects.filter(round__campaign__isnull=False, round__campaign__separate_scopes_per_round=False).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("polio", "0205_remove_campaign_budget_requested_at_wfeditable_old_and_more"),
+    ]
+
+    operations = [migrations.RunPython(delete_unused_scopes, migrations.RunPython.noop, elidable=True)]
diff --git a/plugins/polio/models/base.py b/plugins/polio/models/base.py
index 936d8ceb10..1817fcf3a7 100644
--- a/plugins/polio/models/base.py
+++ b/plugins/polio/models/base.py
@@ -13,7 +13,6 @@
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.postgres.fields import ArrayField
 from django.core.files.base import File
-from django.core.files.storage import FileSystemStorage
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.validators import RegexValidator
 from django.db import models
@@ -242,6 +241,16 @@ def as_ui_dropdown_data(self):
         data["campaigns"] = data["campaigns"].values()
         return data
 
+    def filter_by_vaccine_name(self, vaccine_name):
+        return (
+            self.select_related("campaign")
+            .prefetch_related("scopes", "campaign__scopes")
+            .filter(
+                (Q(campaign__separate_scopes_per_round=False) & Q(campaign__scopes__vaccine=vaccine_name))
+                | (Q(campaign__separate_scopes_per_round=True) & Q(scopes__vaccine=vaccine_name))
+            )
+        )
+
 
 def make_group_subactivity_scope():
     return Group.objects.create(name="hidden subactivityScope")
diff --git a/plugins/polio/tests/api/test.py b/plugins/polio/tests/api/test.py
index 33a5b29229..477ab675c0 100644
--- a/plugins/polio/tests/api/test.py
+++ b/plugins/polio/tests/api/test.py
@@ -26,13 +26,12 @@ def create_campaign(
             version=source_version,
             name=district_name,
             validation_status=m.OrgUnit.VALIDATION_VALID,
-            source_ref="PvtAI4RUMkr",
+            source_ref="PvtAI4Rr",
         )
         campaign = pm.Campaign.objects.create(
             obr_name=obr_name,
             country=country,
             account=account,
-            vacine=pm.VACCINES[0][0],
             separate_scopes_per_round=False,
         )
         scope_group = m.Group.objects.create(name="campaign_scope", source_version=source_version)
diff --git a/plugins/polio/tests/test_api.py b/plugins/polio/tests/test_api.py
index 6b783a5039..dd5a419a8a 100644
--- a/plugins/polio/tests/test_api.py
+++ b/plugins/polio/tests/test_api.py
@@ -11,9 +11,10 @@
 from iaso.test import APITestCase
 from plugins.polio.models import CampaignType, Round
 from plugins.polio.preparedness.spreadsheet_manager import *
+from plugins.polio.tests.api.test import PolioTestCaseMixin
 
 
-class PolioAPITestCase(APITestCase):
+class PolioAPITestCase(APITestCase, PolioTestCaseMixin):
     data_source: m.DataSource
     source_version_1: m.SourceVersion
     org_unit: m.OrgUnit
@@ -27,6 +28,9 @@ def setUpTestData(cls):
         cls.account = polio_account = Account.objects.create(name="polio", default_version=cls.source_version_1)
         cls.yoda = cls.create_user_with_profile(username="yoda", account=polio_account, permissions=["iaso_forms"])
 
+        cls.country_type = m.OrgUnitType.objects.create(name="COUNTRY", short_name="country")
+        cls.district_type = m.OrgUnitType.objects.create(name="DISTRICT", short_name="district")
+
         cls.org_unit = m.OrgUnit.objects.create(
             org_unit_type=m.OrgUnitType.objects.create(name="Jedi Council", short_name="Cnc"),
             version=cls.source_version_1,
@@ -548,6 +552,55 @@ def test_create_campaign_with_round_scopes(self):
             ],
         )
 
+    def test_changing_scope_type_deletes_old_scopes(self):
+        # Create a new campaign with scope per campaign
+        test_campaign, _, _, _, _, _ = self.create_campaign(
+            obr_name="TEST_CAMPAIGN",
+            account=self.account,
+            source_version=self.source_version_1,
+            country_ou_type=self.country_type,
+            district_ou_type=self.district_type,
+        )
+
+        # Test that separate_scopes_per_round is False and campaign has scope
+        self.client.force_authenticate(self.yoda)
+        response = self.client.get(f"/api/polio/campaigns/{test_campaign.id}/")
+        data = self.assertJSONResponse(response, 200)
+        self.assertFalse(data["separate_scopes_per_round"])
+        self.assertEqual(len(data["scopes"]), 1)
+        self.assertEqual(len(data["scopes"][0]["group"]["org_units"]), 1)
+        for r in data["rounds"]:
+            self.assertEqual(len(r["scopes"]), 0)
+
+        old_payload = {**data}
+
+        # Format payload for campaign with round level scope (only on round 1)
+        new_round_1 = data["rounds"][0]
+        new_round_1["scopes"] = data["scopes"]
+        new_rounds = [new_round_1, data["rounds"][1], data["rounds"][2]]
+        payload = {**data, "separate_scopes_per_round": True, "rounds": new_rounds, "description": "Yabadabadoo"}
+
+        # Test that scope is on round and not on campaign
+        response = self.client.put(f"/api/polio/campaigns/{test_campaign.id}/", payload, format="json")
+        data = self.assertJSONResponse(response, 200)
+        self.assertTrue(data["separate_scopes_per_round"])
+        self.assertEqual(len(data["scopes"]), 0)
+        self.assertEqual(len(data["rounds"][0]["scopes"]), 1)
+        self.assertEqual(len(data["rounds"][0]["scopes"][0]["group"]["org_units"]), 1)
+        self.assertEqual(data["description"], "Yabadabadoo")
+        for index, r in enumerate(data["rounds"]):
+            if index > 0:
+                self.assertEqual(len(r["scopes"]), 0)
+
+        # Switch scope back to campaign level
+        response = self.client.put(f"/api/polio/campaigns/{test_campaign.id}/", old_payload, format="json")
+        data = self.assertJSONResponse(response, 200)
+        self.assertFalse(data["separate_scopes_per_round"])
+        self.assertEqual(len(data["scopes"]), 1)
+        self.assertEqual(len(data["scopes"][0]["group"]["org_units"]), 1)
+        for r in data["rounds"]:
+            self.assertEqual(len(r["scopes"]), 0)
+
     @skip("Skipping as long as PATCH is disabled for campaigns")
     def test_update_campaign_with_vaccine_data(self):
         self.client.force_authenticate(self.yoda)
diff --git a/plugins/polio/tests/test_vaccine_repository.py b/plugins/polio/tests/test_vaccine_repository.py
index 32405f762a..66fc364464 100644
--- a/plugins/polio/tests/test_vaccine_repository.py
+++ b/plugins/polio/tests/test_vaccine_repository.py
@@ -7,12 +7,12 @@
 from iaso import models as m
 from iaso.test import APITestCase
 from plugins.polio import models as pm
-from plugins.polio.api.vaccines.supply_chain import AR_SET, PA_SET
+from plugins.polio.tests.api.test import PolioTestCaseMixin
 
 BASE_URL = "/api/polio/vaccine/repository/"
 
 
-class VaccineRepositoryAPITestCase(APITestCase):
+class VaccineRepositoryAPITestCase(APITestCase, PolioTestCaseMixin):
     @classmethod
     def setUp(cls):
         cls.data_source = m.DataSource.objects.create(name="Default source")
@@ -21,12 +21,15 @@ def setUp(cls):
         cls.now = now()
 
         cls.org_unit_type_country = m.OrgUnitType.objects.create(name="Country")
-        cls.country = m.OrgUnit.objects.create(
-            org_unit_type=cls.org_unit_type_country,
-            version=cls.source_version_1,
-            name="Testland",
-            validation_status=m.OrgUnit.VALIDATION_VALID,
-            source_ref="TestlandRef",
+        cls.org_unit_type_district = m.OrgUnitType.objects.create(name="District")
+
+        cls.campaign, cls.campaign_round_1, _, _, cls.testland, _district = cls.create_campaign(
+            obr_name="Test Campaign",
+            account=cls.account,
+            source_version=cls.source_version_1,
+            country_ou_type=cls.org_unit_type_country,
+            country_name="Testland",
+            district_ou_type=cls.org_unit_type_district,
         )
 
         cls.zambia = m.OrgUnit.objects.create(
@@ -40,21 +43,8 @@ def setUp(cls):
         # Create campaign type
         cls.polio_type, _ = pm.CampaignType.objects.get_or_create(name="Polio")
 
-        # Create a campaign with rounds
-        cls.campaign = pm.Campaign.objects.create(
-            obr_name="Test Campaign",
-            country=cls.country,
-            account=cls.account,
-        )
         cls.campaign.campaign_types.add(cls.polio_type)
 
-        cls.campaign_round_1 = pm.Round.objects.create(
-            campaign=cls.campaign,
-            started_at=datetime.datetime(2021, 1, 1),
-            ended_at=datetime.datetime(2021, 1, 31),
-            number=1,
-        )
-
         # Create vaccine request form
         cls.vaccine_request_form = pm.VaccineRequestForm.objects.create(
             campaign=cls.campaign,
@@ -96,7 +86,7 @@ def test_list_response_structure(self):
         self.assertIn("country_name", result)
         self.assertIn("campaign_obr_name", result)
         self.assertIn("round_id", result)
-        self.assertIn("round_number", result)
+        self.assertIn("number", result)
         self.assertIn("start_date", result)
         self.assertIn("end_date", result)
         self.assertIn("vrf_data", result)
@@ -108,18 +98,55 @@ def test_search_filter(self):
         self.client.force_authenticate(user=self.user)
         response = self.client.get(f"{BASE_URL}?search=Test Campaign")
         data = response.json()
-        self.assertEqual(len(data["results"]), 1)
+        self.assertEqual(len(data["results"]), 3)
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Test Campaign")
 
+    def test_rounds_are_split_by_vaccine(self):
+        campaign2, _, _, _, _, district = self.create_campaign(
+            obr_name="Test scopes",
+            account=self.account,
+            source_version=self.source_version_1,
+            country_ou_type=self.org_unit_type_country,
+            country_name="WillBeIgnored",
+            district_ou_type=self.org_unit_type_district,
+            district_name="ZDistrict",
+        )
+        campaign2.campaign_types.add(self.polio_type)
+        campaign2.country = self.zambia
+        scope_group = m.Group.objects.create(name="campaign_scope", source_version=self.source_version_1)
+        scope_group.org_units.set([district])  # FIXME: we should actually have children org units
+        scope = pm.CampaignScope.objects.create(campaign=campaign2, vaccine=pm.VACCINES[1][0], group=scope_group)
+
+        self.client.force_authenticate(user=self.user)
+
+        response = self.client.get(f"{BASE_URL}?campaign={campaign2.obr_name}&order=number")
+        data = response.json()
+        self.assertEqual(len(data["results"]), 6)  # 3 rounds * 2 vaccines = 6
+        self.assertEqual(data["results"][0]["campaign_obr_name"], campaign2.obr_name)
+        self.assertEqual(data["results"][0]["number"], 1)
+        self.assertEqual(data["results"][0]["vaccine_name"], pm.VACCINES[0][0])
+        self.assertEqual(data["results"][1]["campaign_obr_name"], campaign2.obr_name)
+        self.assertEqual(data["results"][1]["number"], 1)
+        self.assertEqual(data["results"][1]["vaccine_name"], pm.VACCINES[1][0])
+
     def test_ordering(self):
         """Test ordering functionality"""
         # Create another country and campaign for ordering test
-        campaign2 = pm.Campaign.objects.create(
+
+        campaign2, campaign2_round, campaign2_rnd2, campaign2_rnd3, zambia, _district = self.create_campaign(
             obr_name="Another Campaign",
-            country=self.zambia,
             account=self.account,
+            source_version=self.source_version_1,
+            country_ou_type=self.org_unit_type_country,
+            country_name="WillBeIgnored",
+            district_ou_type=self.org_unit_type_district,
+            district_name="ZDistrict",
         )
         campaign2.campaign_types.add(self.polio_type)
+        campaign2.country = self.zambia
+        campaign2.save()
+        campaign2_round.number = 1
+        campaign2_round.save()
 
         pm.VaccineRequestForm.objects.create(
             campaign=campaign2,
@@ -130,38 +157,43 @@ def test_ordering(self):
             quantities_ordered_in_doses=500,
         )
 
-        campaign2_round = pm.Round.objects.create(
-            campaign=campaign2,
-            started_at=datetime.datetime(2021, 2, 1),
-            ended_at=datetime.datetime(2021, 2, 28),
-            number=1,
-        )
-
         self.client.force_authenticate(user=self.user)
 
         # Test ordering by campaign name
         response = self.client.get(f"{BASE_URL}?order=campaign__obr_name")
         data = response.json()
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Another Campaign")
-        self.assertEqual(data["results"][1]["campaign_obr_name"], "Test Campaign")
+        self.assertEqual(data["results"][3]["campaign_obr_name"], "Test Campaign")
 
         # Test reverse ordering by campaign name
         response = self.client.get(f"{BASE_URL}?order=-campaign__obr_name")
         data = response.json()
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Test Campaign")
-        self.assertEqual(data["results"][1]["campaign_obr_name"], "Another Campaign")
+        self.assertEqual(data["results"][3]["campaign_obr_name"], "Another Campaign")
+
+        # Test ordering by round number
+        response = self.client.get(f"{BASE_URL}?order=number")
+        data = response.json()
+        self.assertEqual(data["results"][0]["number"], 1)
+        self.assertEqual(data["results"][5]["number"], 3)
+
+        # Test reverse ordering by round number
+        response = self.client.get(f"{BASE_URL}?order=-number")
+        data = response.json()
+        self.assertEqual(data["results"][0]["number"], 3)
+        self.assertEqual(data["results"][5]["number"], 1)
 
         # Test ordering by country name
         response = self.client.get(f"{BASE_URL}?order=campaign__country__name")
         data = response.json()
         self.assertEqual(data["results"][0]["country_name"], "Testland")
-        self.assertEqual(data["results"][1]["country_name"], "Zambia")
+        self.assertEqual(data["results"][3]["country_name"], "Zambia")
 
         # Test reverse ordering by country name
         response = self.client.get(f"{BASE_URL}?order=-campaign__country__name")
         data = response.json()
         self.assertEqual(data["results"][0]["country_name"], "Zambia")
-        self.assertEqual(data["results"][1]["country_name"], "Testland")
+        self.assertEqual(data["results"][3]["country_name"], "Testland")
 
         # Test ordering by start date
         response = self.client.get(f"{BASE_URL}?order=started_at")
@@ -172,32 +204,28 @@ def test_ordering(self):
         # Test reverse ordering by start date
         response = self.client.get(f"{BASE_URL}?order=-started_at")
         data = response.json()
-        self.assertEqual(data["results"][0]["start_date"], campaign2_round.started_at.strftime("%Y-%m-%d"))
-        self.assertEqual(data["results"][1]["start_date"], self.campaign_round_1.started_at.strftime("%Y-%m-%d"))
+        self.assertEqual(data["results"][0]["start_date"], campaign2_rnd3.started_at.strftime("%Y-%m-%d"))
+        self.assertEqual(data["results"][5]["start_date"], self.campaign_round_1.started_at.strftime("%Y-%m-%d"))
 
     def test_filtering(self):
         """Test filtering functionality of VaccineReportingViewSet"""
         # Create test data
-        campaign2 = pm.Campaign.objects.create(
+        campaign2, campaign2_round, campaign2_rnd2, campaign2_rnd3, zambia, _district = self.create_campaign(
             obr_name="Another Campaign",
-            country=self.zambia,
             account=self.account,
+            source_version=self.source_version_1,
+            country_ou_type=self.org_unit_type_country,
+            country_name="WillBeIgnored",
+            district_ou_type=self.org_unit_type_district,
+            district_name="ZDistrict",
         )
+        campaign2_round.delete()
+        campaign2_rnd2.delete()
+        campaign2_rnd3.delete()
+        campaign2.campaign_types.add(self.polio_type)
+        campaign2.country = self.zambia
+        campaign2.save()
         campaign2.campaign_types.add(self.polio_type)
-
-        preparing_campaign = pm.Campaign.objects.create(
-            obr_name="Preparing Campaign",
-            country=self.zambia,
-            account=self.account,
-        )
-        preparing_campaign.campaign_types.add(self.polio_type)
-
-        vrf2 = pm.VaccineRequestForm.objects.create(
-            campaign=campaign2,
-            date_vrf_signature=self.now,
-            date_dg_approval=self.now,
-            quantities_ordered_in_doses=500,
-        )
 
         campaign2_round = pm.Round.objects.create(
             campaign=campaign2,
@@ -206,6 +234,29 @@ def test_filtering(self):
             number=1,
         )
 
+        (
+            preparing_campaign,
+            preparing_campaign_round,
+            preparing_campaign2_rnd2,
+            preparing_campaign_rnd3,
+            zambia_bis,
+            _district,
+        ) = self.create_campaign(
+            obr_name="Preparing Campaign",
+            account=self.account,
+            source_version=self.source_version_1,
+            country_ou_type=self.org_unit_type_country,
+            country_name="WillBeIgnored",
+            district_ou_type=self.org_unit_type_district,
+            district_name="YDistrict",
+        )
+        preparing_campaign.campaign_types.add(self.polio_type)
+        preparing_campaign.country = self.zambia
+        preparing_campaign.save()
+        preparing_campaign_round.delete()
+        preparing_campaign2_rnd2.delete()
+        preparing_campaign_rnd3.delete()
+
         preparing_campaign_round = pm.Round.objects.create(
             campaign=preparing_campaign,
             started_at=datetime.datetime(2025, 2, 1),
@@ -213,6 +264,15 @@ def test_filtering(self):
             number=1,
         )
 
+        preparing_campaign.campaign_types.add(self.polio_type)
+
+        vrf2 = pm.VaccineRequestForm.objects.create(
+            campaign=campaign2,
+            date_vrf_signature=self.now,
+            date_dg_approval=self.now,
+            quantities_ordered_in_doses=500,
+        )
+
         self.client.force_authenticate(user=self.user)
 
         # Test filtering by campaign status - ONGOING
@@ -221,10 +281,10 @@ def test_filtering(self):
         self.assertEqual(len(data["results"]), 1)
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Another Campaign")
 
-        # Test filtering by campaign status - PAST
+        # # Test filtering by campaign status - PAST
         response = self.client.get(f"{BASE_URL}?campaign_status=PAST")
         data = response.json()
-        self.assertEqual(len(data["results"]), 1)
+        self.assertEqual(len(data["results"]), 3)
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Test Campaign")
 
         # Test filtering by campaign status - PREPARING
@@ -242,13 +302,15 @@ def test_filtering(self):
         # Test filtering by campaign name
         response = self.client.get(f"{BASE_URL}?campaign=Test Campaign")
         data = response.json()
-        self.assertEqual(len(data["results"]), 1)
+        self.assertEqual(len(data["results"]), 3)
         self.assertEqual(data["results"][0]["campaign_obr_name"], "Test Campaign")
 
         # Test filtering by file type - VRF
         response = self.client.get(f"{BASE_URL}?file_type=VRF")
         data = response.json()
-        self.assertEqual(len(data["results"]), 2)  # Both campaigns have VRFs
+        self.assertEqual(
+            len(data["results"]), 4
+        )  # Both campaigns have VRFs: 1 round for campaign 2, 3 for self.campaign
 
         # Test filtering by country block
         country_group = self.zambia.groups.first()