UX form with upload Files

History:

My client have a form to create service and this form have a field to upload multiple pdf files. These files are stored on google cloud storage and the server is a google cloud app engine, so we can not upload the files through the app engine. We have to upload the files direct from the frontend using a signed url because app engine have a restriction for larger files.

What I have done:

  1. The user creates the service without uploading any file.
  2. If the service needs to have pdf file(s), the user have to go to the service edit form.
  3. At the end of the service edit form, it has another form only for the files.

The problem:

Now the edit form have two save buttons, one for the form data and one for the files intent to upload.

All of this does not feel right, so I would like to know how can I give my client a better UX in this form.

The Form:

enter image description here