diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6fb919d..526bd65 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,11 +37,7 @@ stages:
     - script: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        # Ensure setuptools >= 69.3.0 so the sdist filename follows the
-        # PEP 625 normalized form (azure_functions_durable-*.tar.gz).
-        # Older setuptools emits the legacy hyphenated name, which ESRP
-        # rejects.
-        pip install "setuptools>=69.3.0" wheel
+        pip install "setuptools>=69.3.0" setuptools_scm wheel
         # Pin an older azure-functions (< 1.26.0) that predates the
         # centralized df_dumps / df_loads serializers so this job exercises
         # the legacy serialization fallback in df_serialization. The
diff --git a/eng/templates/build.yml b/eng/templates/build.yml
index 49ca57c..28aae81 100644
--- a/eng/templates/build.yml
+++ b/eng/templates/build.yml
@@ -12,15 +12,11 @@ jobs:
       steps:
         - task: UsePythonVersion@0
           inputs:
-            versionSpec: '3.10.x'
+            versionSpec: '3.10'
         - script: |
             python -m pip install --upgrade pip
             pip install -r requirements.txt
-            # Ensure setuptools >= 69.3.0 so the sdist filename follows the
-            # PEP 625 normalized form (azure_functions_durable-*.tar.gz).
-            # Older setuptools emits the legacy hyphenated name, which ESRP
-            # rejects.
-            pip install "setuptools>=69.3.0" wheel
+            pip install "setuptools>=69.3.0" setuptools_scm wheel
             # Pin an older azure-functions (< 1.26.0) that predates the
             # centralized df_dumps / df_loads serializers so this job
             # exercises the legacy serialization fallback in df_serialization.
diff --git a/tests/orchestrator/test_sequential_orchestrator.py b/tests/orchestrator/test_sequential_orchestrator.py
index cb20dc2..56c533d 100644
--- a/tests/orchestrator/test_sequential_orchestrator.py
+++ b/tests/orchestrator/test_sequential_orchestrator.py
@@ -1,7 +1,7 @@
 from azure.durable_functions.models.actions.WhenAnyAction import WhenAnyAction
 from azure.durable_functions.models.actions.WhenAllAction import WhenAllAction
 from azure.durable_functions.models.ReplaySchema import ReplaySchema
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from .orchestrator_test_utils \
     import assert_orchestration_state_equals, get_orchestration_state_result, assert_valid_schema
 from tests.test_utils.ContextBuilder import ContextBuilder
@@ -703,7 +703,7 @@ def test_utc_time_is_never_none():
 def test_utc_time_updates_correctly():
     """Tests that current_utc_datetime updates correctly"""
 
-    now = datetime.utcnow()
+    now = datetime.now(timezone.utc).replace(tzinfo=None)
     # the first orchestrator-started event starts 1 second after `now`
     context_builder = ContextBuilder('test_simple_function', starting_time=now)
     add_hello_completed_events(context_builder, 0, "\"Hello Tokyo!\"")