diff --git a/lib/docuseal.rb b/lib/docuseal.rb
index e63ef58e..4e08d724 100644
--- a/lib/docuseal.rb
+++ b/lib/docuseal.rb
@@ -64,6 +64,8 @@ module Docuseal
   end
 
   def default_pkcs
+    return if Docuseal::CERTS['enabled'] == false
+
     @default_pkcs ||= GenerateCertificate.load_pkcs(Docuseal::CERTS)
   end
 
diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb
index d0af550c..ea4c5fe7 100644
--- a/lib/submissions/create_from_submitters.rb
+++ b/lib/submissions/create_from_submitters.rb
@@ -77,7 +77,7 @@ module Submissions
       if template_fields != (submission.template_fields || submission.template.fields) ||
          submitters_attrs.any? { |e| e[:completed].present? }
         submission.template_fields = template_fields
-        submission.template_schema = submission.template.schema
+        submission.template_schema = submission.template.schema if submission.template_schema.blank?
       end
 
       submission
diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index 666a3b8e..1611a68c 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -43,12 +43,16 @@ module Submissions
 
         last_submitter = submission.submitters.select(&:completed_at).max_by(&:completed_at)
 
-        sign_params = {
-          reason: sign_reason,
-          **Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url)
-        }
+        if pkcs
+          sign_params = {
+            reason: sign_reason,
+            **Submissions::GenerateResultAttachments.build_signing_params(last_submitter, pkcs, tsa_url)
+          }
 
-        document.sign(io, **sign_params)
+          document.sign(io, **sign_params)
+        else
+          document.write(io)
+        end
 
         Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)
 
diff --git a/lib/submissions/generate_combined_attachment.rb b/lib/submissions/generate_combined_attachment.rb
index 75b3fcfc..e5dfc892 100644
--- a/lib/submissions/generate_combined_attachment.rb
+++ b/lib/submissions/generate_combined_attachment.rb
@@ -17,12 +17,16 @@ module Submissions
 
       pdf.trailer.info[:Creator] = "#{Docuseal.product_name} (#{Docuseal::PRODUCT_URL})"
 
-      sign_params = {
-        reason: Submissions::GenerateResultAttachments.single_sign_reason(submitter),
-        **Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url)
-      }
-
-      pdf.sign(io, **sign_params)
+      if pkcs
+        sign_params = {
+          reason: Submissions::GenerateResultAttachments.single_sign_reason(submitter),
+          **Submissions::GenerateResultAttachments.build_signing_params(submitter, pkcs, tsa_url)
+        }
+
+        pdf.sign(io, **sign_params)
+      else
+        pdf.write(io)
+      end
 
       Submissions::GenerateResultAttachments.maybe_enable_ltv(io, sign_params)
 
diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb
index f9c66a89..1c02c546 100644
--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@@ -487,7 +487,7 @@ module Submissions
 
       sign_reason = fetch_sign_reason(submitter)
 
-      if sign_reason
+      if sign_reason && pkcs
         sign_params = {
           reason: sign_reason,
           **build_signing_params(submitter, pkcs, tsa_url)
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e2195ceb..60e8abc0 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -25,7 +25,8 @@ Capybara.register_driver(:headless_cuprite) do |app|
   Capybara::Cuprite::Driver.new(app, window_size: [1200, 800],
                                      process_timeout: 20,
                                      timeout: 20,
-                                     js_errors: true)
+                                     js_errors: true,
+                                     browser_options: { 'no-sandbox' => nil })
 end
 
 Capybara.register_driver(:headful_cuprite) do |app|
@@ -33,7 +34,8 @@ Capybara.register_driver(:headful_cuprite) do |app|
                                      headless: false,
                                      process_timeout: 20,
                                      timeout: 20,
-                                     js_errors: true)
+                                     js_errors: true,
+                                     browser_options: { 'no-sandbox' => nil })
 end
 
 Rails.root.glob('spec/support/**/*.rb').each { |f| require f }