diff --git a/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py b/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py
new file mode 100644
index 0000000000..7b067f8c34
--- /dev/null
+++ b/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.24 on 2021-09-10 09:40
+
+from django.db import migrations
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('discussions', '0004_historicalprogramdiscussionsconfiguration_programdiscussionsconfiguration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='discussionsconfiguration',
+            name='plugin_configuration',
+            field=jsonfield.fields.JSONField(blank=True, default={}, help_text='The plugin configuration data for this context/provider.'),
+        ),
+        migrations.AlterField(
+            model_name='historicaldiscussionsconfiguration',
+            name='plugin_configuration',
+            field=jsonfield.fields.JSONField(blank=True, default={}, help_text='The plugin configuration data for this context/provider.'),
+        ),
+    ]
diff --git a/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py b/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py
new file mode 100644
index 0000000000..efcc616d8f
--- /dev/null
+++ b/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.24 on 2021-09-10 09:40
+
+import collections
+from django.db import migrations
+import jsonfield.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('site_configuration', '0007_remove_values_field'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='site_values',
+            field=jsonfield.fields.JSONField(blank=True, default=dict, load_kwargs={'object_pairs_hook': collections.OrderedDict}),
+        ),
+        migrations.AlterField(
+            model_name='siteconfigurationhistory',
+            name='site_values',
+            field=jsonfield.fields.JSONField(blank=True, load_kwargs={'object_pairs_hook': collections.OrderedDict}),
+        ),
+    ]
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index b74f03f931..f0b254d570 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -30,7 +30,7 @@ django-storages<1.9
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==3.28.24
+edx-enterprise==3.30.0
 
 # Newer versions need a more recent version of python-dateutil
 freezegun==0.3.12
@@ -85,9 +85,6 @@ click<8.0.0
 
 # constraints present due to Python35 support. Need to be tested and removed independently.
 
-# jsonfield2 will be replaced with jsonfield in https://openedx.atlassian.net/browse/BOM-1917.
-jsonfield2<3.1.0        # jsonfield2 3.1.0 drops support for python 3.5
-
 # Release 2.1.0 pulls declares `pact-python` as a base requirement, even though it should be
 # a testing requirement. Installing it would cause a bunch of new tool packages to become base
 # requirements of edx-platform. Pinning temporarily until this is resolved in edx-val.
diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 9ad2ca4c39..e21539410e 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -106,7 +106,7 @@ help-tokens
 html5lib                            # HTML parser, used for capa problems
 icalendar                           # .ics generator, used by calendar_sync
 ipaddress                           # Ip network support for Embargo feature
-jsonfield2                          # Django model field for validated JSON; used in several apps
+jsonfield                           # Django model field for validated JSON; used in several apps
 laboratory                          # Library for testing that code refactors/infrastructure changes produce identical results
 lxml                                # XML parser
 lti-consumer-xblock