diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f0fb84c..877de55 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v7.2.1
+------
+
+*2025-02-25* -- Update ScanAndFingerprintPackage pipeline to use the ``fingerprint_codebase`` step from the FingerprintCodebase pipeline.
+
 v7.2.0
 ------
 
diff --git a/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py b/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py
index 705e4c1..4292b93 100644
--- a/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py
+++ b/src/matchcode_toolkit/pipelines/scan_and_fingerprint_package.py
@@ -23,8 +23,10 @@
 from scanpipe.pipelines.scan_single_package import ScanSinglePackage
 from scanpipe.pipes import matchcode
 
+from matchcode_toolkit.pipelines.fingerprint_codebase import FingerprintCodebase
 
-class ScanAndFingerprintPackage(ScanSinglePackage):
+
+class ScanAndFingerprintPackage(FingerprintCodebase, ScanSinglePackage):
     """
     Scan a single package file or package archive with ScanCode-toolkit, then
     calculate the directory fingerprints of the codebase.
@@ -55,9 +57,3 @@ def steps(cls):
         "--classify",
         "--summary",
     ]
-
-    def fingerprint_codebase(self):
-        """
-        Compute directory fingerprints for matching purposes
-        """
-        matchcode.fingerprint_codebase_directories(self.project)