diff --git a/src/Controller/Admin/Assignment/PickupFormController.php b/src/Controller/Admin/Assignment/PickupFormController.php
index f34af0a..17ca08e 100644
--- a/src/Controller/Admin/Assignment/PickupFormController.php
+++ b/src/Controller/Admin/Assignment/PickupFormController.php
@@ -21,8 +21,11 @@ class PickupFormController extends AbstractController
         $form = $this->createForm(AssignmentType::class, $assignment);
         $form->handleRequest($request);
 
-        return $this->render('admin/assignment/_form_pickup.html.twig', [
-            'form' => $form->createView(),
-        ]);
+        return $this->renderBlock('admin/assignment/_form.html.twig',
+            'partial_form',
+            [
+                'form' => $form->createView(),
+            ]
+        );
     }
 }
\ No newline at end of file
diff --git a/templates/admin/assignment/_form.html.twig b/templates/admin/assignment/_form.html.twig
index 3a2c56f..53f8367 100644
--- a/templates/admin/assignment/_form.html.twig
+++ b/templates/admin/assignment/_form.html.twig
@@ -34,7 +34,10 @@
         </div>
         <div class="relative">
             <div class="grid lg:grid-cols-2 gap-x-8 gap-y-4" {{ stimulus_target('form-partial', 'container') }}>
-                {% include 'admin/assignment/_form_pickup.html.twig' %}
+                {% block partial_form %}
+                    {{ form_row(form.pickup) }}
+                    {#{{ form_row(form.pickupDate) }}#}
+                {% endblock %}
             </div>
             <div class="absolute top-0 left-0 inset-0 bg-white/90 flex items-center justify-center" {{ stimulus_target('form-partial', 'spinner') }}>
                 {% include '_partials/_spinner.html.twig' with { 'class': 'w-8 h-8'} %}
diff --git a/templates/admin/assignment/_form_pickup.html.twig b/templates/admin/assignment/_form_pickup.html.twig
deleted file mode 100644
index 315625d..0000000
--- a/templates/admin/assignment/_form_pickup.html.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ form_row(form.pickup) }}
-{#{{ form_row(form.pickupDate) }}#}