diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3250e4753..2315d2b19 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04-arm
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout code
diff --git a/app/controllers/api/submission_documents_controller.rb b/app/controllers/api/submission_documents_controller.rb
index aa3021c5d..283b55bf2 100644
--- a/app/controllers/api/submission_documents_controller.rb
+++ b/app/controllers/api/submission_documents_controller.rb
@@ -10,7 +10,7 @@ def index
           last_submitter = @submission.submitters.max_by(&:completed_at)
 
           if last_submitter.documents_attachments.blank?
-            last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(submitter)
+            last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
           end
 
           last_submitter.documents_attachments
diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb
index 4512e0182..ee05ff285 100644
--- a/app/controllers/start_form_controller.rb
+++ b/app/controllers/start_form_controller.rb
@@ -34,6 +34,8 @@ def update
         assign_submission_attributes(@submitter, @template)
 
         Submissions::AssignDefinedSubmitters.call(@submitter.submission)
+      else
+        @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
       end
 
       if @submitter.save
@@ -65,8 +67,9 @@ def find_or_initialize_submitter(template, submitter_params)
              .order(id: :desc)
              .where(declined_at: nil)
              .where(external_id: nil)
+             .where(ip: [nil, request.remote_ip])
              .then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
-             .find_or_initialize_by(**submitter_params.compact_blank)
+             .find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
   end
 
   def assign_submission_attributes(submitter, template)