diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5902d4597d..28a681e0da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -175,6 +175,7 @@ workflows:
             branches:
               only:
                 - develop
+                - feature-devices-lookup
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -189,7 +190,7 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - notifications-analytics
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":
diff --git a/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx
index aaf82505b3..72a6227d7e 100644
--- a/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx
+++ b/src/shared/components/challenge-listing/ChallengeCard/Status/index.jsx
@@ -216,7 +216,7 @@ export default function ChallengeStatus(props) {
       .filter(p => p.phaseType !== 'Registration')
       .sort((a, b) => moment(a.scheduledEndTime).diff(b.scheduledEndTime))[0];
 
-    if (!statusPhase && subTrack === 'FIRST_2_FINISH' && checkPhases.length) {
+    if (!statusPhase && (subTrack === 'FIRST_2_FINISH' || subTrack === 'CODE') && checkPhases.length) {
       statusPhase = _.clone(checkPhases[0]);
       statusPhase.phaseType = 'Submission';
     }