diff --git a/Dockerfile b/Dockerfile
index 19542f88..2b4c2ed6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,7 +53,7 @@ RUN DATABASE_PASSWORD=required-to-run-but-not-used \
     bundle exec rails assets:precompile
 
 # Cleanup to save space in the production image
-RUN rm -rf node_modules log/* tmp/* /tmp && \
+RUN rm -rf log/* tmp/* /tmp && \
     rm -rf /usr/local/bundle/cache && \
     rm -rf .env && \
     find /usr/local/bundle/gems -name "*.c" -delete && \
@@ -86,6 +86,18 @@ RUN apk add --no-cache libpq
 COPY --from=builder /app /app
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
+# Set up puppeteer (for PDF generation)
+# https://pptr.dev/troubleshooting#running-on-alpine
+RUN apk add --no-cache \
+    chromium \
+    nss \
+    freetype \
+    harfbuzz \
+    ca-certificates \
+    ttf-freefont \
+    nodejs
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
 # SSH access specific to Azure
 # Install OpenSSH and set the password for root to "Docker!".
 RUN apk add --no-cache openssh && echo "root:Docker!" | chpasswd
diff --git a/app/assets/builds/certificates.css b/app/assets/builds/certificates.css
new file mode 100644
index 00000000..4e93a0ce
--- /dev/null
+++ b/app/assets/builds/certificates.css
@@ -0,0 +1,65 @@
+body {
+  margin: 0;
+  padding: 0;
+}
+
+.container {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+}
+
+.content {
+  position: absolute;
+  top: 350px;
+  left: 100px;
+  width: 100%;
+}
+
+.header-image {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+}
+
+.heading {
+  font-size: 82px;
+  font-family: Helvetica;
+  color: #063961;
+}
+
+.text {
+  font-size: 18px;
+  font-family: Helvetica;
+  color: #231f20;
+}
+
+.content-npq {
+  position: absolute;
+  top: 350px;
+  left: 85px;
+  width: 100%;
+}
+
+.text-npq {
+  font-size: 32px;
+  font-family: Arial;
+  color: #231f20;
+}
+
+.heading-npq {
+  font-size: 48px;
+  font-family: Arial;
+  color: #231f20;
+}
+
+.name-heading-npq {
+  max-width: 70%;
+  text-align: left;
+  font-size: clamp(16px, 4vw, 40px);
+  white-space: nowrap;
+}
diff --git a/app/assets/stylesheets/certificates.scss b/app/assets/stylesheets/certificates.scss
index 2dc9626d..78dfbd43 100644
--- a/app/assets/stylesheets/certificates.scss
+++ b/app/assets/stylesheets/certificates.scss
@@ -32,3 +32,25 @@ body {
   font-family: Helvetica;
   color: #231f20;
 }
+.content-npq {
+  position: absolute;
+  top: 350px;
+  left: 85px;
+  width: 100%;
+}
+.text-npq {
+  font-size: 32px;
+  font-family: Arial;
+  color: #231f20;
+}
+.heading-npq {
+  font-size: 48px;
+  font-family: Arial;
+  color: #231f20;
+}
+.name-heading-npq {
+  max-width: 70%;
+  text-align: left;
+  font-size: clamp(16px, 4vw, 40px);
+  white-space: nowrap;
+}
diff --git a/app/components/induction_summary_component.rb b/app/components/induction_summary_component.rb
index 79bffbef..0735bae6 100644
--- a/app/components/induction_summary_component.rb
+++ b/app/components/induction_summary_component.rb
@@ -71,7 +71,7 @@ def rows
       }
     ]
 
-    if details.respond_to?(:certificate_url) && details.certificate_url.present?
+    if details.status == "Pass"
       @rows << {
         key: {
           text: "Certificate"
diff --git a/app/controllers/qualifications/certificates_controller.rb b/app/controllers/qualifications/certificates_controller.rb
index a7f5d65f..0f47de72 100644
--- a/app/controllers/qualifications/certificates_controller.rb
+++ b/app/controllers/qualifications/certificates_controller.rb
@@ -13,7 +13,7 @@ def show
                               formats: [:html],
                               locals: { teacher: @teacher, qualification: @qualification },
                               layout: "layouts/certificate")
-      grover = Grover.new(html, format: 'A4', display_url: request.base_url)
+      grover = Grover.new(html, format: 'A4', display_url: ENV["HOSTING_DOMAIN"])
       pdf = grover.to_pdf
       send_data pdf, filename: "#{@teacher.name}_#{@qualification.type.downcase}_certificate.pdf", 
 type: 'application/pdf', disposition: 'attachment'
diff --git a/app/views/qualifications/certificates/_eyts.html.erb b/app/views/qualifications/certificates/_eyts.html.erb
index 4345063f..f88930fc 100644
--- a/app/views/qualifications/certificates/_eyts.html.erb
+++ b/app/views/qualifications/certificates/_eyts.html.erb
@@ -1,7 +1,7 @@
 <img src="/eyts-certificate.jpg" class="header-image" alt="Department for Education" />
 
 <div class="content">
-  <h2 class="heading">Early years<br/>Teacher Status</h2>
+  <h2 class="heading">Early Years<br/>Teacher Status</h2>
   <p class="text">This is to certify that: <strong><%= teacher.name %></strong></p>
   <p class="text">Teacher Reference Number: <strong><%= teacher.trn %></strong></p>
   <p>&#160;</p>
diff --git a/app/views/qualifications/certificates/_induction.html.erb b/app/views/qualifications/certificates/_induction.html.erb
index 65eb7675..c59eac0b 100644
--- a/app/views/qualifications/certificates/_induction.html.erb
+++ b/app/views/qualifications/certificates/_induction.html.erb
@@ -11,9 +11,9 @@
     institution. The holder of this certificate is a qualified teacher and has obtained the required<br/>
     qualifications and completed the necessary training for the profession of school teacher in England.</p>
   <p>&#160;</p>
-  <p class="text">Date Induction Completed:&#160;<strong><%= qualification.awarded_at.to_fs(:long_uk) %></strong></p>
+  <p class="text">Date Induction Completed:&#160;<strong><%= qualification.details.periods.first.end_date.to_date.to_fs(:long_uk) %></strong></p>
   <p>&#160;</p>
   <p class="text">Congratulations and best wishes for your future career.</p>
   <p>&#160;</p>
-  <p class="text">Any potential employer can independently confirm your teacher status online at:<br/>https://teacherservices.education.gov.uk</p>
+  <p class="text">Any potential employer can independently confirm your teacher status online at:<br/>https://www.gov.uk/guidance/check-a-teachers-record</p>
 </div>
\ No newline at end of file
diff --git a/app/views/qualifications/certificates/_npq.html.erb b/app/views/qualifications/certificates/_npq.html.erb
index a098eb41..2f0e1d36 100644
--- a/app/views/qualifications/certificates/_npq.html.erb
+++ b/app/views/qualifications/certificates/_npq.html.erb
@@ -2,7 +2,7 @@
 
 <div class="content-npq">
   <p class="text-npq">This is to certify that:</p>
-  <h2 class="heading-npq"> <%= teacher.name %></h2>
+  <h2 class="heading-npq name-heading-npq"> <%= teacher.name %></h2>
   <p class="text-npq">has been awarded the</p>
   <h2 class="heading-npq">
     <strong>
diff --git a/app/views/qualifications/certificates/_qts.html.erb b/app/views/qualifications/certificates/_qts.html.erb
index fee2966e..4217f2b8 100644
--- a/app/views/qualifications/certificates/_qts.html.erb
+++ b/app/views/qualifications/certificates/_qts.html.erb
@@ -19,5 +19,5 @@
   <p>&#160;</p>
   <p class="text">Congratulations and best wishes for your future career</p>
   <p>&#160;</p>
-  <p class="text">Any potential employer can independently confirm your teacher status online at:<br/>https://teacherservices.education.gov.uk</p>
+  <p class="text">Any potential employer can independently confirm your teacher status online at:<br/>https://www.gov.uk/guidance/check-a-teachers-record</p>
 </div>
diff --git a/config/database.yml b/config/database.yml
index 508fa0d6..8448bb56 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,7 +1,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  url: <%= ENV.fetch('DATABASE_URL', 'postgres://postgres@localhost:5432') %>
+  url: <%= ENV.fetch('DATABASE_URL', 'postgres://postgres@localhost:5434') %>
 
 development:
   <<: *default
diff --git a/config/initializers/grover.rb b/config/initializers/grover.rb
index d9777f62..96f12806 100644
--- a/config/initializers/grover.rb
+++ b/config/initializers/grover.rb
@@ -6,7 +6,8 @@
       bottom: "0",
       left: "0",
       right: "0"
-    }
+    },
+  launch_args: ["--no-sandbox", "--disable-setuid-sandbox"],
   }
   config.use_jpeg_middleware = false
   config.use_png_middleware = false
diff --git a/public/eyts-certificate.jpg b/public/eyts-certificate.jpg
index 33c4ccc6..af611ecb 100644
Binary files a/public/eyts-certificate.jpg and b/public/eyts-certificate.jpg differ
diff --git a/public/induction-certificate.jpg b/public/induction-certificate.jpg
index 0411a252..265946d2 100644
Binary files a/public/induction-certificate.jpg and b/public/induction-certificate.jpg differ
diff --git a/public/npq-certificate.jpg b/public/npq-certificate.jpg
index 6cd64617..48146c81 100644
Binary files a/public/npq-certificate.jpg and b/public/npq-certificate.jpg differ
diff --git a/public/qts-certificate.jpg b/public/qts-certificate.jpg
index 458038f6..3e30a82b 100644
Binary files a/public/qts-certificate.jpg and b/public/qts-certificate.jpg differ
diff --git a/spec/components/induction_summary_component_spec.rb b/spec/components/induction_summary_component_spec.rb
index daef2c2e..0f62eb13 100644
--- a/spec/components/induction_summary_component_spec.rb
+++ b/spec/components/induction_summary_component_spec.rb
@@ -57,17 +57,5 @@
       expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("Completed")
       expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("End date")
     end
-
-    context "when the certificate URL is missing" do
-      let(:induction) do
-        fake_quals_data.fetch("induction").tap do |data|
-          data.delete(:certificate_url)
-        end
-      end
-
-      it "does not render the certificate row when certificate URL is missing" do
-        expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("Certificate")
-      end
-    end
   end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index f6f4a6ed..e7e7e32f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -17,7 +17,7 @@
 WebMock.disable_net_connect!(allow_localhost: true)
 
 Capybara.register_driver(:cuprite) do |app|
-  Capybara::Cuprite::Driver.new(app, timeout: 30, process_timeout: 40, window_size: [1200, 800])
+  Capybara::Cuprite::Driver.new(app, timeout: 200, process_timeout: 120, window_size: [1200, 800])
 end
 Capybara.default_driver = :cuprite
 Capybara.javascript_driver = :cuprite