diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c26074ccb..08ff6d063 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,14 +27,35 @@ jobs:
       - name: Build assets
         run: npm run build
 
-      - name: Remove dependencies
-        run: rm node_modules/ .github/ .git/ -rf
+      - name: Remove unuseful data
+        run: |
+          rm .git/ -rf
+          rm .github/ -rf
+          rm .storybook/ -rf
+          rm node_modules/ -rf
+          rm src/ -rf
+          rm stories/ -rf
+          rm types/ -rf
+          rm webpack/ -rf
+          rm .editorconfig
+          rm .eslintignore
+          rm .eslintrc.js
+          rm .gitignore
+          rm .stylelintignore
+          rm .stylelintrc
+          rm babel.config.js
+          rm jest.config.js
+          rm package-lock.json
+          rm package.json
+          rm postcss.config.js
+          rm tsconfig.json
+          rm webpack.config.js
         
       - name: Create & Upload artifact
         uses: actions/upload-artifact@v1
         with:
             name: ${{ github.event.repository.name }}
-            path: ../
+            path: ./
   update_release_draft:
       runs-on: ubuntu-latest
       needs: [deploy]
diff --git a/src/js/pages/checkout.ts b/src/js/pages/checkout.ts
index 839e09b35..57918f547 100644
--- a/src/js/pages/checkout.ts
+++ b/src/js/pages/checkout.ts
@@ -29,7 +29,7 @@ const initCheckout = () => {
       responsiveStep?.classList.remove('d-none');
     }
 
-    content.classList.add('js-current-step');
+    content.classList.add('js-current-step', 'step--current');
   };
 
   actionButtons.forEach((button) => {
diff --git a/src/js/theme.ts b/src/js/theme.ts
index 5ff971f41..b7271d336 100644
--- a/src/js/theme.ts
+++ b/src/js/theme.ts
@@ -32,12 +32,6 @@ initEmitter();
 $(() => {
   const {prestashop, Theme: {events}} = window;
 
-  // @TODO: Fix this on core.js side inside a major version of PrestaShop instead of minor
-  // For reference: https://github.com/PrestaShop/hummingbird/pull/418#discussion_r1061938669
-  document.querySelectorAll<HTMLInputElement>('[name="token"]').forEach((el) => {
-    el.value = prestashop.static_token;
-  });
-
   initProductBehavior();
   initQuickview();
   initCheckout();
diff --git a/templates/checkout/_partials/steps/checkout-step.tpl b/templates/checkout/_partials/steps/checkout-step.tpl
index f9d74fbe4..4df32164a 100644
--- a/templates/checkout/_partials/steps/checkout-step.tpl
+++ b/templates/checkout/_partials/steps/checkout-step.tpl
@@ -12,8 +12,10 @@
                         'step--reachable'      => $step_is_reachable,
                         'step--complete'       => $step_is_complete && !$step_is_current,
                         'js-current-step' => $step_is_current,
-                        'active' => $step_is_current
+                        'active' => $step_is_current,
+                        'show' => $step_is_current
                     ]|classnames} mb-5"
+            role = "tabpanel"
   >
     <div class="step__title js-step-title">
       <h1 class="step__title-left h3">
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index af263b022..36a9fbaec 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -34,7 +34,7 @@
                             <div class="row align-items-center">
                               {if $carrier.logo}
                                 <div class="col-md-4 carrier__logo">
-                                    <img src="{$carrier.logo}" class="rounded" alt="{$carrier.name}" loading="lazy" />
+                                    <img src="{$carrier.logo}" class="rounded img-fluid" alt="{$carrier.name}" loading="lazy" />
                                 </div>
                               {/if}
 
diff --git a/templates/checkout/checkout-steps.tpl b/templates/checkout/checkout-steps.tpl
index df1891e65..64a62342c 100644
--- a/templates/checkout/checkout-steps.tpl
+++ b/templates/checkout/checkout-steps.tpl
@@ -10,7 +10,7 @@
 
 {block name='checkout_steps'}
 <div class="{$componentName} bg-light py-2 {if isset($notifications) && $hasNotifications}mb-2 mb-lg-4{else}mb-3 mb-lg-5{/if} py-md-4">
-    <ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex">
+    <ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex" role="tablist">
       <li 
         class="{$componentName}__item nav-item js-step-item text-center col-3" 
         data-step="checkout-personal-information-step" 
@@ -23,6 +23,7 @@
           class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
           data-bs-toggle="tab" 
           data-bs-target="#checkout-personal-information-step"
+          role="tab"
         >
           {l s='Personal Information' d='Shop.Theme.Checkout'}
         </button>
@@ -40,6 +41,7 @@
           class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
           data-bs-toggle="tab" 
           data-bs-target="#checkout-addresses-step"
+          role="tab"
         >
           {l s='Addresses' d='Shop.Theme.Checkout'}
         </button>
@@ -57,6 +59,7 @@
           class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
           data-bs-toggle="tab" 
           data-bs-target="#checkout-delivery-step"
+          role="tab"
         >
           {l s='Shipping method' d='Shop.Theme.Checkout'}
         </button>
@@ -74,6 +77,7 @@
           class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
           data-bs-toggle="tab" 
           data-bs-target="#checkout-payment-step"
+          role="tab"
         >
           {l s='Payment' d='Shop.Theme.Checkout'}
         </button>
diff --git a/templates/checkout/checkout.tpl b/templates/checkout/checkout.tpl
index 1c70e3f6f..fff0e2523 100644
--- a/templates/checkout/checkout.tpl
+++ b/templates/checkout/checkout.tpl
@@ -20,12 +20,12 @@
   <div class="container">
     <div class="row">
 
-      <div class="cart-grid-body tab-content col-lg-7 order-1 order-lg-0">
+      <div class="cart-grid-body tab-content col-lg-7">
         {block name='checkout_process'}
           {render file='checkout/checkout-process.tpl' ui=$checkout_process}
         {/block}
       </div>
-      <div class="cart-grid-right col-lg-5 order-0 order-lg-1">
+      <div class="cart-grid-right col-lg-5">
         <div class="accordion">
           <div class="accordion-item bg-transparent">
             <button class="accordion-button collapsed px-0 mb-3 d-flex d-lg-none bg-transparent" type="button" data-bs-target="#js-checkout-summary" data-bs-toggle="collapse" aria-expanded="false">