diff --git a/.changeset/nice-cows-shout.md b/.changeset/nice-cows-shout.md
index 59fda1c5d7..08a57ef1eb 100644
--- a/.changeset/nice-cows-shout.md
+++ b/.changeset/nice-cows-shout.md
@@ -8,12 +8,9 @@ This migrates the `coachmark` component to S2. Custom properties have been remap
 
 | Before                                     | After                                           |
 | ------------------------------------------ | ----------------------------------------------- |
-| --spectrum-sans-serif-font                 | --spectrum-title-sans-serif-font-family         |
-| --spectrum-heading-serif-font-style        | --spectrum-title-serif-font-style               |
 | --spectrum-heading-sans-serif-font-weight  | --spectrum-title-sans-serif-font-weight         |
 | --spectrum-coach-mark-title-size           | --spectrum-coach-mark-title-font-size           |
 | --spectrum-heading-line-height             | --spectrum-title-line-height                    |
 | --spectrum-coach-mark-body-size            | --spectrum-coach-mark-body-font-size            |
-| --spectrum-sans-serif-font                 | --spectrum-body-sans-serif-font-family          |
 | --spectrum-body-sans-serif-font-style      | --spectrum-body-serif-font-style                |
 | --spectrum-coach-mark-pagination-body-size | --spectrum-coach-mark-pagination-body-font-size |
diff --git a/components/coachmark/index.css b/components/coachmark/index.css
index ec293e6b2d..9eeb7c0e5f 100644
--- a/components/coachmark/index.css
+++ b/components/coachmark/index.css
@@ -29,7 +29,7 @@ governing permissions and limitations under the License.
 
 	/* font */
 	--spectrum-coachmark-title-color: var(--spectrum-heading-color);
-	--spectrum-coachmark-title-font-family: var(--spectrum-title-sans-serif-font-family);
+	--spectrum-coachmark-title-font-family: var(--spectrum-sans-serif-font);
 	--spectrum-coachmark-title-font-style: var(--spectrum-title-serif-font-style);
 	--spectrum-coachmark-title-text-font-weight: var(--spectrum-title-sans-serif-font-weight);
 	--spectrum-coachmark-title-font-size: var(--spectrum-coach-mark-title-font-size);
@@ -44,7 +44,7 @@ governing permissions and limitations under the License.
 
 	--spectrum-coachmark-step-color: var(--spectrum-coach-mark-pagination-color);
 	--spectrum-coachmark-step-font-weight: var(--spectrum-body-medium-font-weight);
-	--spectrum-coachmark-step-font-family: var(--spectrum-body-sans-serif-font-family);
+	--spectrum-coachmark-step-font-family: var(--spectrum-sans-serif-font);
 	--spectrum-coachmark-step-font-style: var(--spectrum-body-serif-font-style);
 	--spectrum-coachmark-step-line-height: var(--spectrum-line-height-200);
 	--spectrum-coachmark-step-font-size: var(--spectrum-coach-mark-pagination-body-font-size);