diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3a386fe1..556e6c79 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,25 +4,24 @@
 # -------------------------------------------------
 # Fix for travis CI tests failing
 # Ref: https://github.com/FactoryBoy/factory_boy/issues/334#issuecomment-267696136
-fake-factory==0.7.4
-factory-boy==2.7.0
+# fake-factory==0.7.4 # TODO: remove if possible or find a replacement
+Faker==6.5.0
+factory-boy==3.2.0
 
-flake8==2.4.1
-pytest-django==2.9.1
-pytest-cov==2.2.1
-pytest-flakes==1.0.0
-
-coverage==4.1
+flake8==3.8.4
+pytest-django==4.1.0
+pytest-cov==2.11.1
+pytest-flakes==4.0.3
 
+coverage==5.5
 # Documentation
 # --------------------------------------------------
-mkdocs==0.15.3
-bumpversion==0.5.3
+mkdocs==1.1.2
+bumpversion==0.6.0
 
 # Debugging
 # --------------------------------------------------
-ipdb==0.9.0
+ipdb==0.13.5
 
 # Patch for html5lib - issue #520
 html5lib<0.99999999
-bleach<2.0.0
diff --git a/requirements.txt b/requirements.txt
index aee6dfb1..0a92bad7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,55 +1,55 @@
-Django==1.9
-celery==3.1.20
-djangorestframework==3.4
-django-filter==1.0.1
+Django==3.1.7
+celery==5.0.5
+djangorestframework==3.12.2
+django-filter==2.4.0
+wheel==0.36.2 # Needed by django-sampledatahelper
 
 # Persistent Store
 # -------------------------------------------------
-psycopg2==2.7.3
-redis==2.10.0
-dj-database-url==0.4.1
+psycopg2==2.8.6
+redis==3.5.3
+dj-database-url==0.5.0
 
 # Extensions
 # -------------------------------------------------
-django-extensions==1.7.5
-six==1.10
-django-sampledatahelper==0.4
-unicode-slugify==0.1.3
-XlsxWriter==0.7.3
-arrow==0.8.0
-hashids==1.1.0
+django-extensions==3.1.1
+django-sampledatahelper==0.5
+unicode-slugify==0.1.3 # TODO: remove if possible or find a replacement
+XlsxWriter==1.3.7
+arrow==1.0.2
+hashids==1.3.1
 
 # Django Model Helpers
 # -------------------------------------------------
 django-uuid-upload-path==1.0.0
-Pillow==2.9.0
+Pillow==8.1.2
 
 # Auth
 # -------------------------------------------------
-django-allauth==0.32.0
-oauthlib==1.1.2
-python-openid==2.2.5
-requests==2.7.0
-requests-oauthlib==0.5.0
-mock==2.0.0 # Django all auth needs
+django-allauth==0.44.0
+oauthlib==3.1.0
+python-openid2==3.2
+requests==2.25.1
+requests-oauthlib==1.3.0
+mock==4.0.3 # Django all auth needs
 
 # Admin
 # -------------------------------------------------
-django_simple_history==1.8.0
+django-simple-history==2.12.0 # TODO: remove if possible or find a replacement
 
 # Frontend Helpers
 # -------------------------------------------------
-django-bootstrap3==7.1.0
-django-bootstrap-breadcrumbs==0.8
-django-flat-theme==1.1.3
+django-bootstrap3==14.2.0
+django-bootstrap-breadcrumbs==0.9.2
+django-flat-theme==1.1.4
 
 # Markdown Editor
 # -------------------------------------------------
-django-markdown==0.8.4
-django-pagedown==0.1.
-mdx-linkify==0.6
-Markdown==2.6.6
-markdown2==2.3.1
+django-markdown2==0.3.1 # TODO: remove if possible or find a replacement
+django-pagedown==2.2.0
+mdx-linkify==2.1
+Markdown==3.3.4 # TODO: remove if possible or find a replacement
+markdown2==2.4.0 # TODO: remove if possible or find a replacement
 
 # Server
 # ------------------------------------------------
@@ -57,8 +57,8 @@ uwsgi==2.0.*
 
 # Device
 # ------------------------------------------------
-django-uuidfield==0.5.0
+django-uuidfield==0.5.0 # TODO: remove if possible or find a replacement
 
 # Ticket
-qrcode==5.1
-jsonfield==1.0.3
+qrcode==6.1
+jsonfield==3.1.0