diff --git a/api.saladeaula.digital/app/routes/enrollments/cancel.py b/api.saladeaula.digital/app/routes/enrollments/cancel.py
index da08cd2..2d7a462 100644
--- a/api.saladeaula.digital/app/routes/enrollments/cancel.py
+++ b/api.saladeaula.digital/app/routes/enrollments/cancel.py
@@ -44,10 +44,8 @@ def cancel(
             item={
                 'id': enrollment_id,
                 'sk': 'CANCELED',
-                'canceled_by': {
-                    'id': canceled_by.id,
-                    'name': canceled_by.name,
-                },
+                'user_id': canceled_by.id,
+                'name': canceled_by.name,
                 'created_at': now_,
             }
         )
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
index a7f8706..f9f71c7 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
@@ -8,9 +8,10 @@ import {
   UserIcon,
   BanIcon,
   PlusIcon,
-  XIcon
+  EllipsisIcon,
+  RotateCcw
 } from 'lucide-react'
-import { Link } from 'react-router'
+import { Link, useParams } from 'react-router'
 import { Suspense } from 'react'
 
 import {
@@ -47,7 +48,12 @@ import { Skeleton } from '@repo/ui/components/skeleton'
 import { Await } from 'react-router'
 import { Abbr } from '@repo/ui/components/abbr'
 import { Button } from '@repo/ui/components/ui/button'
-import { Badge } from '@repo/ui/components/ui/badge'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger
+} from '@repo/ui/components/ui/dropdown-menu'
 
 export function meta({}: Route.MetaArgs) {
   return [{ title: 'Relatório de matrículas' }]
@@ -62,11 +68,15 @@ export async function loader({ context, request, params }: Route.LoaderArgs) {
   }).then((r) => r.json())
 
   return {
-    data: submission
+    submission
   }
 }
 
-export default function Route({ loaderData: { data } }: Route.ComponentProps) {
+export default function Route({
+  loaderData: { submission }
+}: Route.ComponentProps) {
+  const { id } = useParams()
+
   return (
     <Suspense fallback={<Skeleton />}>
       <div className="space-y-2.5">
@@ -90,7 +100,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
           </BreadcrumbList>
         </Breadcrumb>
 
-        <Await resolve={data} errorElement={<NotFound />}>
+        <Await resolve={submission} errorElement={<NotFound />}>
           {({ enrolled, scheduled, sk, created_by }) => {
             const succeed = enrolled?.filter(
               ({ status }) => status === 'success'
@@ -146,6 +156,30 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
                               ))}
                             </ul>
                           </AlertDescription>
+
+                          <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                              <Button
+                                className="absolute right-2.5 top-2.5 text-accent-foreground cursor-pointer"
+                                variant="ghost"
+                                size="icon-sm"
+                              >
+                                <EllipsisIcon />
+                              </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end" className="w-42">
+                              <DropdownMenuItem
+                                className="cursor-pointer"
+                                asChild
+                              >
+                                <Link
+                                  to={`../enrollments/add?submission=${id}`}
+                                >
+                                  <RotateCcw /> Restaurar dados
+                                </Link>
+                              </DropdownMenuItem>
+                            </DropdownMenuContent>
+                          </DropdownMenu>
                         </Alert>
                       )}
 
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts
index e09e196..dbfb0c7 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/data.ts
@@ -20,8 +20,7 @@ export const enrollment = z.object({
       {
         id: z.string(),
         name: z.string(),
-        access_period: z.number(),
-        unit_price: z.number()
+        access_period: z.number()
       },
       { error: 'Escolha um curso' }
     )
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
index 89fd934..2b32c33 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.add/route.tsx
@@ -19,7 +19,7 @@ import {
 } from 'lucide-react'
 import { redirect, Link, useParams, useFetcher } from 'react-router'
 import { Controller, useFieldArray, useForm } from 'react-hook-form'
-import { Fragment, use, useMemo, useState } from 'react'
+import { Fragment, use, useEffect, useMemo, useState } from 'react'
 import { format } from 'date-fns'
 import { ptBR } from 'react-day-picker/locale'
 import { zodResolver } from '@hookform/resolvers/zod'
@@ -75,12 +75,15 @@ import { cloudflareContext } from '@repo/auth/context'
 import { SearchFilter } from '@repo/ui/components/search-filter'
 
 import { formSchema, type Schema, MAX_ITEMS } from './data'
+import { pick } from 'ramda'
 
 export function meta({}: Route.MetaArgs) {
   return [{ title: 'Adicionar matrícula' }]
 }
 
-export async function loader({ context }: Route.LoaderArgs) {
+export async function loader({ params, context, request }: Route.LoaderArgs) {
+  const url = new URL(request.url)
+  const submissionId = url.searchParams.get('submission')
   const cloudflare = context.get(cloudflareContext)
   const courses = createSearch({
     index: 'saladeaula_courses',
@@ -90,7 +93,15 @@ export async function loader({ context }: Route.LoaderArgs) {
     env: cloudflare.env
   })
 
-  return { courses }
+  const submission = submissionId
+    ? req({
+        url: `/orgs/${params.orgid}/enrollments/${submissionId}/submitted`,
+        context,
+        request
+      }).then((r) => r.json())
+    : Promise.resolve({ enrolled: [] })
+
+  return { courses, submission }
 }
 
 export async function action({ params, request, context }: Route.ActionArgs) {
@@ -116,9 +127,10 @@ const emptyRow = {
 }
 
 export default function Route({
-  loaderData: { courses }
+  loaderData: { courses, submission }
 }: Route.ComponentProps) {
   const { orgid } = useParams()
+  const { enrolled } = use(submission)
   const fetcher = useFetcher()
   const form = useForm({
     resolver: zodResolver(formSchema),
@@ -156,6 +168,18 @@ export default function Route({
     })
   }
 
+  useEffect(() => {
+    if (enrolled.length === 0) {
+      return
+    }
+
+    reset({
+      enrollments: enrolled.map(({ input_record }) =>
+        pick(['course', 'user'], input_record)
+      )
+    })
+  }, [enrolled, reset])
+
   return (
     <div className="space-y-2.5">
       <Breadcrumb>
diff --git a/apps/admin.saladeaula.digital/package.json b/apps/admin.saladeaula.digital/package.json
index 8bfc590..7aa1d02 100644
--- a/apps/admin.saladeaula.digital/package.json
+++ b/apps/admin.saladeaula.digital/package.json
@@ -25,6 +25,7 @@
     "luxon": "^3.7.2",
     "meilisearch": "^0.54.0",
     "meilisearch-helper": "github:sergiors/meilisearch-helper",
+    "ramda": "^0.32.0",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
     "react-router": "^7.10.1",
diff --git a/apps/saladeaula.digital/app/routes/explore.tsx b/apps/saladeaula.digital/app/routes/explore.tsx
index cbc2ea5..44124ce 100644
--- a/apps/saladeaula.digital/app/routes/explore.tsx
+++ b/apps/saladeaula.digital/app/routes/explore.tsx
@@ -62,10 +62,10 @@ export default function Component({
     <Container className="space-y-5 max-w-2xl">
       <Suspense fallback={<Skeleton />}>
         <div className="space-y-1.5">
-          <h1 className="text-4xl font-semibold tracking-tight sm:text-3xl xl:text-4xl">
+          <h1 className="text-2xl lg:text-4xl font-semibold tracking-tight sm:text-3xl xl:text-4xl">
             Expore nossos cursos
           </h1>
-          <p className="text-muted-foreground text-[1.05rem] text-balance sm:text-base">
+          <p className="text-muted-foreground lg:text-[1.05rem] lg:text-balance text-base">
             Conheça todos os cursos que oferecemos, desenvolvidos para
             fortalecer suas competências profissionais e apoiar seu crescimento
             contínuo na carreira.
diff --git a/orders-events/app/events/billing/append_enrollment.py b/orders-events/app/events/billing/append_enrollment.py
index 342c189..3d10aeb 100644
--- a/orders-events/app/events/billing/append_enrollment.py
+++ b/orders-events/app/events/billing/append_enrollment.py
@@ -131,6 +131,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
                 # Add created_by if present
                 | (
                     {
+                        # Post-migration: rename `author`  to `created_by`
                         'author': {
                             'id': created_by['user_id'],
                             'name': created_by['name'],
diff --git a/orders-events/app/events/billing/cancel_enrollment.py b/orders-events/app/events/billing/cancel_enrollment.py
index b781e08..d659ce8 100644
--- a/orders-events/app/events/billing/cancel_enrollment.py
+++ b/orders-events/app/events/billing/cancel_enrollment.py
@@ -28,7 +28,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
     subscription = enrollment_layer.collection.get_items(
         TransactKey(enrollment_id)
         + SortKey('METADATA#SUBSCRIPTION_COVERED')
-        + SortKey('CANCELED', path_spec='canceled_by', rename_key='canceled_by')
+        + SortKey('CANCELED', rename_key='canceled_by')
     )
 
     created_at: datetime = fromisoformat(new_image['created_at'])  # type: ignore
@@ -66,9 +66,17 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
             }
             | pick(('user', 'course', 'enrolled_at'), old_enrollment)
             # Add `created_by` if present
-            | ({'author': canceled_by} if canceled_by else {}),
-            # Post-migration: uncomment the following line
-            # | ({'created_by': canceled_by} if canceled_by else {}),
+            | (
+                {
+                    #    Post-migration: rename `author` to `canceled_by`
+                    'author': {
+                        'id': canceled_by['user_id'],
+                        'name': canceled_by['name'],
+                    },
+                }
+                if canceled_by
+                else {}
+            ),
             cond_expr='attribute_not_exists(sk)',
         )
     except Exception as exc:
diff --git a/orders-events/uv.lock b/orders-events/uv.lock
index 7660602..193b632 100644
--- a/orders-events/uv.lock
+++ b/orders-events/uv.lock
@@ -20,6 +20,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/89/03/a851e84fcbb85214dc637b6378121ef9a0dd61b4c65264675d8a5c9b1ae7/antlr4_python3_runtime-4.13.2-py3-none-any.whl", hash = "sha256:fe3835eb8d33daece0e799090eda89719dbccee7aa39ef94eed3818cafa5a7e8", size = 144462, upload-time = "2024-08-03T19:00:11.134Z" },
 ]
 
+[[package]]
+name = "anyio"
+version = "4.12.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "idna" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/16/ce/8a777047513153587e5434fd752e89334ac33e379aa3497db860eeb60377/anyio-4.12.0.tar.gz", hash = "sha256:73c693b567b0c55130c104d0b43a9baf3aa6a31fc6110116509f27bf75e21ec0", size = 228266, upload-time = "2025-11-28T23:37:38.911Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7f/9c/36c5c37947ebfb8c7f22e0eb6e4d188ee2d53aa3880f3f2744fb894f0cb1/anyio-4.12.0-py3-none-any.whl", hash = "sha256:dad2376a628f98eeca4881fc56cd06affd18f659b17a747d3ff0307ced94b1bb", size = 113362, upload-time = "2025-11-28T23:36:57.897Z" },
+]
+
 [[package]]
 name = "arnparse"
 version = "0.0.2"
@@ -262,6 +274,23 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2c/1a/aff8bb287a4b1400f69e09a53bd65de96aa5cee5691925b38731c67fc695/click_default_group-1.2.4-py2.py3-none-any.whl", hash = "sha256:9b60486923720e7fc61731bdb32b617039aba820e22e1c88766b1125592eaa5f", size = 4123, upload-time = "2023-08-04T07:54:56.875Z" },
 ]
 
+[[package]]
+name = "cloudflare"
+version = "4.3.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "distro" },
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "sniffio" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5d/48/e481c0a9b9010a5c41b5ca78ff9fbe00dc8a9a4d39da5af610a4ec49c7f7/cloudflare-4.3.1.tar.gz", hash = "sha256:b1e1c6beeb8d98f63bfe0a1cba874fc4e22e000bcc490544f956c689b3b5b258", size = 1933187, upload-time = "2025-06-16T21:43:18.716Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3a/8f/c6c543565efd3144da4304efa5917aac06b6416a8663a6defe0e9b2b7569/cloudflare-4.3.1-py3-none-any.whl", hash = "sha256:6927135a5ee5633d6e2e1952ca0484745e933727aeeb189996d2ad9d292071c6", size = 4406465, upload-time = "2025-06-16T21:43:17.3Z" },
+]
+
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -344,6 +373,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/47/ef/4cb333825d10317a36a1154341ba37e6e9c087bac99c1990ef07ffdb376f/dictdiffer-0.9.0-py2.py3-none-any.whl", hash = "sha256:442bfc693cfcadaf46674575d2eba1c53b42f5e404218ca2c2ff549f2df56595", size = 16754, upload-time = "2021-07-22T13:24:26.783Z" },
 ]
 
+[[package]]
+name = "distro"
+version = "1.9.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3/distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed", size = 60722, upload-time = "2023-12-24T09:54:32.31Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/b3/231ffd4ab1fc9d679809f356cebee130ac7daa00d6d6f3206dd4fd137e9e/distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2", size = 20277, upload-time = "2023-12-24T09:54:30.421Z" },
+]
+
 [[package]]
 name = "dnspython"
 version = "2.7.0"
@@ -436,6 +474,43 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ae/4f/7297663840621022bc73c22d7d9d80dbc78b4db6297f764b545cd5dd462d/graphql_core-3.2.6-py3-none-any.whl", hash = "sha256:78b016718c161a6fb20a7d97bbf107f331cd1afe53e45566c59f776ed7f0b45f", size = 203416, upload-time = "2025-01-26T16:36:24.868Z" },
 ]
 
+[[package]]
+name = "h11"
+version = "0.16.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" },
+]
+
+[[package]]
+name = "httpcore"
+version = "1.0.9"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "h11" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" },
+]
+
+[[package]]
+name = "httpx"
+version = "0.28.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "certifi" },
+    { name = "httpcore" },
+    { name = "idna" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -576,12 +651,13 @@ wheels = [
 
 [[package]]
 name = "layercake"
-version = "0.11.2"
+version = "0.11.3"
 source = { directory = "../layercake" }
 dependencies = [
     { name = "arnparse" },
     { name = "authlib" },
     { name = "aws-lambda-powertools", extra = ["all"] },
+    { name = "cloudflare" },
     { name = "dictdiffer" },
     { name = "ftfy" },
     { name = "glom" },
@@ -607,6 +683,7 @@ requires-dist = [
     { name = "arnparse", specifier = ">=0.0.2" },
     { name = "authlib", specifier = ">=1.6.5" },
     { name = "aws-lambda-powertools", extras = ["all"], specifier = ">=3.23.0" },
+    { name = "cloudflare", specifier = ">=4.3.1" },
     { name = "dictdiffer", specifier = ">=0.9.0" },
     { name = "ftfy", specifier = ">=6.3.1" },
     { name = "glom", specifier = ">=24.11.0" },
@@ -1419,6 +1496,15 @@ s3 = [
     { name = "boto3" },
 ]
 
+[[package]]
+name = "sniffio"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372, upload-time = "2024-02-25T23:20:04.057Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235, upload-time = "2024-02-25T23:20:01.196Z" },
+]
+
 [[package]]
 name = "sqlite-fts4"
 version = "1.0.3"
diff --git a/package-lock.json b/package-lock.json
index f98464c..b1f42a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "luxon": "^3.7.2",
         "meilisearch": "^0.54.0",
         "meilisearch-helper": "github:sergiors/meilisearch-helper",
+        "ramda": "^0.32.0",
         "react": "^19.2.1",
         "react-dom": "^19.2.1",
         "react-router": "^7.10.1",