diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ab7e8fab..92d0951cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node }}
+    - run: npm install -g npm@${{ matrix.npm }}
 
     - run: npm install -g npm@${{ matrix.npm }}
     
diff --git a/src/payment/__snapshots__/PaymentPage.test.jsx.snap b/src/payment/__snapshots__/PaymentPage.test.jsx.snap
index df84b65e6..f2b5df556 100644
--- a/src/payment/__snapshots__/PaymentPage.test.jsx.snap
+++ b/src/payment/__snapshots__/PaymentPage.test.jsx.snap
@@ -2353,20 +2353,26 @@ exports[`<PaymentPage /> Renders correctly in various states should render the b
                 <div
                   className="position-relative"
                 >
-                  <input
-                    className="form-control form-control-sm"
-                    defaultValue={1}
-                    id="code-quantity"
-                    max="100"
-                    min="1"
-                    name="code-quantity"
-                    style={
-                      Object {
-                        "width": "5rem",
+                  <div
+                    className="pgn__form-control-decorator-group form-control-sm"
+                  >
+                    <input
+                      className="has-value form-control"
+                      defaultValue={1}
+                      id="code-quantity"
+                      max="100"
+                      min="1"
+                      name="code-quantity"
+                      onBlur={[Function]}
+                      onChange={[Function]}
+                      style={
+                        Object {
+                          "width": "5rem",
+                        }
                       }
-                    }
-                    type="number"
-                  />
+                      type="number"
+                    />
+                  </div>
                   <small
                     className="text-muted small"
                     style={
diff --git a/src/payment/cart/CouponForm.jsx b/src/payment/cart/CouponForm.jsx
index 17f50de8c..ab6e11451 100644
--- a/src/payment/cart/CouponForm.jsx
+++ b/src/payment/cart/CouponForm.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { Button, Input, ValidationFormGroup } from '@edx/paragon';
+import { Button, Form } from '@edx/paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { sendTrackEvent } from '@edx/frontend-platform/analytics';
 
@@ -44,7 +44,7 @@ class CouponForm extends Component {
 
     return (
       <form onSubmit={this.handleAddSubmit} className="summary-row d-flex align-items-end">
-        <ValidationFormGroup for={id} invalid={false} className="mb-0 mr-2">
+        <Form.Group controlId={id} invalid={false} className="mb-0 mr-2">
           <label className="h6 d-block" htmlFor={id}>
             <FormattedMessage
               id="payment.coupon.label"
@@ -52,8 +52,8 @@ class CouponForm extends Component {
               description="Label for the add coupon form"
             />
           </label>
-          <Input name={id} id={id} type="text" defaultValue={code} />
-        </ValidationFormGroup>
+          <Form.Control name={id} id={id} type="text" defaultValue={code} />
+        </Form.Group>
         <Button
           disabled={isBasketProcessing}
           variant="outline-primary"
diff --git a/src/payment/cart/UpdateQuantityForm.jsx b/src/payment/cart/UpdateQuantityForm.jsx
index 15e8279e0..cf1f98a46 100644
--- a/src/payment/cart/UpdateQuantityForm.jsx
+++ b/src/payment/cart/UpdateQuantityForm.jsx
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import { StatefulButton, Input } from '@edx/paragon';
+import { StatefulButton, Form } from '@edx/paragon';
 
 import { updateQuantity } from '../data/actions';
 import { updateQuantityFormSelector } from '../data/selectors';
@@ -34,7 +34,7 @@ const UpdateQuantityForm = (props) => {
           />
         </label>
         <div className="position-relative">
-          <Input
+          <Form.Control
             className="form-control-sm"
             name={id}
             id={id}
diff --git a/src/payment/cart/__snapshots__/Cart.test.jsx.snap b/src/payment/cart/__snapshots__/Cart.test.jsx.snap
index c1c51b7e2..287c1fa7d 100644
--- a/src/payment/cart/__snapshots__/Cart.test.jsx.snap
+++ b/src/payment/cart/__snapshots__/Cart.test.jsx.snap
@@ -198,22 +198,30 @@ exports[`<Cart /> renders a basic, one product cart with coupon form 1`] = `
         onSubmit={[Function]}
       >
         <div
-          className="form-group mb-0 mr-2"
+          className="pgn__form-group mb-0 mr-2"
+          invalid={false}
         >
-          <label
-            className="h6 d-block"
-            htmlFor="couponField"
-          >
-            Add coupon code (optional)
-          </label>
-          <input
-            aria-describedby=""
-            className="form-control"
-            defaultValue=""
-            id="couponField"
-            name="couponField"
-            type="text"
-          />
+          Array [
+            <label
+              className="h6 d-block"
+              htmlFor="couponField"
+            >
+              Add coupon code (optional)
+            </label>,
+            <div
+              className="pgn__form-control-decorator-group"
+            >
+              <input
+                className="form-control"
+                defaultValue=""
+                id="couponField"
+                name="couponField"
+                onBlur={[Function]}
+                onChange={[Function]}
+                type="text"
+              />
+            </div>,
+          ]
         </div>
         <button
           className="btn btn-outline-primary"
@@ -325,20 +333,26 @@ exports[`<Cart /> renders a bulk enrollment cart 1`] = `
           <div
             className="position-relative"
           >
-            <input
-              className="form-control form-control-sm"
-              defaultValue={1}
-              id="code-quantity"
-              max="100"
-              min="1"
-              name="code-quantity"
-              style={
-                Object {
-                  "width": "5rem",
+            <div
+              className="pgn__form-control-decorator-group form-control-sm"
+            >
+              <input
+                className="has-value form-control"
+                defaultValue={1}
+                id="code-quantity"
+                max="100"
+                min="1"
+                name="code-quantity"
+                onBlur={[Function]}
+                onChange={[Function]}
+                style={
+                  Object {
+                    "width": "5rem",
+                  }
                 }
-              }
-              type="number"
-            />
+                type="number"
+              />
+            </div>
             <small
               className="text-muted small"
               style={
diff --git a/src/payment/cart/__snapshots__/CouponForm.test.jsx.snap b/src/payment/cart/__snapshots__/CouponForm.test.jsx.snap
index 5d69b4582..8d2697167 100644
--- a/src/payment/cart/__snapshots__/CouponForm.test.jsx.snap
+++ b/src/payment/cart/__snapshots__/CouponForm.test.jsx.snap
@@ -26,22 +26,30 @@ exports[`CouponForm should render a form when there is no coupon 1`] = `
   onSubmit={[Function]}
 >
   <div
-    className="form-group mb-0 mr-2"
+    className="pgn__form-group mb-0 mr-2"
+    invalid={false}
   >
-    <label
-      className="h6 d-block"
-      htmlFor="couponField"
-    >
-      Add coupon code (optional)
-    </label>
-    <input
-      aria-describedby=""
-      className="form-control"
-      defaultValue=""
-      id="couponField"
-      name="couponField"
-      type="text"
-    />
+    Array [
+      <label
+        className="h6 d-block"
+        htmlFor="couponField"
+      >
+        Add coupon code (optional)
+      </label>,
+      <div
+        className="pgn__form-control-decorator-group"
+      >
+        <input
+          className="form-control"
+          defaultValue=""
+          id="couponField"
+          name="couponField"
+          onBlur={[Function]}
+          onChange={[Function]}
+          type="text"
+        />
+      </div>,
+    ]
   </div>
   <button
     className="btn btn-outline-primary"