diff --git a/config_expiration-mailer.patch b/config_expiration-mailer.patch
index 3b48747..1d05693 100644
--- a/config_expiration-mailer.patch
+++ b/config_expiration-mailer.patch
@@ -4,7 +4,7 @@ index 444beae43..e9bd228ef 100644
 +++ b/test/config/expiration-mailer.json
 @@ -12,6 +12,11 @@
      "nagCheckInterval": "24h",
-     "emailTemplate": "labca/example-expiration-template",
+     "emailTemplate": "test/example-expiration-template",
      "debugAddr": ":8008",
 +    "dnsTries": 3,
 +    "dnsResolvers": [
@@ -12,8 +12,8 @@ index 444beae43..e9bd228ef 100644
 +      "127.0.0.1:8054"
 +    ],
      "tls": {
-       "caCertFile": "labca/grpc-creds/minica.pem",
-       "certFile": "labca/grpc-creds/expiration-mailer.boulder/cert.pem",
+       "caCertFile": "test/grpc-creds/minica.pem",
+       "certFile": "test/grpc-creds/expiration-mailer.boulder/cert.pem",
 @@ -28,5 +33,10 @@
    "syslog": {
      "stdoutlevel": 6,
diff --git a/docker-compose.patch b/docker-compose.patch
index 0b39be9..c60c8ce 100644
--- a/docker-compose.patch
+++ b/docker-compose.patch
@@ -1,5 +1,5 @@
 diff --git a/docker-compose.yml b/docker-compose.yml
-index f3279eeab..76573dabe 100644
+index e34704a4d..46365bdcf 100644
 --- a/docker-compose.yml
 +++ b/docker-compose.yml
 @@ -6,7 +6,7 @@ services:
@@ -34,7 +34,7 @@ index f3279eeab..76573dabe 100644
 +        restart: always
      bhsm:
          # To minimize fetching this should be the same version used above
-         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-01-07
+         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-04-08
 @@ -68,8 +75,16 @@ services:
            bluenet:
              aliases:
@@ -64,7 +64,7 @@ index f3279eeab..76573dabe 100644
 +            max-file: "5"
 +        restart: always
 +    labca:
-         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-01-07
+         image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.13.2}:2020-04-08
 -        environment:
 -            GO111MODULE: "on"
 -            GOFLAGS: "-mod=vendor"
diff --git a/expiration-mailer_main.patch b/expiration-mailer_main.patch
index 775eb34..015f6c7 100644
--- a/expiration-mailer_main.patch
+++ b/expiration-mailer_main.patch
@@ -1,5 +1,5 @@
 diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
-index 49ce1a265..9d47457b9 100644
+index 6d31a7033..c2ad80495 100644
 --- a/cmd/expiration-mailer/main.go
 +++ b/cmd/expiration-mailer/main.go
 @@ -19,6 +19,7 @@ import (
@@ -19,7 +19,7 @@ index 49ce1a265..9d47457b9 100644
  )
  
  type regStore interface {
-@@ -384,6 +385,9 @@ type config struct {
+@@ -383,6 +384,9 @@ type config struct {
  		TLS       cmd.TLSConfig
  		SAService *cmd.GRPCClientConfig
  
@@ -29,7 +29,7 @@ index 49ce1a265..9d47457b9 100644
  		// Path to a file containing a list of trusted root certificates for use
  		// during the SMTP connection (as opposed to the gRPC connections).
  		SMTPTrustedRootFile string
-@@ -392,6 +396,12 @@ type config struct {
+@@ -391,6 +395,12 @@ type config struct {
  	}
  
  	Syslog cmd.SyslogConfig
@@ -42,7 +42,7 @@ index 49ce1a265..9d47457b9 100644
  }
  
  func initStats(stats prometheus.Registerer) mailerStats {
-@@ -495,6 +505,30 @@ func main() {
+@@ -494,6 +504,30 @@ func main() {
  	cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to SA")
  	sac := bgrpc.NewStorageAuthorityClient(sapb.NewStorageAuthorityClient(conn))
  
@@ -73,7 +73,7 @@ index 49ce1a265..9d47457b9 100644
  	var smtpRoots *x509.CertPool
  	if c.Mailer.SMTPTrustedRootFile != "" {
  		pem, err := ioutil.ReadFile(c.Mailer.SMTPTrustedRootFile)
-@@ -530,6 +564,7 @@ func main() {
+@@ -529,6 +563,7 @@ func main() {
  		c.Mailer.Username,
  		smtpPassword,
  		smtpRoots,
diff --git a/install b/install
index 7daedb9..93c0a1f 100755
--- a/install
+++ b/install
@@ -24,7 +24,7 @@ dockerComposeVersion="1.22.0"
 
 labcaUrl="https://github.com/hakwerk/labca/"
 boulderUrl="https://github.com/letsencrypt/boulder/"
-boulderTag="release-2020-02-17"
+boulderTag="release-2020-04-13"
 
 #
 # Color configuration
diff --git a/notify-mailer_main.patch b/notify-mailer_main.patch
index a77749a..daff61d 100644
--- a/notify-mailer_main.patch
+++ b/notify-mailer_main.patch
@@ -1,8 +1,8 @@
 diff --git a/cmd/notify-mailer/main.go b/cmd/notify-mailer/main.go
-index f61f21086..87504c55b 100644
+index bb8945236..e278cdc16 100644
 --- a/cmd/notify-mailer/main.go
 +++ b/cmd/notify-mailer/main.go
-@@ -472,6 +472,7 @@ func main() {
+@@ -468,6 +468,7 @@ func main() {
  			cfg.NotifyMailer.Username,
  			smtpPassword,
  			nil,