diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index 34a79581bd..082bdfc917 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -116,7 +116,7 @@ export default function ChallengeTags(props) {
       {
         isSelfService && (
           <DevelopmentTrackTag>
-            <span>Customer Self-Service</span>
+            <span>On Demand</span>
           </DevelopmentTrackTag>
         )
       }
diff --git a/src/shared/components/challenge-detail/Specification/index.jsx b/src/shared/components/challenge-detail/Specification/index.jsx
index 3e49b528dc..a8a6720a27 100644
--- a/src/shared/components/challenge-detail/Specification/index.jsx
+++ b/src/shared/components/challenge-detail/Specification/index.jsx
@@ -56,6 +56,7 @@ export default function ChallengeDetailsView(props) {
     reviewScorecardId,
     screeningScorecardId,
     forumId,
+    selfService,
   } = legacy;
 
   let stockArtValue = '';
@@ -173,7 +174,7 @@ export default function ChallengeDetailsView(props) {
         <div styleName="challenge-specifications">
           <div styleName={`challenge-specs-main ${accentedStyle}`}>
             {
-              track.toLowerCase() !== 'design'
+              track.toLowerCase() !== 'design' && !selfService
                 ? (
                   <div>
                     {
@@ -434,6 +435,7 @@ ChallengeDetailsView.propTypes = {
       reviewScorecardId: PT.oneOfType([PT.string, PT.number]),
       screeningScorecardId: PT.string,
       forumId: PT.number,
+      selfService: PT.bool,
     }),
     track: PT.string.isRequired,
     legacyId: PT.oneOfType([PT.string, PT.number]),
diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx
index 4c1505ed44..6e10ba0649 100644
--- a/src/shared/components/challenge-listing/ChallengeCard/index.jsx
+++ b/src/shared/components/challenge-listing/ChallengeCard/index.jsx
@@ -106,7 +106,7 @@ function ChallengeCard({
             {
               _.get(challenge, 'legacy.selfService') && (
                 <DevelopmentTrackTag>
-                  <span>Customer Self-Service</span>
+                  <span>On Demand</span>
                 </DevelopmentTrackTag>
               )
             }