diff --git a/CODEOWNERS b/CODEOWNERS
index f9350110..e5f28aee 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -10,4 +10,4 @@
 # For all file changes, github would automatically
 # include the following people in the PRs.
 
-* @vrdmr @gavin-aguiar @YunchuWang @pdthummar @hallvictoria
+* @vrdmr @gavin-aguiar @hallvictoria
diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
index ad332eb2..3a81dc31 100644
--- a/eng/ci/official-build.yml
+++ b/eng/ci/official-build.yml
@@ -32,6 +32,8 @@ variables:
   - template: /eng/templates/utils/official-variables.yml@self
   - name: codeql.excludePathPatterns
     value: deps/,build/
+  - name: codeql.language
+    value: python
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1es
@@ -58,14 +60,6 @@ extends:
         dependsOn: Build
         jobs:
           - template: /eng/templates/jobs/ci-unit-tests.yml@self
-      - stage: RunDockerConsumptionTests
-        dependsOn: Build
-        jobs:
-          - template: /eng/templates/official/jobs/ci-docker-consumption-tests.yml@self
-      - stage: RunDockerDedicatedTests
-        dependsOn: Build
-        jobs:
-          - template: /eng/templates/official/jobs/ci-docker-dedicated-tests.yml@self
       - stage: RunLinuxConsumptionTests
         dependsOn: Build
         jobs:
diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
index a9854e7f..0206389b 100644
--- a/eng/ci/public-build.yml
+++ b/eng/ci/public-build.yml
@@ -34,6 +34,8 @@ variables:
     value: true
   - name: codeql.runSourceLanguagesInSourceAnalysis
     value: true
+  - name: codeql.language
+    value: python
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
diff --git a/eng/templates/official/jobs/ci-e2e-tests.yml b/eng/templates/official/jobs/ci-e2e-tests.yml
index b3ff4c57..93a673fa 100644
--- a/eng/templates/official/jobs/ci-e2e-tests.yml
+++ b/eng/templates/official/jobs/ci-e2e-tests.yml
@@ -135,7 +135,7 @@ jobs:
         displayName: 'Display skipTest variable'
         condition: or(eq(variables.isSdkRelease, true), eq(variables['USETESTPYTHONSDK'], true))
       - bash: |
-             python -m pytest -q -n auto --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append tests/endtoend tests/extension_tests/deferred_bindings_tests tests/extension_tests/http_v2_tests
+             python -m pytest -q -n auto --dist loadfile --reruns 4 --cov=./azure_functions_worker --cov-report xml --cov-branch --cov-append --ignore tests/endtoend/test_eventhub_functions.py --ignore tests/endtoend/test_eventhub_batch_functions.py --ignore tests/endtoend/test_servicebus_functions.py tests/endtoend tests/extension_tests/deferred_bindings_tests tests/extension_tests/http_v2_tests
         env:
           AzureWebJobsStorage: $(STORAGE_CONNECTION)
           AzureWebJobsCosmosDBConnectionString: $(COSMOSDB_CONNECTION)
diff --git a/tests/unittests/test_http_functions.py b/tests/unittests/test_http_functions.py
index cfa46be5..5906506d 100644
--- a/tests/unittests/test_http_functions.py
+++ b/tests/unittests/test_http_functions.py
@@ -418,6 +418,7 @@ def check_log_print_to_console_stdout(self, host_out: typing.List[str]):
         # System logs stdout should exist in host_out
         self.assertIn('Secret42', host_out)
 
+    @testutils.retryable_test(3, 5)
     @skipIf(sys.version_info < (3, 9, 0),
             "Skip the tests for Python 3.8 and below")
     def test_print_to_console_stderr(self):
diff --git a/tests/unittests/test_http_functions_v2.py b/tests/unittests/test_http_functions_v2.py
index 6aebad6a..5185d3d1 100644
--- a/tests/unittests/test_http_functions_v2.py
+++ b/tests/unittests/test_http_functions_v2.py
@@ -204,6 +204,7 @@ def test_accept_json(self):
         self.assertEqual(r_json, {'a': 'abc', 'd': 42})
         self.assertEqual(r.headers['content-type'], 'application/json')
 
+    @testutils.retryable_test(3, 5)
     def test_unhandled_error(self):
         r = self.webhost.request('GET', 'unhandled_error')
         self.assertEqual(r.status_code, 500)