diff --git a/package-lock.json b/package-lock.json
index c833280b..b8be729c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3924,9 +3924,9 @@
       }
     },
     "@edx/paragon": {
-      "version": "13.16.1",
-      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.16.1.tgz",
-      "integrity": "sha512-8GxeS0OQLKJKrkqUa6HRk+wi/96IvhuY6JjjQYIf4+SA6TXLu57SwvtsQN6sLuB3PTxnW64WQF3MepvpNo9VpQ==",
+      "version": "13.17.5",
+      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-13.17.5.tgz",
+      "integrity": "sha512-ZLgZU/8kQBfHT3gd1s3w6AQZIOfufqMU4hItB4dSaqVcCX8ECmtE/AAMdwasTNxyhGCzfITuVe8xB9wYOnU/Xw==",
       "requires": {
         "@fortawesome/fontawesome-svg-core": "^1.2.30",
         "@fortawesome/free-solid-svg-icons": "^5.14.0",
@@ -20980,9 +20980,9 @@
       }
     },
     "react-popper": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.4.tgz",
-      "integrity": "sha512-NacOu4zWupdQjVXq02XpTD3yFPSfg5a7fex0wa3uGKVkFK7UN6LvVxgcb+xYr56UCuWiNPMH20tntdVdJRwYew==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
       "requires": {
         "react-fast-compare": "^3.0.1",
         "warning": "^4.0.2"
diff --git a/package.json b/package.json
index 3a601ce5..ebe17162 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@edx/frontend-component-cookie-policy-banner": "2.1.12",
     "@edx/frontend-component-header": "2.2.5",
     "@edx/frontend-platform": "1.8.4",
-    "@edx/paragon": "13.16.1",
+    "@edx/paragon": "13.17.5",
     "@fortawesome/fontawesome-svg-core": "1.2.32",
     "@fortawesome/free-brands-svg-icons": "5.15.1",
     "@fortawesome/free-regular-svg-icons": "5.15.1",
diff --git a/src/common-components/tests/AuthnValidationFormGroup.test.jsx b/src/common-components/tests/AuthnValidationFormGroup.test.jsx
index 88f3dfbf..0c765e54 100644
--- a/src/common-components/tests/AuthnValidationFormGroup.test.jsx
+++ b/src/common-components/tests/AuthnValidationFormGroup.test.jsx
@@ -15,14 +15,14 @@ describe('AuthnCustomValidationFormGroup', () => {
 
   it('should show label in place of placeholder when field is empty', () => {
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pt-10 focus-out form-label');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label pt-10 focus-out');
   });
 
   it('should show label on top of field when field is focused in', () => {
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
 
     validationFormGroup.find('input').simulate('focus');
-    expect(validationFormGroup.find('label').prop('className')).toEqual('pt-10 h6 form-label');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label pt-10 h6');
   });
 
   it('should keep label hidden for checkbox field', () => {
@@ -32,7 +32,7 @@ describe('AuthnCustomValidationFormGroup', () => {
       optionalFieldCheckbox: true,
     };
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('sr-only form-label');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label sr-only');
   });
 
   it('should keep label hidden when input field is not empty', () => {
@@ -41,6 +41,6 @@ describe('AuthnCustomValidationFormGroup', () => {
       value: 'test',
     };
     const validationFormGroup = mount(<AuthnCustomValidationFormGroup {...props} />);
-    expect(validationFormGroup.find('label').prop('className')).toEqual('sr-only form-label');
+    expect(validationFormGroup.find('label').prop('className')).toEqual('pgn__form-label sr-only');
   });
 });
diff --git a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
index 3e4d3052..244a95f9 100644
--- a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
+++ b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
@@ -24,8 +24,7 @@ exports[`ForgotPasswordPage should match default section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="forgot-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Email
         </label>
@@ -147,8 +146,7 @@ exports[`ForgotPasswordPage should match forbidden section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="forgot-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Email
         </label>
@@ -255,8 +253,7 @@ exports[`ForgotPasswordPage should match pending section snapshot 1`] = `
         className="form-group mb-0 w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="forgot-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Email
         </label>
diff --git a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
index 01680d3c..566ee00e 100644
--- a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
+++ b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
@@ -37,8 +37,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email
           </label>
@@ -63,8 +62,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password
           </label>
@@ -235,8 +233,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email
           </label>
@@ -261,8 +258,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password
           </label>
@@ -431,8 +427,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email
           </label>
@@ -457,8 +452,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password
           </label>
@@ -587,8 +581,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email
           </label>
@@ -613,8 +606,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password
           </label>
@@ -780,8 +772,7 @@ exports[`LoginPage should show error message 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email
           </label>
@@ -806,8 +797,7 @@ exports[`LoginPage should show error message 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password
           </label>
diff --git a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
index cea36c07..b2c1fd66 100644
--- a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
+++ b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
@@ -36,8 +36,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="name"
+            className="pgn__form-label pt-10 focus-out"
           >
             Full name (required)
           </label>
@@ -62,8 +61,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="username"
+            className="pgn__form-label pt-10 focus-out"
           >
             Public username (required)
           </label>
@@ -88,8 +86,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email (required)
           </label>
@@ -114,8 +111,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password (required)
           </label>
@@ -140,8 +136,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="country"
+            className="pgn__form-label sr-only"
           >
             Country or region of residence (required)
           </label>
@@ -1471,8 +1466,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="optional"
+            className="pgn__form-label sr-only"
           >
             Support education research by providing additional information. (Optional)
           </label>
@@ -1605,8 +1599,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="name"
+            className="pgn__form-label pt-10 focus-out"
           >
             Full name (required)
           </label>
@@ -1631,8 +1624,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="username"
+            className="pgn__form-label pt-10 focus-out"
           >
             Public username (required)
           </label>
@@ -1657,8 +1649,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email (required)
           </label>
@@ -1683,8 +1674,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password (required)
           </label>
@@ -1709,8 +1699,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="country"
+            className="pgn__form-label sr-only"
           >
             Country or region of residence (required)
           </label>
@@ -3040,8 +3029,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="optional"
+            className="pgn__form-label sr-only"
           >
             Support education research by providing additional information. (Optional)
           </label>
@@ -3129,8 +3117,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="name"
+            className="pgn__form-label pt-10 focus-out"
           >
             Full name (required)
           </label>
@@ -3155,8 +3142,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="username"
+            className="pgn__form-label pt-10 focus-out"
           >
             Public username (required)
           </label>
@@ -3181,8 +3167,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group data-hj-suppress"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="email"
+            className="pgn__form-label pt-10 focus-out"
           >
             Email (required)
           </label>
@@ -3207,8 +3192,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group"
         >
           <label
-            className="pt-10 focus-out form-label"
-            htmlFor="password"
+            className="pgn__form-label pt-10 focus-out"
           >
             Password (required)
           </label>
@@ -3233,8 +3217,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group mb-0 data-hj-suppress"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="country"
+            className="pgn__form-label sr-only"
           >
             Country or region of residence (required)
           </label>
@@ -4564,8 +4547,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           className="form-group custom-control pt-10 mb-0"
         >
           <label
-            className="sr-only form-label"
-            htmlFor="optional"
+            className="pgn__form-label sr-only"
           >
             Support education research by providing additional information. (Optional)
           </label>
diff --git a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
index fcb2f904..a59cf3f4 100644
--- a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
+++ b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
@@ -25,8 +25,7 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="reset-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           New password
         </label>
@@ -51,8 +50,7 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="confirm-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Confirm password
         </label>
@@ -126,8 +124,7 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="reset-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           New password
         </label>
@@ -152,8 +149,7 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="confirm-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Confirm password
         </label>
@@ -248,8 +244,7 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="reset-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           New password
         </label>
@@ -274,8 +269,7 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="confirm-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Confirm password
         </label>
@@ -387,8 +381,7 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="reset-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           New password
         </label>
@@ -413,8 +406,7 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         className="form-group w-100"
       >
         <label
-          className="pt-10 focus-out form-label"
-          htmlFor="confirm-password-input"
+          className="pgn__form-label pt-10 focus-out"
         >
           Confirm password
         </label>