diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json
index 8d51fe1c5..b63e71cef 100644
--- a/public/locales/de/translation.json
+++ b/public/locales/de/translation.json
@@ -202,7 +202,16 @@
         "step": "Schritt",
         "requirements": "Voraussetzungen",
         "repeat": "Wiederhole Regel",
-        "requirementsHelpText": "Wähle das Trainingsergebnis (aus einem vorherigen Eintrag), welcher erreicht werden muss, damit die Regel auslöst",
+        "requirementsHelpText": "Wähle die Trainingsergebnisse (aus vorherigen Einträgen), die erreicht werden müssen, damit die Regel auslöst. Die Regeln vergleichen mit dem geplanten Wert, die Varianten \"obere Grenze\" mit dem geplanten Maximum. Für eine doppelte Progression koppelst du das Gewicht an \"Wiederholungen (obere Grenze)\" und verlangst alle Sätze.",
+        "requirementRules": {
+            "weight": "Gewicht",
+            "repetitions": "Wiederholungen",
+            "rir": "RiR",
+            "rest": "Pausenzeit",
+            "max_repetitions": "Wiederholungen (obere Grenze)",
+            "max_weight": "Gewicht (obere Grenze)"
+        },
+        "requirementsAllSets": "Alle Sätze müssen die Regeln erfüllen",
         "markAsTemplate": "Verwalte Vorlage",
         "template": "Vorlage",
         "templates": "Vorlagen",
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index 5950a5536..108600872 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -303,7 +303,16 @@
         "operation": "Operation",
         "step": "Step",
         "requirements": "Requirements",
-        "requirementsHelpText": "Select the workout results (from previous logs) that must be met for this rule to take effect",
+        "requirementsHelpText": "Select the workout results (from previous logs) that must be met for this rule to take effect. The rules compare against the planned value, the 'top of range' variants against the planned maximum. For a double progression, gate the weight on 'Repetitions (top of range)' and require all sets.",
+        "requirementRules": {
+            "weight": "Weight",
+            "repetitions": "Repetitions",
+            "rir": "RiR",
+            "rest": "Rest time",
+            "max_repetitions": "Repetitions (top of range)",
+            "max_weight": "Weight (top of range)"
+        },
+        "requirementsAllSets": "All sets must qualify",
         "repeat": "Repeat rule",
         "repeatHelpText": "Check the check box if you want this rule to continue to apply to subsequent workouts until you define a new one",
         "markAsTemplate": "Manage template",
diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json
index c203f498e..2cbe4488e 100644
--- a/public/locales/es/translation.json
+++ b/public/locales/es/translation.json
@@ -146,7 +146,7 @@
     "noResults": "Sin resultados",
     "success": "¡Éxito!",
     "routines": {
-        "rir": "Repeticiones",
+        "rir": "RiR",
         "addDay": "Añadir un día de entrenamiento",
         "addWeightLog": "Añadir un registro para el entrenamiento",
         "addLogToDay": "Añadir un registro a este día",
@@ -230,7 +230,16 @@
         "repeatHelpText": "Compruebe la casilla de verificación si desea que esta regla se siga aplicando a ejercicios posteriores hasta que defina una nueva",
         "templatesHelpText": "Las plantillas son una manera de guardar su rutina para uso posterior y como punto de partida para futuras rutinas. No puedes editar plantillas, pero puedes duplicarlas y hacer cambios en la copia (así como convertirlas en una rutina regular, por supuesto).",
         "workoutSession": "Sesión de entrenamiento",
-        "requirementsHelpText": "Seleccione los resultados de entrenamiento (de registros anteriores) que deben cumplirse para que esta regla surta efecto",
+        "requirementsHelpText": "Seleccione los resultados de entrenamiento (de registros anteriores) que deben cumplirse para que esta regla surta efecto. Las reglas comparan con el valor planificado, las variantes \"límite superior\" con el máximo planificado. Para una progresión doble, condicione el peso a \"Repeticiones (límite superior)\" y exija todas las series.",
+        "requirementRules": {
+            "weight": "Peso",
+            "repetitions": "Repeticiones",
+            "rir": "RiR",
+            "rest": "Descanso",
+            "max_repetitions": "Repeticiones (límite superior)",
+            "max_weight": "Peso (límite superior)"
+        },
+        "requirementsAllSets": "Todas las series deben cumplir las reglas",
         "template": "Plantilla",
         "templates": "Plantillas",
         "publicTemplate": "Plantilla pública",
diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
index 9376f7bcc..b5dc997b2 100644
--- a/public/locales/fr/translation.json
+++ b/public/locales/fr/translation.json
@@ -217,7 +217,16 @@
         "impressionHelpText": "Ce formulaire enregistre vos résultats d'entraînement (répétitions, poids, etc.) pour chaque exercice. Les modifications que vous effectuez ici, comme la suppression ou le remplacement d'exercices, n'affectent que les journaux spécifiques que vous enregistrez et ne modifient pas votre routine globale. Seules les lignes contenant des valeurs de poids ou de répétitions sont enregistrées.",
         "operation": "Opération",
         "step": "Étape",
-        "requirementsHelpText": "Sélectionnez les résultats d'entraînement (à partir des journaux précédents) qui doivent être atteints pour que cette règle prenne effet",
+        "requirementsHelpText": "Sélectionnez les résultats d'entraînement (à partir des journaux précédents) qui doivent être atteints pour que cette règle prenne effet. Les règles comparent avec la valeur prévue, les variantes \"limite haute\" avec le maximum prévu. Pour une double progression, conditionnez le poids à \"Répétitions (limite haute)\" et exigez toutes les séries.",
+        "requirementRules": {
+            "weight": "Poids",
+            "repetitions": "Répétitions",
+            "rir": "ReR",
+            "rest": "Temps de repos",
+            "max_repetitions": "Répétitions (limite haute)",
+            "max_weight": "Poids (limite haute)"
+        },
+        "requirementsAllSets": "Toutes les séries doivent remplir les règles",
         "requirements": "Exigences",
         "repeat": "Répéter la règle",
         "template": "Modèle",
diff --git a/src/components/Routines/api/baseConfig.ts b/src/components/Routines/api/baseConfig.ts
index 812feaa50..1bec06122 100644
--- a/src/components/Routines/api/baseConfig.ts
+++ b/src/components/Routines/api/baseConfig.ts
@@ -15,6 +15,7 @@ export interface AddBaseConfigParams {
     iteration?: number;
     operation?: OperationType;
     step?: StepType;
+    repeat?: boolean;
     requirements?: RuleRequirements;
 }
 
diff --git a/src/components/Routines/models/BaseConfig.ts b/src/components/Routines/models/BaseConfig.ts
index 5150466f3..51760fb9e 100644
--- a/src/components/Routines/models/BaseConfig.ts
+++ b/src/components/Routines/models/BaseConfig.ts
@@ -18,7 +18,7 @@ export interface BaseConfigEntryForm {
     step: StepType;
     stepMax: StepType;
     requirements: RequirementsType[];
-    requirementsMax: RequirementsType[];
+    allSets: boolean;
     repeat: boolean;
     repeatMax: boolean;
 }
@@ -27,11 +27,19 @@ export const OPERATION_REPLACE = 'r';
 export const OPERATION_ADD = '+';
 export const OPERATION_SUBSTRACT = '-';
 
-export const REQUIREMENTS_VALUES = ["weight", "repetitions", "rir", "rest"] as const;
+/** Rules a progression can be gated on, see REQUIREMENT_RULES on the server */
+export const REQUIREMENTS_VALUES = [
+    "weight",
+    "max_weight",
+    "repetitions",
+    "max_repetitions",
+    "rir",
+    "rest",
+] as const;
 
 export type OperationType = "+" | "-" | "r";
 export type StepType = "abs" | "percent";
-export type RequirementsType = typeof REQUIREMENTS_VALUES;
+export type RequirementsType = (typeof REQUIREMENTS_VALUES)[number];
 
 
 export const STEP_VALUES_SELECT = [
@@ -55,6 +63,8 @@ export const RIR_VALUES_SELECT = [...RIR_VALUES_SELECT_LIST] as const;
 
 export interface RuleRequirements {
     rules: RequirementsType[];
+    /** Every logged set has to meet the rules, not just one */
+    all_sets?: boolean;
 }
 
 export class BaseConfig {
diff --git a/src/components/Routines/widgets/forms/BaseConfigForm.test.tsx b/src/components/Routines/widgets/forms/BaseConfigForm.test.tsx
index 336de34e6..5eb98c64a 100644
--- a/src/components/Routines/widgets/forms/BaseConfigForm.test.tsx
+++ b/src/components/Routines/widgets/forms/BaseConfigForm.test.tsx
@@ -1,9 +1,12 @@
 import { BaseConfig, OPERATION_REPLACE } from '@/components/Routines/models/BaseConfig';
 
-import { SlotBaseConfigValueField } from '@/components/Routines/widgets/forms/BaseConfigForm';
+import {
+    ConfigDetailsRequirementsField,
+    SlotBaseConfigValueField
+} from '@/components/Routines/widgets/forms/BaseConfigForm';
 import { testQueryClient } from "@/tests/queryClient";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from "@testing-library/user-event";
 import React from 'react';
 
@@ -157,4 +160,59 @@ describe('EntryDetailsField Component', () => {
             });
         });
     });
+});
+
+describe('ConfigDetailsRequirementsField', () => {
+    const onChange = vi.fn();
+
+    beforeEach(() => {
+        onChange.mockClear();
+    });
+
+    test('drops the all sets flag once the last rule is removed', async () => {
+        const user = userEvent.setup();
+        render(<ConfigDetailsRequirementsField values={['repetitions']} allSets={true} onChange={onChange} />);
+        await user.click(screen.getByRole('button'));
+
+        await user.click(screen.getByRole('menuitem', { name: /requirementRules\.repetitions/ }));
+        // Nothing selected any more, so all sets has nothing to apply to
+        expect(screen.getByRole('menuitem', { name: /requirementsAllSets/ })).toHaveAttribute('aria-disabled', 'true');
+
+        await user.click(within(screen.getByRole('menu')).getByRole('button', { name: /save/i }));
+        expect(onChange).toHaveBeenCalledExactlyOnceWith([], false);
+    });
+
+    test('picking one end of a range drops the other one', async () => {
+        const user = userEvent.setup();
+        render(<ConfigDetailsRequirementsField values={['repetitions', 'rir']} allSets={false} onChange={onChange} />);
+        await user.click(screen.getByRole('button'));
+
+        await user.click(screen.getByRole('menuitem', { name: /requirementRules\.max_repetitions/ }));
+        const bottomItem = screen.getByRole('menuitem', { name: /requirementRules\.repetitions/ });
+        expect(within(bottomItem).queryByTestId('CheckBoxIcon')).not.toBeInTheDocument();
+
+        await user.click(within(screen.getByRole('menu')).getByRole('button', { name: /save/i }));
+        expect(onChange).toHaveBeenCalledExactlyOnceWith(['rir', 'max_repetitions'], false);
+    });
+
+    test('reopens with the values of the parent, not with its last selection', async () => {
+        const user = userEvent.setup();
+        const { rerender } = render(
+            <ConfigDetailsRequirementsField values={[]} allSets={false} onChange={onChange} />
+        );
+        await user.click(screen.getByRole('button'));
+        await user.click(screen.getByRole('menuitem', { name: /requirementRules\.max_repetitions/ }));
+        await user.click(screen.getByRole('menuitem', { name: /requirementsAllSets/ }));
+        await user.click(within(screen.getByRole('menu')).getByRole('button', { name: /save/i }));
+        expect(onChange).toHaveBeenCalledExactlyOnceWith(['max_repetitions'], true);
+        await waitFor(() => expect(screen.queryByRole('menu')).not.toBeInTheDocument());
+
+        // The parent reset the requirements, e.g. by switching the operation to replace
+        rerender(<ConfigDetailsRequirementsField values={[]} allSets={false} onChange={onChange} />);
+        await user.click(screen.getByRole('button'));
+
+        const ruleItem = screen.getByRole('menuitem', { name: /requirementRules\.max_repetitions/ });
+        expect(within(ruleItem).queryByTestId('CheckBoxIcon')).not.toBeInTheDocument();
+        expect(screen.getByRole('menuitem', { name: /requirementsAllSets/ })).toHaveAttribute('aria-disabled', 'true');
+    });
 });
\ No newline at end of file
diff --git a/src/components/Routines/widgets/forms/BaseConfigForm.tsx b/src/components/Routines/widgets/forms/BaseConfigForm.tsx
index 08a879a35..f7b65224d 100644
--- a/src/components/Routines/widgets/forms/BaseConfigForm.tsx
+++ b/src/components/Routines/widgets/forms/BaseConfigForm.tsx
@@ -234,10 +234,19 @@ export const SlotBaseConfigValueField = (props: {
 };
 
 
+/** Rules that gate the same field on the bottom and the top of its range */
+const RANGE_COUNTERPART: Partial<Record<RequirementsType, RequirementsType>> = {
+    'weight': 'max_weight',
+    'max_weight': 'weight',
+    'repetitions': 'max_repetitions',
+    'max_repetitions': 'repetitions',
+};
+
 export const ConfigDetailsRequirementsField = (props: {
     values: RequirementsType[],
+    allSets: boolean,
     /** Called with the selection once the user saves the menu */
-    onChange: (values: RequirementsType[]) => void,
+    onChange: (values: RequirementsType[], allSets: boolean) => void,
     disabled?: boolean
 }) => {
 
@@ -245,27 +254,40 @@ export const ConfigDetailsRequirementsField = (props: {
     const disable = props.disabled ?? false;
 
     const [selectedElements, setSelectedElements] = useState<RequirementsType[]>(props.values);
+    const [allSets, setAllSets] = useState<boolean>(props.allSets);
     const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
 
     const handleSelection = (value: RequirementsType) => {
-        // if the value is not in selectedElements, add it
-        if (!selectedElements.includes(value)) {
-            setSelectedElements([...selectedElements, value]);
-        } else {
-            setSelectedElements(selectedElements.filter((e) => e !== value));
+        // if the value is not in selectedElements, add it and drop the other
+        // end of its range, the top already implies the bottom
+        const selection = selectedElements.includes(value)
+            ? selectedElements.filter((e) => e !== value)
+            : [...selectedElements.filter((e) => e !== RANGE_COUNTERPART[value]), value];
+        setSelectedElements(selection);
+
+        // "All sets" only means something together with rules
+        if (selection.length === 0) {
+            setAllSets(false);
         }
     };
 
     const handleSubmit = () => {
-        props.onChange(selectedElements);
+        props.onChange(selectedElements, allSets);
         setAnchorEl(null);
     };
 
+    const handleOpen = (event: React.MouseEvent<HTMLElement>) => {
+        // The parent may have reset the values since the menu was last saved
+        setSelectedElements(props.values);
+        setAllSets(props.allSets);
+        setAnchorEl(event.currentTarget);
+    };
+
 
     return <>
         <IconButton
             disabled={disable}
-            onClick={(event) => setAnchorEl(event.currentTarget)}
+            onClick={handleOpen}
         >
             {anchorEl ? <ArrowDropUpIcon fontSize="small" /> : <SettingsIcon fontSize="small" />}
         </IconButton>
@@ -276,18 +298,32 @@ export const ConfigDetailsRequirementsField = (props: {
         >
             {...REQUIREMENTS_VALUES.map((e) => <MenuItem
                 key={e}
-                onClick={() => handleSelection(e as unknown as RequirementsType)}>
+                onClick={() => handleSelection(e)}>
                 <ListItemIcon>
-                    {selectedElements.includes(e as unknown as RequirementsType)
+                    {selectedElements.includes(e)
                         ? <CheckBoxIcon fontSize="small" />
                         : <CheckBoxOutlineBlank fontSize="small" />
                     }
                 </ListItemIcon>
                 <ListItemText>
-                    {e}
+                    {t(`routines.requirementRules.${e}`)}
                 </ListItemText>
             </MenuItem>)}
             <Divider />
+            <MenuItem
+                disabled={selectedElements.length === 0}
+                onClick={() => setAllSets(!allSets)}>
+                <ListItemIcon>
+                    {allSets
+                        ? <CheckBoxIcon fontSize="small" />
+                        : <CheckBoxOutlineBlank fontSize="small" />
+                    }
+                </ListItemIcon>
+                <ListItemText>
+                    {t('routines.requirementsAllSets')}
+                </ListItemText>
+            </MenuItem>
+            <Divider />
             <MenuItem>
 
                 <Button color="primary" variant="contained" type="submit" size="small" onClick={handleSubmit}>
diff --git a/src/components/Routines/widgets/forms/ProgressionForm.test.tsx b/src/components/Routines/widgets/forms/ProgressionForm.test.tsx
index 22635d934..c9759ab4c 100644
--- a/src/components/Routines/widgets/forms/ProgressionForm.test.tsx
+++ b/src/components/Routines/widgets/forms/ProgressionForm.test.tsx
@@ -1,5 +1,5 @@
 import { QueryClientProvider } from '@tanstack/react-query';
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
 import userEvent from "@testing-library/user-event";
 import { BaseConfig } from "@/components/Routines/models/BaseConfig";
 import { ProgressionForm } from "@/components/Routines/widgets/forms/ProgressionForm";
@@ -59,12 +59,16 @@ describe('Tests for the ProgressionForm', () => {
         mockProcessBaseConfigs.mockClear();
     });
 
-    function renderWidget(iterations: number[] = [1, 2]) {
+    function renderWidget(
+        iterations: number[] = [1, 2],
+        configs: BaseConfig[] = testConfigs,
+        configsMax: BaseConfig[] = testMaxConfigs,
+    ) {
         render(
             <QueryClientProvider client={testQueryClient}>
                 <ProgressionForm
-                    configs={testConfigs}
-                    configsMax={testMaxConfigs}
+                    configs={configs}
+                    configsMax={configsMax}
                     type={'weight'}
                     slotEntryId={10}
                     routineId={1}
@@ -137,7 +141,7 @@ describe('Tests for the ProgressionForm', () => {
                         "iteration": 1,
                         "operation": "r",
                         "repeat": false,
-                        "requirements": { "rules": [] },
+                        "requirements": { "rules": [], "all_sets": false },
                         "slot_entry": 10,
                         "step": "abs",
                         "value": "7"
@@ -146,7 +150,7 @@ describe('Tests for the ProgressionForm', () => {
                         "iteration": 2,
                         "operation": "+",
                         "repeat": true,
-                        "requirements": { "rules": [] },
+                        "requirements": { "rules": [], "all_sets": false },
                         "slot_entry": 10,
                         "step": "abs",
                         "value": "2"
@@ -161,7 +165,7 @@ describe('Tests for the ProgressionForm', () => {
                         "iteration": 1,
                         "operation": "r",
                         "repeat": false,
-                        "requirements": { "rules": [] },
+                        "requirements": { "rules": [], "all_sets": false },
                         "slot_entry": 10,
                         "step": "abs",
                         "value": "5"
@@ -170,7 +174,7 @@ describe('Tests for the ProgressionForm', () => {
                         "iteration": 2,
                         "operation": "+",
                         "repeat": true,
-                        "requirements": { "rules": [] },
+                        "requirements": { "rules": [], "all_sets": false },
                         "slot_entry": 10,
                         "step": "abs",
                         "value": "1"
@@ -198,7 +202,7 @@ describe('Tests for the ProgressionForm', () => {
             "iteration": 3,
             "operation": "r",
             "repeat": false,
-            "requirements": { "rules": [] },
+            "requirements": { "rules": [], "all_sets": false },
             "slot_entry": 10,
             "step": "abs",
             "value": "9"
@@ -278,4 +282,82 @@ describe('Tests for the ProgressionForm', () => {
         const payload = mockProcessBaseConfigs.mock.calls[0][0];
         expect(payload.values.toEdit[1]).toMatchObject({ id: 456, operation: 'r', repeat: false });
     });
+
+    describe('requirements', () => {
+
+        // The second week is a double progression: +1 once every set reaches
+        // the top of the rep range
+        const gatedConfigs = [
+            testConfigs[0],
+            new BaseConfig({
+                id: 456,
+                slotEntryId: 10,
+                iteration: 2,
+                value: 1,
+                operation: '+',
+                repeat: true,
+                requirements: { rules: ['max_repetitions'], "all_sets": true },
+            })
+        ];
+
+        const renderGatedWidget = () => renderWidget([1, 2], gatedConfigs, []);
+
+        test('shows the stored rules and the all sets flag', () => {
+            renderGatedWidget();
+
+            expect(screen.getByText('routines.requirementRules.max_repetitions')).toBeInTheDocument();
+            expect(screen.getByText(/routines\.requirementsAllSets/)).toBeInTheDocument();
+        });
+
+        test('keeps the stored requirements when saving an unrelated change', async () => {
+            renderGatedWidget();
+            const minFields = screen.getAllByLabelText('min');
+            await user.clear(minFields[0]);
+            await user.type(minFields[0], '6');
+            await user.click(screen.getByRole('button', { name: /save/i }));
+
+            const [payload] = mockProcessBaseConfigs.mock.calls[0];
+            expect(payload.values.toEdit[1]).toMatchObject({
+                id: 456,
+                requirements: { rules: ['max_repetitions'], "all_sets": true },
+            });
+        });
+
+        test('rules and all sets picked in the menu end up in the payload', async () => {
+            // The first row is the baseline and has its menu locked
+            renderWidget();
+            const menuButtons = screen.getAllByTestId('SettingsIcon');
+            await user.click(menuButtons[1].closest('button')!);
+
+            await user.click(screen.getByRole('menuitem', { name: /requirementRules\.max_repetitions/ }));
+            await user.click(screen.getByRole('menuitem', { name: /requirementsAllSets/ }));
+            await user.click(within(screen.getByRole('menu')).getByRole('button', { name: /save/i }));
+            await waitFor(() => expect(screen.queryByRole('menu')).not.toBeInTheDocument());
+
+            expect(screen.getByText(/routines\.requirementsAllSets/)).toBeInTheDocument();
+            await user.click(screen.getByRole('button', { name: /save/i }));
+
+            const [payload] = mockProcessBaseConfigs.mock.calls[0];
+            expect(payload.values.toEdit[1].requirements).toEqual({
+                rules: ['max_repetitions'],
+                "all_sets": true,
+            });
+            expect(payload.maxValues.toEdit[1].requirements).toEqual({
+                rules: ['max_repetitions'],
+                "all_sets": true,
+            });
+        });
+
+        test('switching an operation to replace clears the all sets flag', async () => {
+            renderGatedWidget();
+            await user.click(screen.getAllByRole('combobox', { name: /routines\.operation/i })[1]);
+            await user.click(screen.getByRole('option', { name: 'Replace' }));
+
+            expect(screen.queryByText(/routines\.requirementsAllSets/)).not.toBeInTheDocument();
+            await user.click(screen.getByRole('button', { name: /save/i }));
+
+            const [payload] = mockProcessBaseConfigs.mock.calls[0];
+            expect(payload.values.toEdit[1].requirements).toEqual({ rules: [], "all_sets": false });
+        });
+    });
 });
diff --git a/src/components/Routines/widgets/forms/ProgressionForm.tsx b/src/components/Routines/widgets/forms/ProgressionForm.tsx
index 0db92961b..84ffa378c 100644
--- a/src/components/Routines/widgets/forms/ProgressionForm.tsx
+++ b/src/components/Routines/widgets/forms/ProgressionForm.tsx
@@ -223,6 +223,7 @@ const ProgressionFields = (props: ProgressionFormProps & {
                                                         field.handleChange(e.target.value as OperationType);
                                                         if (e.target.value === OPERATION_REPLACE) {
                                                             form.setFieldValue(`entries[${index}].requirements`, []);
+                                                            form.setFieldValue(`entries[${index}].allSets`, false);
                                                             form.setFieldValue(`entries[${index}].repeat`, false);
                                                         }
                                                     }}
@@ -267,14 +268,21 @@ const ProgressionFields = (props: ProgressionFormProps & {
                                                 <ConfigDetailsRequirementsField
                                                     disabled={log.iteration === 1 || log.operation === OPERATION_REPLACE}
                                                     values={log.requirements}
-                                                    onChange={values => form.setFieldValue(`entries[${index}].requirements`, values)}
+                                                    allSets={log.allSets}
+                                                    onChange={(values, allSets) => {
+                                                        form.setFieldValue(`entries[${index}].requirements`, values);
+                                                        form.setFieldValue(`entries[${index}].allSets`, allSets);
+                                                    }}
                                                 />}
-                                            {log.requirements.length >= 0 && <br />}
-                                            {log.requirements.length >= 0 && log.requirements.map((requirement) => (
-                                                <Typography key={JSON.stringify(requirement)} variant={'caption'}>
-                                                    {requirement} &nbsp;
+                                            <br />
+                                            {log.requirements.map((requirement) => (
+                                                <Typography key={requirement} variant={'caption'}>
+                                                    {t(`routines.requirementRules.${requirement}`)} &nbsp;
                                                 </Typography>
                                             ))}
+                                            {log.allSets && <Typography variant={'caption'}>
+                                                ({t('routines.requirementsAllSets')})
+                                            </Typography>}
                                         </Grid>
                                         <Grid size={3} sx={{ textAlign: 'center' }}>
                                             {log.edited && <form.Field name={`entries[${index}].repeat`}>
diff --git a/src/components/Routines/widgets/forms/progressionFormData.test.ts b/src/components/Routines/widgets/forms/progressionFormData.test.ts
new file mode 100644
index 000000000..626efbeae
--- /dev/null
+++ b/src/components/Routines/widgets/forms/progressionFormData.test.ts
@@ -0,0 +1,22 @@
+import { BaseConfig } from "@/components/Routines/models/BaseConfig";
+import { emptyEntry, progressionPayload } from "@/components/Routines/widgets/forms/progressionFormData";
+import { ApiPath } from "@/core/lib/consts";
+
+describe('progressionPayload', () => {
+
+    test('deletes a max config only once', () => {
+        const configMax = new BaseConfig({ id: 789, slotEntryId: 10, iteration: 2, value: 12 });
+        const entry = { ...emptyEntry(2, true, false), idMax: 789, value: '10', valueMax: '' };
+
+        const { maxValues } = progressionPayload([entry], {
+            slotEntryId: 10,
+            configs: [],
+            configsMax: [configMax],
+            iterationsToDelete: [2],
+            apiPath: ApiPath.REPETITIONS_CONFIG,
+            apiPathMax: ApiPath.MAX_REPS_CONFIG,
+        });
+
+        expect(maxValues.toDelete).toEqual([789]);
+    });
+});
diff --git a/src/components/Routines/widgets/forms/progressionFormData.ts b/src/components/Routines/widgets/forms/progressionFormData.ts
index acbc41134..2d3eacf1d 100644
--- a/src/components/Routines/widgets/forms/progressionFormData.ts
+++ b/src/components/Routines/widgets/forms/progressionFormData.ts
@@ -7,7 +7,9 @@ import {
     BaseConfig,
     BaseConfigEntryForm,
     OPERATION_REPLACE,
-    REQUIREMENTS_VALUES
+    REQUIREMENTS_VALUES,
+    RuleRequirements,
+    StepType
 } from "@/components/Routines/models/BaseConfig";
 import { ApiPath } from "@/core/lib/consts";
 import { TFunction } from "i18next";
@@ -32,7 +34,7 @@ export const emptyEntry = (iteration: number, edited: boolean, forceInteger: boo
     step: "abs",
     stepMax: "abs",
     requirements: [],
-    requirementsMax: [],
+    allSets: false,
     repeat: false,
     repeatMax: false,
 });
@@ -65,7 +67,7 @@ export function progressionEntries(
             step: config.step,
             stepMax: configMax === undefined ? "abs" : configMax.step,
             requirements: config.requirements?.rules ?? [],
-            requirementsMax: configMax === undefined ? [] : configMax.requirements?.rules ?? [],
+            allSets: config.requirements?.all_sets ?? false,
             repeat: config.repeat,
             repeatMax: configMax === undefined ? false : config.repeat,
         };
@@ -103,7 +105,7 @@ export const progressionSchema = (t: TFunction) => yup.object({
             operation: yup.string().required(),
             operationMax: yup.string().required(),
             requirements: yup.array().of(yup.string().oneOf(REQUIREMENTS_VALUES)),
-            requirementsMax: yup.array().of(yup.string().oneOf(REQUIREMENTS_VALUES)),
+            allSets: yup.boolean(),
             repeat: yup.boolean(),
             repeatMax: yup.boolean()
         })
@@ -155,6 +157,13 @@ export const progressionSchema = (t: TFunction) => yup.object({
     ,
 });
 
+/** The requirements of a form row as the API expects them */
+const requirementsPayload = (entry: BaseConfigEntryForm): RuleRequirements => ({
+    rules: entry.requirements ?? [],
+    // eslint-disable-next-line camelcase
+    all_sets: entry.allSets,
+});
+
 interface PayloadContext {
     slotEntryId: number,
     configs: BaseConfig[],
@@ -173,28 +182,26 @@ export function progressionPayload(
     // Remove empty entries
     const data = entries.filter(e => e.edited);
 
-    // Split between min and max values
-    const editList: EditBaseConfigParams[] = data.filter(data => data.id !== null).map(data => ({
-        id: data.id!,
+    // The min and max configs share operation, repeat and requirements, only
+    // the value (and the step of a new max config) differ
+    const params = (entry: BaseConfigEntryForm, value: number | string, step: StepType): AddBaseConfigParams => ({
         // eslint-disable-next-line camelcase
         slot_entry: slotEntryId,
-        value: data.value as number,
-        iteration: data.iteration,
-        operation: data.operation,
-        step: data.step,
-        repeat: data.repeat,
-        requirements: { rules: data.requirements ?? [] }
-    }));
-    const addList: AddBaseConfigParams[] = data.filter(data => data.id === null && data.value !== '').map(data => ({
-        // eslint-disable-next-line camelcase
-        slot_entry: slotEntryId,
-        value: data.value as number,
-        iteration: data.iteration,
-        operation: data.operation,
-        step: data.step,
-        repeat: data.repeat,
-        requirements: { rules: data.requirements ?? [] }
-    }));
+        value: value as number,
+        iteration: entry.iteration,
+        operation: entry.operation,
+        step: step,
+        repeat: entry.repeat,
+        requirements: requirementsPayload(entry),
+    });
+
+    // Split between min and max values
+    const editList: EditBaseConfigParams[] = data
+        .filter(data => data.id !== null)
+        .map(data => ({ id: data.id!, ...params(data, data.value, data.step) }));
+    const addList: AddBaseConfigParams[] = data
+        .filter(data => data.id === null && data.value !== '')
+        .map(data => params(data, data.value, data.step));
     // Items to delete, also includes all where the value is empty
     const deleteList = configs.filter(c => iterationsToDelete.includes(c.iteration)).map(c => c.id);
     data.forEach(entry => {
@@ -204,31 +211,16 @@ export function progressionPayload(
     });
 
     // Max values
-    const editListMax: EditBaseConfigParams[] = data.filter(data => data.idMax !== null && data.valueMax !== '').map(data => ({
-        id: data.idMax!,
-        // eslint-disable-next-line camelcase
-        slot_entry: slotEntryId,
-        value: data.valueMax as number,
-        iteration: data.iteration,
-        operation: data.operation,
-        step: data.step,
-        repeat: data.repeat,
-        requirements: { rules: data.requirements ?? [] }
-    }));
-    const addListMax: AddBaseConfigParams[] = data.filter(data => data.idMax === null && data.valueMax !== '').map(data => ({
-        iteration: data.iteration,
-        // eslint-disable-next-line camelcase
-        slot_entry: slotEntryId,
-        value: data.valueMax as number,
-        operation: data.operation,
-        step: data.stepMax,
-        repeat: data.repeat,
-        requirements: { rules: data.requirements ?? [] }
-    }));
+    const editListMax: EditBaseConfigParams[] = data
+        .filter(data => data.idMax !== null && data.valueMax !== '')
+        .map(data => ({ id: data.idMax!, ...params(data, data.valueMax, data.step) }));
+    const addListMax: AddBaseConfigParams[] = data
+        .filter(data => data.idMax === null && data.valueMax !== '')
+        .map(data => params(data, data.valueMax, data.stepMax));
     // Items to delete, also includes all where the value is empty
     const deleteListMax = configsMax.filter(c => iterationsToDelete.includes(c.iteration)).map(c => c.id);
     data.forEach(entry => {
-        if (entry.valueMax === "" && entry.idMax !== null && !deleteList.includes(entry.idMax)) {
+        if (entry.valueMax === "" && entry.idMax !== null && !deleteListMax.includes(entry.idMax)) {
             deleteListMax.push(entry.idMax);
         }
     });