diff --git a/config/settings/base.py b/config/settings/base.py
index b92cc0eb..3268bc0f 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -210,7 +210,9 @@
 FORM_RENDERER = "django.forms.renderers.TemplatesSetting"
 
 # http://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs
-CRISPY_TEMPLATE_PACK = "bootstrap4"
+# https://github.com/django-crispy-forms/crispy-bootstrap5
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
+CRISPY_TEMPLATE_PACK = "bootstrap5"
 
 # FIXTURES
 # ------------------------------------------------------------------------------
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index 852c8669..eaae1efd 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile dev-requirements.in
+#    pip-compile requirements/dev-requirements.in
 #
 alabaster==0.7.13
     # via sphinx
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 5e72272c..71fd49cc 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -24,6 +24,8 @@ django-redis  # https://github.com/jazzband/django-redis
 django-login-required-middleware # https://github.com/CleitonDeLima/django-login-required-middleware
 django-dbbackup # https://github.com/jazzband/django-dbbackup
 django-extensions  # https://github.com/django-extensions/django-extensions
+# Bootstrap5 templates for crispy-forms
+crispy-bootstrap5  # https://github.com/django-crispy-forms/crispy-bootstrap5
 
 git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.20.1
 
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index ae238dea..7e034d5e 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile requirements/requirements.in
 #
 argon2-cffi==21.3.0
     # via -r requirements/requirements.in
@@ -27,7 +27,9 @@ charset-normalizer==2.0.12
 click==8.1.7
     # via pip-tools
 crispy-bootstrap5==0.6
-    # via django-anvil-consortium-manager
+    # via
+    #   -r requirements/requirements.in
+    #   django-anvil-consortium-manager
 cryptography==41.0.4
     # via pyjwt
 defusedxml==0.7.1
@@ -38,6 +40,7 @@ django==3.2.23
     #   crispy-bootstrap5
     #   django-allauth
     #   django-anvil-consortium-manager
+    #   django-crispy-forms
     #   django-dbbackup
     #   django-extensions
     #   django-filter
@@ -50,7 +53,7 @@ django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-con
     # via -r requirements/requirements.in
 django-autocomplete-light==3.9.4
     # via django-anvil-consortium-manager
-django-crispy-forms==1.14.0
+django-crispy-forms==2.0
     # via
     #   -r requirements/requirements.in
     #   crispy-bootstrap5
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
index f6aa6a32..cd3a312b 100644
--- a/requirements/test-requirements.txt
+++ b/requirements/test-requirements.txt
@@ -2,78 +2,78 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile test-requirements.in
+#    pip-compile requirements/test-requirements.in
 #
 certifi==2021.10.8
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   requests
 charset-normalizer==2.0.12
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   requests
 coverage==7.3.2
     # via
-    #   -r test-requirements.in
+    #   -r requirements/test-requirements.in
     #   django-coverage-plugin
 django-coverage-plugin==3.1.0
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 django-test-migrations==1.3.0
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 exceptiongroup==1.1.3
     # via pytest
 factory-boy==3.3.0
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 faker==20.0.3
     # via factory-boy
 idna==3.3
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   requests
 iniconfig==2.0.0
     # via pytest
 packaging==21.3
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   pytest
     #   pytest-sugar
 pluggy==1.3.0
     # via pytest
 pyparsing==3.0.8
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   packaging
 pytest==7.4.3
     # via
-    #   -r test-requirements.in
+    #   -r requirements/test-requirements.in
     #   pytest-django
     #   pytest-sugar
 pytest-django==4.7.0
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 pytest-sugar==0.9.7
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 python-dateutil==2.8.2
     # via faker
 pyyaml==6.0.1
     # via responses
 requests==2.31.0
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   responses
 responses==0.24.1
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 six==1.16.0
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   python-dateutil
 termcolor==2.3.0
     # via pytest-sugar
 tomli==2.0.1
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   pytest
 types-requests==2.31.0.6
-    # via -r test-requirements.in
+    # via -r requirements/test-requirements.in
 types-urllib3==1.26.25.14
     # via types-requests
 typing-extensions==4.8.0
@@ -82,6 +82,6 @@ typing-extensions==4.8.0
     #   faker
 urllib3==1.26.9
     # via
-    #   -c requirements.txt
+    #   -c requirements/requirements.txt
     #   requests
     #   responses