diff --git a/install b/install
index 34cc563..b6ffb70 100755
--- a/install
+++ b/install
@@ -520,54 +520,54 @@ config_boulder() {
     msg_info "$msg"
 
     cd "$boulderDir"
-    sudo -u labca -H patch -p1 < $cloneDir/docker-compose.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/docker-compose.patch &>>$installLog
     cp docker-compose.yml "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/cmd_shell.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/cmd_shell.patch &>>$installLog
     cp cmd/shell.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/core_interfaces.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/core_interfaces.patch &>>$installLog
     cp core/interfaces.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/policy_pa.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/policy_pa.patch &>>$installLog
     cp policy/pa.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/ra_ra.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/ra_ra.patch &>>$installLog
     cp ra/ra.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/reloader_reloader.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/reloader_reloader.patch &>>$installLog
     cp reloader/reloader.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/mail_mailer.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/mail_mailer.patch &>>$installLog
     cp mail/mailer.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/expiration-mailer_main.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/expiration-mailer_main.patch &>>$installLog
     cp cmd/expiration-mailer/main.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/notify-mailer_main.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/notify-mailer_main.patch &>>$installLog
     cp cmd/notify-mailer/main.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/contact-auditor_main.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/contact-auditor_main.patch &>>$installLog
     cp cmd/contact-auditor/main.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/bad-key-revoker_main.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/bad-key-revoker_main.patch &>>$installLog
     cp cmd/bad-key-revoker/main.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 < $cloneDir/log-validator_main.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/log-validator_main.patch &>>$installLog
     cp cmd/log-validator/main.go "$boulderLabCADir/.backup/"
 
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/entrypoint.sh" < $cloneDir/entrypoint.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/startservers.py" < $cloneDir/startservers.patch &>>$installLog
-    sudo -u labca -H patch -p1 < $cloneDir/startservers.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/entrypoint.sh" < $cloneDir/patches/entrypoint.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/startservers.py" < $cloneDir/patches/startservers.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/startservers.patch &>>$installLog
 
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ca-a.json" < $cloneDir/test_config_ca_a.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ca-b.json" < $cloneDir/test_config_ca_b.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ca-a.json" < $cloneDir/patches/test_config_ca_a.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ca-b.json" < $cloneDir/patches/test_config_ca_b.patch &>>$installLog
 
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/expiration-mailer.json" < $cloneDir/config_expiration-mailer.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/notify-mailer.json" < $cloneDir/config_notify-mailer.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/bad-key-revoker.json" < $cloneDir/config_bad-key-revoker.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ocsp-responder.json" < $cloneDir/config_ocsp-responder.patch &>>$installLog
-    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/publisher.json" < $cloneDir/config_publisher.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/expiration-mailer.json" < $cloneDir/patches/config_expiration-mailer.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/notify-mailer.json" < $cloneDir/patches/config_notify-mailer.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/bad-key-revoker.json" < $cloneDir/patches/config_bad-key-revoker.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/ocsp-responder.json" < $cloneDir/patches/config_ocsp-responder.patch &>>$installLog
+    sudo -u labca -H patch -p1 -o "$boulderLabCADir/config/publisher.json" < $cloneDir/patches/config_publisher.patch &>>$installLog
 
     sed -i -e "s|https://letsencrypt.org/docs/rate-limits/|http://$LABCA_FQDN/rate-limits|" errors/errors.go &>>$installLog
     cp errors/errors.go "$boulderLabCADir/.backup/"
@@ -578,7 +578,7 @@ config_boulder() {
     mkdir -p "cmd/mail-tester"
     cp $cloneDir/mail-tester.go cmd/mail-tester/main.go
 
-    sudo -u labca -H patch -p1 < $cloneDir/db_migrations.patch &>>$installLog
+    sudo -u labca -H patch -p1 < $cloneDir/patches/db_migrations.patch &>>$installLog
     cp sa/_db/migrations/20210223140000_CombinedSchema.sql "$boulderLabCADir/.backup/"
 
     mkdir -p $baseDir/backup
diff --git a/bad-key-revoker_main.patch b/patches/bad-key-revoker_main.patch
similarity index 100%
rename from bad-key-revoker_main.patch
rename to patches/bad-key-revoker_main.patch
diff --git a/cmd_shell.patch b/patches/cmd_shell.patch
similarity index 100%
rename from cmd_shell.patch
rename to patches/cmd_shell.patch
diff --git a/config_bad-key-revoker.patch b/patches/config_bad-key-revoker.patch
similarity index 100%
rename from config_bad-key-revoker.patch
rename to patches/config_bad-key-revoker.patch
diff --git a/config_expiration-mailer.patch b/patches/config_expiration-mailer.patch
similarity index 100%
rename from config_expiration-mailer.patch
rename to patches/config_expiration-mailer.patch
diff --git a/config_notify-mailer.patch b/patches/config_notify-mailer.patch
similarity index 100%
rename from config_notify-mailer.patch
rename to patches/config_notify-mailer.patch
diff --git a/config_ocsp-responder.patch b/patches/config_ocsp-responder.patch
similarity index 100%
rename from config_ocsp-responder.patch
rename to patches/config_ocsp-responder.patch
diff --git a/config_publisher.patch b/patches/config_publisher.patch
similarity index 100%
rename from config_publisher.patch
rename to patches/config_publisher.patch
diff --git a/contact-auditor_main.patch b/patches/contact-auditor_main.patch
similarity index 100%
rename from contact-auditor_main.patch
rename to patches/contact-auditor_main.patch
diff --git a/core_interfaces.patch b/patches/core_interfaces.patch
similarity index 100%
rename from core_interfaces.patch
rename to patches/core_interfaces.patch
diff --git a/db_migrations.patch b/patches/db_migrations.patch
similarity index 100%
rename from db_migrations.patch
rename to patches/db_migrations.patch
diff --git a/docker-compose.patch b/patches/docker-compose.patch
similarity index 100%
rename from docker-compose.patch
rename to patches/docker-compose.patch
diff --git a/entrypoint.patch b/patches/entrypoint.patch
similarity index 100%
rename from entrypoint.patch
rename to patches/entrypoint.patch
diff --git a/expiration-mailer_main.patch b/patches/expiration-mailer_main.patch
similarity index 100%
rename from expiration-mailer_main.patch
rename to patches/expiration-mailer_main.patch
diff --git a/log-validator_main.patch b/patches/log-validator_main.patch
similarity index 100%
rename from log-validator_main.patch
rename to patches/log-validator_main.patch
diff --git a/mail_mailer.patch b/patches/mail_mailer.patch
similarity index 100%
rename from mail_mailer.patch
rename to patches/mail_mailer.patch
diff --git a/notify-mailer_main.patch b/patches/notify-mailer_main.patch
similarity index 100%
rename from notify-mailer_main.patch
rename to patches/notify-mailer_main.patch
diff --git a/policy_pa.patch b/patches/policy_pa.patch
similarity index 100%
rename from policy_pa.patch
rename to patches/policy_pa.patch
diff --git a/ra_ra.patch b/patches/ra_ra.patch
similarity index 100%
rename from ra_ra.patch
rename to patches/ra_ra.patch
diff --git a/reloader_reloader.patch b/patches/reloader_reloader.patch
similarity index 100%
rename from reloader_reloader.patch
rename to patches/reloader_reloader.patch
diff --git a/startservers.patch b/patches/startservers.patch
similarity index 100%
rename from startservers.patch
rename to patches/startservers.patch
diff --git a/test_config_ca_a.patch b/patches/test_config_ca_a.patch
similarity index 100%
rename from test_config_ca_a.patch
rename to patches/test_config_ca_a.patch
diff --git a/test_config_ca_b.patch b/patches/test_config_ca_b.patch
similarity index 100%
rename from test_config_ca_b.patch
rename to patches/test_config_ca_b.patch