diff --git a/app/components/find-journal/index.hbs b/app/components/find-journal/index.hbs
index 9e591579..dd24da73 100644
--- a/app/components/find-journal/index.hbs
+++ b/app/components/find-journal/index.hbs
@@ -1,6 +1,6 @@
 {{! template-lint-disable no-action }}
 <PowerSelect
-  @triggerClass={{if (eq @journalClass "is-invalid") (local-class "is-invalid") (local-class "is-valid")}}
+  @triggerClass={{if (eq @journalClass "is-invalid") "is-invalid"}}
   @search={{perform this.searchJournals}}
   @searchEnabled={{true}}
   @selected={{@value}}
diff --git a/app/components/grant-link-cell/index.hbs b/app/components/grant-link-cell/index.hbs
index 782572b2..d68d52bb 100644
--- a/app/components/grant-link-cell/index.hbs
+++ b/app/components/grant-link-cell/index.hbs
@@ -3,6 +3,6 @@
   the Grants table to display cells containing grant-related data that should
   also link to the grant details page
 }}
-<LinkTo @route="grants.detail" @model={{@record.grant.id}} local-class="award-number">
+<LinkTo @route="grants.detail" @model={{@record.grant.id}} class="award-number">
   {{get @record @column.propertyName}}
 </LinkTo>
\ No newline at end of file
diff --git a/app/components/oap-compliance-cell/index.hbs b/app/components/oap-compliance-cell/index.hbs
index 00f72a16..d4e8a4e1 100644
--- a/app/components/oap-compliance-cell/index.hbs
+++ b/app/components/oap-compliance-cell/index.hbs
@@ -1,6 +1,6 @@
 {{#if this.isStalled}}
   <div class="text-center">
-    <p><i local-class="fa-circle" class="fas fa-circle mr-1"></i>
+    <p><i class="fas fa-circle mr-1"></i>
       <span class="test">stalled (<a href="#">?</a>)</span></p>
   </div>
 {{else}}
diff --git a/app/components/submission-repo-details/index.hbs b/app/components/submission-repo-details/index.hbs
index 9fcf9977..9555904c 100644
--- a/app/components/submission-repo-details/index.hbs
+++ b/app/components/submission-repo-details/index.hbs
@@ -1,8 +1,8 @@
 {{! template-lint-disable link-rel-noopener no-curly-component-invocation no-implicit-this }}
 <li>
   <div class="card float-left col-5 mr-3 mb-0">
-    <div local-class="sub-status" class="card-body">
-      <div local-class="card-title" class="row card-title">
+    <div class="card-body sub-status">
+      <div class="row card-title">
         {{#if @repo.url}}
           <a href={{@repo.url}} target="_blank">{{@repo.name}}</a>
         {{else}}
@@ -16,7 +16,7 @@
             <div class="col">
               {{#if this.tooltip}}
                 <span class="{{this.status}}" tooltip-position="left" tooltip="{{this.tooltip}}">
-                  <i local-class="deposit-status-icon" class="fas fa-info-circle"></i>
+                  <i class="fas fa-info-circle deposit-status-icon"></i>
                   {{#if (eq this.status "not-submitted")}}
                     n&#47;a
                   {{else}}
@@ -25,7 +25,7 @@
                 </span>
               {{else}}
                 <span class="{{this.status}}">
-                  <i local-class="deposit-status-icon" class="fas fa-circle"></i>
+                  <i class="fas fa-circle deposit-status-icon"></i>
                   {{this.status}}
                 </span>
               {{/if}}
diff --git a/app/components/workflow-review/index.hbs b/app/components/workflow-review/index.hbs
index 9e24529a..465c9c34 100644
--- a/app/components/workflow-review/index.hbs
+++ b/app/components/workflow-review/index.hbs
@@ -29,7 +29,7 @@
         <div class="text-muted">
           Please review the information below
         </div>
-        <table local-class="review-step-table" class="table table-responsive-sm table-bordered w-100">
+        <table id="#review-step-table" class="table table-responsive-sm table-bordered w-100">
           <tbody>
             {{#if this.mustVisitWeblink}}
               <ExternalRepoReview
@@ -39,7 +39,7 @@
             {{/if}}
 
             <tr>
-              <td local-class="max-width">
+              <td class="max-width">
                 Repositories
               </td>
               <td>
@@ -95,7 +95,7 @@
                 Files
               </td>
               <td>
-                <table local-class="files-table" class="w-100">
+                <table class="files-table w-100">
                   <thead>
                     <tr>
                       <th scope="col">File Type</th>
@@ -115,15 +115,15 @@
                       <tr>
                         <td data-label="icon">
                           {{#if (eq file.mimeType "png")}}
-                            <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i>
+                            <i class="fas fa-file-image line-height-35 text-gray fa-30"></i>
                           {{else if (eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")}}
-                            <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i>
+                            <i class="fas fa-file-powerpoint line-height-35 text-gray fa-30"></i>
                           {{else if (eq file.mimeType "msword")}}
-                            <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i>
+                            <i class="fas fa-file-word line-height-35 text-gray fa-30"></i>
                           {{else if (eq file.mimeType "pdf")}}
-                            <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
+                            <i class="fas fa-file-pdf line-height-35 text-gray fa-30"></i>
                           {{else}}
-                            <i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
+                            <i class="far fa-file line-height-35 text-gray fa-30"></i>
                           {{/if}}
                         </td>
                         <td class="workflow-review-file-name" data-label="name" data-test-workflow-review-file-name>
diff --git a/app/styles/app.css b/app/styles/app.css
index 3f321552..51d75e0d 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -1,5 +1,16 @@
 @import url('branding.css');
 @import url('font-awesome-5-0-13.css');
+@import url('workflow-wrapper.css');
+@import url('workflow-review.css');
+@import url('grant-link-cell.css');
+@import url('workflow-files.css');
+@import url('find-journal.css');
+@import url('message-dialog.css');
+@import url('workflow-metadata.css');
+@import url('oap-compliance-cell.css');
+@import url('submission-action-cell.css');
+@import url('submission-repo-details.css');
+@import url('workflow-basics-user-search.css');
 
 #dashboard-container .card {
   height: 100%;
diff --git a/app/components/find-journal/index.css b/app/styles/find-journal.css
similarity index 100%
rename from app/components/find-journal/index.css
rename to app/styles/find-journal.css
diff --git a/app/components/grant-link-cell/index.css b/app/styles/grant-link-cell.css
similarity index 100%
rename from app/components/grant-link-cell/index.css
rename to app/styles/grant-link-cell.css
diff --git a/app/components/message-dialog/index.css b/app/styles/message-dialog.css
similarity index 100%
rename from app/components/message-dialog/index.css
rename to app/styles/message-dialog.css
diff --git a/app/components/oap-compliance-cell/index.css b/app/styles/oap-compliance-cell.css
similarity index 100%
rename from app/components/oap-compliance-cell/index.css
rename to app/styles/oap-compliance-cell.css
diff --git a/app/components/submission-action-cell/index.css b/app/styles/submission-action-cell.css
similarity index 100%
rename from app/components/submission-action-cell/index.css
rename to app/styles/submission-action-cell.css
diff --git a/app/components/submission-repo-details/index.css b/app/styles/submission-repo-details.css
similarity index 100%
rename from app/components/submission-repo-details/index.css
rename to app/styles/submission-repo-details.css
diff --git a/app/components/workflow-basics-user-search/index.css b/app/styles/workflow-basics-user-search.css
similarity index 100%
rename from app/components/workflow-basics-user-search/index.css
rename to app/styles/workflow-basics-user-search.css
diff --git a/app/components/workflow-files/index.css b/app/styles/workflow-files.css
similarity index 100%
rename from app/components/workflow-files/index.css
rename to app/styles/workflow-files.css
diff --git a/app/components/workflow-metadata/index.css b/app/styles/workflow-metadata.css
similarity index 100%
rename from app/components/workflow-metadata/index.css
rename to app/styles/workflow-metadata.css
diff --git a/app/components/workflow-review/index.css b/app/styles/workflow-review.css
similarity index 78%
rename from app/components/workflow-review/index.css
rename to app/styles/workflow-review.css
index b8528d75..4a27b45c 100644
--- a/app/components/workflow-review/index.css
+++ b/app/styles/workflow-review.css
@@ -6,9 +6,12 @@
   line-height: 35px;
 }
 
-table td {
-  border: 1px dotted silver;
-  word-break: break-all;
+#review-step-table {
+  /* stylelint-disable-next-line no-descending-specificity */
+  td {
+    border: 1px dotted silver;
+    word-break: break-all;
+  }
 }
 
 .max-width {
diff --git a/app/components/workflow-wrapper/index.css b/app/styles/workflow-wrapper.css
similarity index 100%
rename from app/components/workflow-wrapper/index.css
rename to app/styles/workflow-wrapper.css
diff --git a/app/templates/not-found-error.hbs b/app/templates/not-found-error.hbs
index 136078a1..69b96f13 100644
--- a/app/templates/not-found-error.hbs
+++ b/app/templates/not-found-error.hbs
@@ -5,13 +5,13 @@
   </div>
   <div class="col my-auto">
     <h2>404: Page not found</h2>
-    <p local-class="helpful-text">Looks like the page you're looking for does not exist. If you think there is a problem
-      with the site, please
-      {{#if this.contactUrl}}
-        <a href="{{this.contactUrl}}">let us know</a>.
-      {{else}}
-        contact your administrator.
-      {{/if}}
-    </p>
+  <p class="helpful-text">
+    Looks like the page you're looking for does not exist. If you think there is a problem with the site, please
+    {{#if this.contactUrl}}
+    <a href="{{this.contactUrl}}">let us know</a>.
+    {{else}}
+      contact your administrator.
+    {{/if}}
+  </p>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/submissions/detail.hbs b/app/templates/submissions/detail.hbs
index 0bb66e09..62c6ebad 100644
--- a/app/templates/submissions/detail.hbs
+++ b/app/templates/submissions/detail.hbs
@@ -251,7 +251,7 @@
                     </i>
                   </p>
                 {{else}}
-                  <table local-class="files-table" class="w-100">
+                  <table class="files-table w-100">
                     <thead>
                       <tr>
                         <th scope="col"></th>
@@ -271,17 +271,15 @@
                         <tr>
                           <td data-label="icon">
                             {{#if (eq file.mimeType "png")}}
-                              <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i>
-                            {{else if
-                              (eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")
-                            }}
-                              <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i>
+                              <i class="fas fa-file-image line-height-35 text-gray fa-30"></i>
+                            {{else if (eq file.mimeType "vnd.openxmlformats-officedocument.presentationml.presentation")}}
+                              <i class="fas fa-file-powerpoint line-height-35 text-gray fa-30"></i>
                             {{else if (eq file.mimeType "msword")}}
-                              <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i>
+                              <i class="fas fa-file-word line-height-35 text-gray fa-30"></i>
                             {{else if (eq file.mimeType "pdf")}}
-                              <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
+                              <i class="fas fa-file-pdf line-height-35 text-gray fa-30"></i>
                             {{else}}
-                              <i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
+                              <i class="far fa-file line-height-35 text-gray fa-30"></i>
                             {{/if}}
                           </td>
                           <td id="submissions-detail-file-cell" data-label="name">
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 379f8227..d1127d64 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -5,8 +5,6 @@
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const stringHash = require('string-hash');
 
-const disableCssModules = ['/pass-ui/styles/app.css', '/pass-ui/styles/font-awesome-5-0-13.css'];
-
 module.exports = function (defaults) {
   let app = new EmberApp(defaults, {
     // Add options here
@@ -30,19 +28,6 @@ module.exports = function (defaults) {
       },
     },
 
-    cssModules: {
-      generateScopedName(className, modulePath) {
-        if (!disableCssModules.includes(modulePath)) {
-          let hash = stringHash(modulePath).toString(36).substring(0, 6);
-          let scopedName = `_${className}_${hash}`;
-
-          return scopedName;
-        }
-
-        return className;
-      },
-    },
-
     fingerprint: {
       enabled: false,
     },
diff --git a/package.json b/package.json
index 518e745b..4690d6aa 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,6 @@
     "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^2.3.4",
     "ember-concurrency-decorators": "^1.0.0",
-    "ember-css-modules": "^2.0.1",
     "ember-data": "~5.3.3",
     "ember-file-upload": "^7.3.0",
     "ember-inflector": "^4.0.2",