diff --git a/docker-compose.yml b/docker-compose.yml
index 6e5d2b45e2..94f35af900 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -708,7 +708,7 @@ services:
     working_dir: '/edx/app/frontend-app-account'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-account"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@@1.x'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@1.x'
     networks:
       default:
         aliases:
@@ -725,7 +725,7 @@ services:
     working_dir: '/edx/app/frontend-app-profile'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-profile"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@~2.0.0'
     networks:
       default:
         aliases:
@@ -742,7 +742,7 @@ services:
     working_dir: '/edx/app/frontend-app-authn'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-authn"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@~2.0.0'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@2.x'
     networks:
       default:
         aliases:
@@ -759,7 +759,7 @@ services:
     working_dir: '/edx/app/frontend-app-course-authoring'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-course-authoring"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@2.x'
     networks:
       default:
         aliases:
@@ -775,8 +775,6 @@ services:
       service: microfrontend
     working_dir: '/edx/app/frontend-app-gradebook'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-gradebook"
-    environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org'
     networks:
       default:
         aliases:
@@ -790,10 +788,10 @@ services:
     extends:
       file: microfrontend.yml
       service: microfrontend
-    working_dir: '/edx/app/frontend-app-ora-grading@2.x'
+    working_dir: '/edx/app/frontend-app-ora-grading'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-ora-grading"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@2.x'
     networks:
       default:
         aliases:
@@ -861,7 +859,7 @@ services:
     working_dir: '/edx/app/frontend-app-library-authoring'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.frontend-app-library-authoring"
     environment:
-      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org'
+      PARAGON_BRAND_PACKAGE: '@edx/brand-edx.org@2.x'
     networks:
       default:
         aliases: