diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index 1b422391b8d5..677b3cb69ba6 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -2087,7 +2087,7 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
 # .. toggle_target_removal_date: 2026-04-10
-USE_EXTRACTED_DISCUSSION_BLOCK = False
+USE_EXTRACTED_DISCUSSION_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_PROBLEM_BLOCK
 # .. toggle_default: False
@@ -2097,7 +2097,7 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_warning: Not production-ready until relevant subtask https://github.com/openedx/edx-platform/issues/34827 is done.
 # .. toggle_creation_date: 2024-11-10
 # .. toggle_target_removal_date: 2026-04-10
-USE_EXTRACTED_PROBLEM_BLOCK = False
+USE_EXTRACTED_PROBLEM_BLOCK = True
 
 # .. toggle_name: USE_EXTRACTED_VIDEO_BLOCK
 # .. toggle_default: True
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1f9df206f0ae..d7d31109c348 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1299,7 +1299,7 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.3
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-mixins#egg=xblocks-contrib
     # via -r requirements/edx/bundled.in
 xmlsec==1.3.14
     # via
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index f6f53b6041bb..cb4a274997ad 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -2326,7 +2326,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.3
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-mixins#egg=xblocks-contrib
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 99606f68983e..259d7f3b33f7 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -1637,7 +1637,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.3
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-mixins#egg=xblocks-contrib
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 5ce8448d174b..d78826d199a5 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1730,7 +1730,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.3
+git+https://github.com/openedx/xblocks-contrib.git@remove-legacy-mixins#egg=xblocks-contrib
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via