diff --git a/.github/workflows/ci_servicex.yaml b/.github/workflows/ci_servicex.yaml
index 94250b4c..82651564 100644
--- a/.github/workflows/ci_servicex.yaml
+++ b/.github/workflows/ci_servicex.yaml
@@ -70,11 +70,13 @@ jobs:
         if: ${{ matrix.app.test_required }}
         run: |
           PYTHONPATH=src poetry run python -m coverage run -m pytest -r sx
+          PYTHONPATH=src poetry run coverage xml
       - name: Report coverage with Codecov
         if: ${{ matrix.app.test_required }}
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.xml
 
   publish:
     needs: [build-matrix, test]
diff --git a/.github/workflows/deploy-config.json b/.github/workflows/deploy-config.json
index 99521d12..f811ed2e 100644
--- a/.github/workflows/deploy-config.json
+++ b/.github/workflows/deploy-config.json
@@ -17,7 +17,7 @@
   {
     "dir_name": "did_finder_rucio",
     "image_name": "servicex-did-finder",
-    "test_required": false
+    "test_required": true
   },
   {
     "dir_name": "did_finder_xrootd",
diff --git a/code_generator_TopCPToolkit/.coveragerc b/code_generator_TopCPToolkit/.coveragerc
new file mode 100644
index 00000000..cd1638db
--- /dev/null
+++ b/code_generator_TopCPToolkit/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = servicex/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/code_generator_funcadl_uproot/.coveragerc b/code_generator_funcadl_uproot/.coveragerc
new file mode 100644
index 00000000..a0e8bcd2
--- /dev/null
+++ b/code_generator_funcadl_uproot/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = uproot_code_generator/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/code_generator_funcadl_xAOD/.coveragerc b/code_generator_funcadl_xAOD/.coveragerc
index 38d7cfec..bf0eb243 100644
--- a/code_generator_funcadl_xAOD/.coveragerc
+++ b/code_generator_funcadl_xAOD/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = servicex
+source = xaod_code_generator/
 
 [report]
 exclude_lines =
diff --git a/code_generator_python/.coveragerc b/code_generator_python/.coveragerc
new file mode 100644
index 00000000..763d45bf
--- /dev/null
+++ b/code_generator_python/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = python_code_generator/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/code_generator_raw_uproot/.coveragerc b/code_generator_raw_uproot/.coveragerc
new file mode 100644
index 00000000..cd1638db
--- /dev/null
+++ b/code_generator_raw_uproot/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = servicex/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/did_finder_cernopendata/.coveragerc b/did_finder_cernopendata/.coveragerc
new file mode 100644
index 00000000..92e855c5
--- /dev/null
+++ b/did_finder_cernopendata/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = src/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/did_finder_rucio/.coveragerc b/did_finder_rucio/.coveragerc
index f7a1399c..92e855c5 100644
--- a/did_finder_rucio/.coveragerc
+++ b/did_finder_rucio/.coveragerc
@@ -1,4 +1,13 @@
 [run]
 branch = True
-source =
-    src/
+source = src/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/did_finder_xrootd/.coveragerc b/did_finder_xrootd/.coveragerc
new file mode 100644
index 00000000..92e855c5
--- /dev/null
+++ b/did_finder_xrootd/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = src/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/servicex_app/.coveragerc b/servicex_app/.coveragerc
new file mode 100644
index 00000000..793b0b1c
--- /dev/null
+++ b/servicex_app/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = servicex_app/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*
diff --git a/transformer_sidecar/.coveragerc b/transformer_sidecar/.coveragerc
new file mode 100644
index 00000000..92e855c5
--- /dev/null
+++ b/transformer_sidecar/.coveragerc
@@ -0,0 +1,13 @@
+[run]
+branch = True
+source = src/
+
+[report]
+exclude_lines =
+    if self.debug:
+    pragma: no cover
+    raise NotImplementedError
+    if __name__ == .__main__.:
+ignore_errors = True
+omit =
+    tests/*