diff --git a/app/components/admin/budget_phases/form_component.html.erb b/app/components/admin/budget_phases/form_component.html.erb
index 3fcaab81c..45e8b65d4 100644
--- a/app/components/admin/budget_phases/form_component.html.erb
+++ b/app/components/admin/budget_phases/form_component.html.erb
@@ -57,7 +57,7 @@
 
   <% if feature?(:allow_images) %>
     <div class="images small-12 column">
-      <%= render "images/nested_image", imageable: @phase, f: f %>
+      <%= render "images/nested_image", f: f %>
       <p class="help-text"><%= t("admin.budget_phases.edit.image_description") %></p>
     </div>
   <% end %>
diff --git a/app/components/admin/budgets/form_component.html.erb b/app/components/admin/budgets/form_component.html.erb
index 6000b586d..ae286844e 100644
--- a/app/components/admin/budgets/form_component.html.erb
+++ b/app/components/admin/budgets/form_component.html.erb
@@ -41,7 +41,7 @@
 
     <% if feature?(:allow_images) %>
       <div class="images small-12 column">
-        <%= render "/images/nested_image", imageable: budget, f: f %>
+        <%= render "/images/nested_image", f: f %>
         <p class="help-text"><%= t("admin.budgets.edit.image_description") %></p>
       </div>
     <% end %>
diff --git a/app/components/budgets/investments/form_component.html.erb b/app/components/budgets/investments/form_component.html.erb
index 34283dbd8..3705bc10e 100644
--- a/app/components/budgets/investments/form_component.html.erb
+++ b/app/components/budgets/investments/form_component.html.erb
@@ -38,13 +38,13 @@
 
     <% if feature?(:allow_images) %>
       <div class="images">
-        <%= render "images/nested_image", imageable: investment, f: f %>
+        <%= render "images/nested_image", f: f %>
       </div>
     <% end %>
 
     <% if feature?(:allow_attached_documents) %>
       <div class="documents">
-        <%= render "documents/nested_documents", documentable: investment, f: f %>
+        <%= render "documents/nested_documents", f: f %>
       </div>
     <% end %>
 
diff --git a/app/components/proposals/form_component.html.erb b/app/components/proposals/form_component.html.erb
index f1af97081..566391e58 100644
--- a/app/components/proposals/form_component.html.erb
+++ b/app/components/proposals/form_component.html.erb
@@ -39,13 +39,13 @@
 
     <% if feature?(:allow_images) %>
       <div class="images">
-        <%= render "images/nested_image", imageable: proposal, f: f %>
+        <%= render "images/nested_image", f: f %>
       </div>
     <% end %>
 
     <% if feature?(:allow_attached_documents) %>
       <div class="documents">
-        <%= render "documents/nested_documents", documentable: proposal, f: f %>
+        <%= render "documents/nested_documents", f: f %>
       </div>
     <% end %>
 
diff --git a/app/views/admin/dashboard/actions/_form.html.erb b/app/views/admin/dashboard/actions/_form.html.erb
index 810726868..178fe0596 100644
--- a/app/views/admin/dashboard/actions/_form.html.erb
+++ b/app/views/admin/dashboard/actions/_form.html.erb
@@ -62,7 +62,7 @@
 <% if feature?(:allow_attached_documents) %>
   <div class="documents small-12 column">
     <hr>
-    <%= render "documents/nested_documents", documentable: dashboard_action, f: f %>
+    <%= render "documents/nested_documents", f: f %>
     <hr>
   </div>
 <% end %>
diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index 98ab0e51c..3094d4ccd 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -110,7 +110,7 @@
 
   <div class="row">
     <div class="documents small-12 column">
-      <%= render "documents/nested_documents", documentable: @process, f: f %>
+      <%= render "documents/nested_documents", f: f %>
     </div>
 
     <div class="small-12 column">
@@ -118,7 +118,7 @@
     </div>
 
     <div class="images small-12 column">
-      <%= render "images/nested_image", imageable: @process, f: f %>
+      <%= render "images/nested_image", f: f %>
     </div>
 
     <div class="small-12 column">
diff --git a/app/views/admin/milestones/_form.html.erb b/app/views/admin/milestones/_form.html.erb
index 8c56eaaad..23314333f 100644
--- a/app/views/admin/milestones/_form.html.erb
+++ b/app/views/admin/milestones/_form.html.erb
@@ -27,10 +27,10 @@
     <div class="column">
       <%= f.date_field :publication_date %>
 
-      <%= render "images/nested_image", imageable: @milestone, f: f %>
+      <%= render "images/nested_image", f: f %>
 
       <div class="documents">
-        <%= render "documents/nested_documents", documentable: @milestone, f: f %>
+        <%= render "documents/nested_documents", f: f %>
       </div>
 
       <%= f.submit nil, class: "button success" %>
diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
index 902a10e0a..926a98ce4 100644
--- a/app/views/admin/poll/polls/_form.html.erb
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -33,7 +33,7 @@
 
   <div class="row">
     <div class="images small-12 column">
-      <%= render "images/nested_image", imageable: @poll, f: f %>
+      <%= render "images/nested_image", f: f %>
     </div>
 
     <div class="clear">
diff --git a/app/views/admin/poll/questions/answers/documents.html.erb b/app/views/admin/poll/questions/answers/documents.html.erb
index 786c38cd9..71d6baeb5 100644
--- a/app/views/admin/poll/questions/answers/documents.html.erb
+++ b/app/views/admin/poll/questions/answers/documents.html.erb
@@ -15,7 +15,7 @@
     <%= render "shared/errors", resource: @answer %>
 
     <div class="documents">
-      <%= render "documents/nested_documents", documentable: @answer, f: f %>
+      <%= render "documents/nested_documents", f: f %>
     </div>
 
     <div class="small-12 medium-6 large-2">
diff --git a/app/views/admin/poll/questions/answers/images/new.html.erb b/app/views/admin/poll/questions/answers/images/new.html.erb
index a6e401047..d271f2ca6 100644
--- a/app/views/admin/poll/questions/answers/images/new.html.erb
+++ b/app/views/admin/poll/questions/answers/images/new.html.erb
@@ -5,7 +5,7 @@
     <%= render "shared/errors", resource: @answer %>
 
     <div class="images">
-      <%= render "images/nested_image", imageable: @answer, f: f, image_fields: :images %>
+      <%= render "images/nested_image", f: f, image_fields: :images %>
     </div>
 
     <%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %>
diff --git a/app/views/admin/widget/cards/_form.html.erb b/app/views/admin/widget/cards/_form.html.erb
index 37676354b..606697f4d 100644
--- a/app/views/admin/widget/cards/_form.html.erb
+++ b/app/views/admin/widget/cards/_form.html.erb
@@ -45,7 +45,7 @@
   <div class="row">
     <div class="image-form">
       <div class="image small-12 column">
-        <%= render "images/nested_image", imageable: card, f: f %>
+        <%= render "images/nested_image", f: f %>
       </div>
     </div>
     <div class="column">
diff --git a/app/views/documents/_nested_documents.html.erb b/app/views/documents/_nested_documents.html.erb
index e706b0446..4fd7411cf 100644
--- a/app/views/documents/_nested_documents.html.erb
+++ b/app/views/documents/_nested_documents.html.erb
@@ -1,3 +1,5 @@
+<% documentable = f.object %>
+
 <div class="documents-list">
   <%= f.label :documents, t("documents.form.title") %>
   <p class="help-text"><%= documentables_note(documentable) %></p>
diff --git a/app/views/images/_nested_image.html.erb b/app/views/images/_nested_image.html.erb
index a3adf08ba..4dacbede9 100644
--- a/app/views/images/_nested_image.html.erb
+++ b/app/views/images/_nested_image.html.erb
@@ -1,4 +1,5 @@
 <% image_fields ||= :image %>
+<% imageable = f.object %>
 
 <%= f.label image_fields, t("images.form.title") %>
 <p class="help-text"><%= imageables_note(imageable) %></p>
diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb
index f1f8aef59..6e65c5ff1 100644
--- a/app/views/legislation/proposals/_form.html.erb
+++ b/app/views/legislation/proposals/_form.html.erb
@@ -28,12 +28,12 @@
 
     <% if feature?(:allow_images) %>
       <div class="images small-12 column">
-        <%= render "images/nested_image", imageable: @proposal, f: f %>
+        <%= render "images/nested_image", f: f %>
       </div>
     <% end %>
 
     <div class="documents small-12 column" data-max-documents="<%= Legislation::Proposal.max_documents_allowed %>">
-      <%= render "documents/nested_documents", documentable: @proposal, f: f %>
+      <%= render "documents/nested_documents", f: f %>
     </div>
 
     <div class="small-12 medium-6 column">