diff --git a/bsyncviewer/migrations/0015_auto_20251009_1840.py b/bsyncviewer/migrations/0015_auto_20251009_1840.py
new file mode 100644
index 0000000..4e584cd
--- /dev/null
+++ b/bsyncviewer/migrations/0015_auto_20251009_1840.py
@@ -0,0 +1,82 @@
+# Generated by Django 3.2.25 on 2025-10-09 18:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bsyncviewer", "0014_attribute_description"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="attribute",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="attributeenumerationclass",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="bedesenumeration",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="bedesenumerationmapping",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="bedesmapping",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="bedesterm",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="enumeration",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="enumerationclass",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="schema",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usecase",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+    ]
diff --git a/bsyncviewer/settings/dev.py b/bsyncviewer/settings/dev.py
index 035ec5d..5a69045 100644
--- a/bsyncviewer/settings/dev.py
+++ b/bsyncviewer/settings/dev.py
@@ -136,6 +136,9 @@
 
 DEFAULT_SCHEMA_VERSION = "2.7.0"
 
+# Default primary key field type for Django 3.2+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 with open(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), "../app_version.txt")
 ) as v_file:
diff --git a/bsyncviewer/settings/docker.py b/bsyncviewer/settings/docker.py
index cbd640f..e1dfb29 100644
--- a/bsyncviewer/settings/docker.py
+++ b/bsyncviewer/settings/docker.py
@@ -151,6 +151,9 @@
 
 DEFAULT_SCHEMA_VERSION = "2.7.0"
 
+# Default primary key field type for Django 3.2+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 with open(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), "../app_version.txt")
 ) as v_file:
diff --git a/bsyncviewer/settings/gh_actions.py b/bsyncviewer/settings/gh_actions.py
index 696ed82..cf249b7 100644
--- a/bsyncviewer/settings/gh_actions.py
+++ b/bsyncviewer/settings/gh_actions.py
@@ -42,6 +42,9 @@
 
 DEFAULT_SCHEMA_VERSION = "2.7.0"
 
+# Default primary key field type for Django 3.2+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 with open(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), "../app_version.txt")
 ) as v_file:
diff --git a/bsyncviewer/templates/about.html b/bsyncviewer/templates/about.html
index 8a9519f..48ab84f 100644
--- a/bsyncviewer/templates/about.html
+++ b/bsyncviewer/templates/about.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}About{% endblock title %}
 
diff --git a/bsyncviewer/templates/adopters.html b/bsyncviewer/templates/adopters.html
index d496469..0a6bcba 100644
--- a/bsyncviewer/templates/adopters.html
+++ b/bsyncviewer/templates/adopters.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Adopters{% endblock title %}
 
diff --git a/bsyncviewer/templates/auditors.html b/bsyncviewer/templates/auditors.html
index d7d8acd..bd2bba7 100644
--- a/bsyncviewer/templates/auditors.html
+++ b/bsyncviewer/templates/auditors.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} For Auditors{% endblock title %}
 
diff --git a/bsyncviewer/templates/base.html b/bsyncviewer/templates/base.html
index 0117513..df8fdef 100644
--- a/bsyncviewer/templates/base.html
+++ b/bsyncviewer/templates/base.html
@@ -1,7 +1,7 @@
 {% load bootstrap4 %}
 
 {% load navtags %}
-{% load staticfiles %}
+{% load static %}
 
 {% block bootstrap_extra_head %}
   {# Load CSS and JavaScript #}
diff --git a/bsyncviewer/templates/base2.html b/bsyncviewer/templates/base2.html
index 43954f1..f53a6fc 100644
--- a/bsyncviewer/templates/base2.html
+++ b/bsyncviewer/templates/base2.html
@@ -1,6 +1,6 @@
 {% load bootstrap4 %}
 
-{% load staticfiles %}
+{% load static %}
 
 <!DOCTYPE html>
 <!--[if lt IE 7]>
diff --git a/bsyncviewer/templates/bsyncviewer/usecase_confirm_delete.html b/bsyncviewer/templates/bsyncviewer/usecase_confirm_delete.html
index 937d134..bdf83c9 100644
--- a/bsyncviewer/templates/bsyncviewer/usecase_confirm_delete.html
+++ b/bsyncviewer/templates/bsyncviewer/usecase_confirm_delete.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 {% load bootstrap4 %}
-{% load staticfiles %}
+{% load static %}
 
 
 {% block title %}Delete Use Case{% endblock %}
diff --git a/bsyncviewer/templates/bsyncviewer/usecase_form.html b/bsyncviewer/templates/bsyncviewer/usecase_form.html
index 53832f9..45cf320 100644
--- a/bsyncviewer/templates/bsyncviewer/usecase_form.html
+++ b/bsyncviewer/templates/bsyncviewer/usecase_form.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 {% load bootstrap4 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Add Use Case{% endblock %}
 
diff --git a/bsyncviewer/templates/case_study.html b/bsyncviewer/templates/case_study.html
index 922172b..a0861f9 100644
--- a/bsyncviewer/templates/case_study.html
+++ b/bsyncviewer/templates/case_study.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Case Study{% endblock title %}
 
diff --git a/bsyncviewer/templates/collaborators.html b/bsyncviewer/templates/collaborators.html
index 320441c..bf95d41 100644
--- a/bsyncviewer/templates/collaborators.html
+++ b/bsyncviewer/templates/collaborators.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Collaborators{% endblock title %}
 
diff --git a/bsyncviewer/templates/contact.html b/bsyncviewer/templates/contact.html
index 674674f..938afe8 100644
--- a/bsyncviewer/templates/contact.html
+++ b/bsyncviewer/templates/contact.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Contact{% endblock title %}
 
diff --git a/bsyncviewer/templates/dictionary.html b/bsyncviewer/templates/dictionary.html
index 33b27c6..7aee037 100644
--- a/bsyncviewer/templates/dictionary.html
+++ b/bsyncviewer/templates/dictionary.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block extra_head %}
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.5/themes/default/style.min.css"/>
diff --git a/bsyncviewer/templates/enumerations.html b/bsyncviewer/templates/enumerations.html
index 35a60b0..f12e707 100644
--- a/bsyncviewer/templates/enumerations.html
+++ b/bsyncviewer/templates/enumerations.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}
   {% if enumerations_type == 'data_dictionary' %}
diff --git a/bsyncviewer/templates/faq.html b/bsyncviewer/templates/faq.html
index d361381..97342ba 100644
--- a/bsyncviewer/templates/faq.html
+++ b/bsyncviewer/templates/faq.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}FAQ{% endblock title %}
 
diff --git a/bsyncviewer/templates/implementers.html b/bsyncviewer/templates/implementers.html
index 4565343..fc5da85 100644
--- a/bsyncviewer/templates/implementers.html
+++ b/bsyncviewer/templates/implementers.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} For Implementers{% endblock title %}
 
diff --git a/bsyncviewer/templates/index.html b/bsyncviewer/templates/index.html
index dd508fd..27a7fd4 100644
--- a/bsyncviewer/templates/index.html
+++ b/bsyncviewer/templates/index.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 
 {% block nav %}
diff --git a/bsyncviewer/templates/mlod.html b/bsyncviewer/templates/mlod.html
index 20369fe..edc29db 100644
--- a/bsyncviewer/templates/mlod.html
+++ b/bsyncviewer/templates/mlod.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Modeling Level of Detail{% endblock title %}
 
diff --git a/bsyncviewer/templates/onboarding.html b/bsyncviewer/templates/onboarding.html
index 62faf21..3e181e0 100644
--- a/bsyncviewer/templates/onboarding.html
+++ b/bsyncviewer/templates/onboarding.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Onboarding{% endblock title %}
 
diff --git a/bsyncviewer/templates/practitioners.html b/bsyncviewer/templates/practitioners.html
index 468c8a9..c29011c 100644
--- a/bsyncviewer/templates/practitioners.html
+++ b/bsyncviewer/templates/practitioners.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} For Building and City Practitioners{% endblock title %}
 
diff --git a/bsyncviewer/templates/references.html b/bsyncviewer/templates/references.html
index 773c7a3..ff62149 100644
--- a/bsyncviewer/templates/references.html
+++ b/bsyncviewer/templates/references.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}References{% endblock title %}
 
diff --git a/bsyncviewer/templates/releases.html b/bsyncviewer/templates/releases.html
index cceda02..4bd60a8 100644
--- a/bsyncviewer/templates/releases.html
+++ b/bsyncviewer/templates/releases.html
@@ -1,7 +1,7 @@
 {% extends 'base2.html' %}
 
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Releases{% endblock %}
 
diff --git a/bsyncviewer/templates/technical_resources.html b/bsyncviewer/templates/technical_resources.html
index 22d834f..7c17a46 100644
--- a/bsyncviewer/templates/technical_resources.html
+++ b/bsyncviewer/templates/technical_resources.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Technical Resources{% endblock title %}
 
diff --git a/bsyncviewer/templates/tools.html b/bsyncviewer/templates/tools.html
index ae3ac2d..c55d3d4 100644
--- a/bsyncviewer/templates/tools.html
+++ b/bsyncviewer/templates/tools.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Tools{% endblock %}
 
diff --git a/bsyncviewer/templates/use_cases.html b/bsyncviewer/templates/use_cases.html
index 3fe2153..9e5ac5f 100644
--- a/bsyncviewer/templates/use_cases.html
+++ b/bsyncviewer/templates/use_cases.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Use Cases{% endblock title %}
 
diff --git a/bsyncviewer/templates/validator.html b/bsyncviewer/templates/validator.html
index 61766a6..d6877b3 100644
--- a/bsyncviewer/templates/validator.html
+++ b/bsyncviewer/templates/validator.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 {% load bootstrap4 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Use Case Validator{% endblock title %}
 
diff --git a/bsyncviewer/templates/validator_results.html b/bsyncviewer/templates/validator_results.html
index aa95661..b5e3a22 100644
--- a/bsyncviewer/templates/validator_results.html
+++ b/bsyncviewer/templates/validator_results.html
@@ -1,6 +1,6 @@
 {% extends 'base2.html' %}
 {% load bootstrap4 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Validation Results{% endblock %}
 
diff --git a/requirements.txt b/requirements.txt
index 530b1dc..121dbc8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,11 @@
-Django==2.2.28
-django-bootstrap4==2.3.1
-djangorestframework==3.11.2
-djangorestframework-xml==1.0.1
+Django==3.2.25
+django-bootstrap4==3.0.1
+djangorestframework==3.12.4
+djangorestframework-xml==2.0.0
 
-psycopg2-binary==2.9.10
+# Do not upgrade to 2.9.10, which has a build issue with
+# newer setup tools. BUT versions > 2.9.10 might work?
+psycopg2-binary==2.9.7
 
 semantic-version==2.10.0
 stopit==1.1.2
@@ -18,4 +20,4 @@ jellyfish==1.2.0
 testsuite==0.1.5
 
 # production deployment
-uWSGI==2.0.30
+uWSGI==2.0.30; sys_platform != "win32"