diff --git a/lib/registries/addon/my-registrations/controller.ts b/lib/registries/addon/my-registrations/controller.ts
index 758d5924ecd..f1dbd06578c 100644
--- a/lib/registries/addon/my-registrations/controller.ts
+++ b/lib/registries/addon/my-registrations/controller.ts
@@ -12,7 +12,7 @@ export default class MyRegistrationsController extends Controller {
     @tracked tab = 'submitted';
 
     @action
-    changeTab(newTabId: string) {
-        this.tab = newTabId;
+    changeTab(newTabId: number) {
+        this.tab = newTabId === 1 ? 'submitted' : 'drafts';
     }
 }
diff --git a/lib/registries/addon/my-registrations/styles.scss b/lib/registries/addon/my-registrations/styles.scss
index cd78b717832..5fbc8686860 100644
--- a/lib/registries/addon/my-registrations/styles.scss
+++ b/lib/registries/addon/my-registrations/styles.scss
@@ -23,6 +23,14 @@
 .NavTabs {
     ul {
         margin-left: 15px;
+        margin-bottom: 10px;
+        line-height: 20px;
+        list-style-image: none;
+        list-style-position: outside;
+        list-style-type: none;
+        height: 41px;
+        padding: 0;
+        box-sizing: border-box;
     }
 
     .NavItem {
@@ -30,6 +38,7 @@
         color: #fff;
         background: none;
         padding: 10px 15px;
+        float: left;
 
         &:hover {
             border: none;
@@ -38,7 +47,7 @@
         }
     }
 
-    :global(.active) .NavItem {
+    :global(.ember-tabs__tab--selected) {
         border: none;
         color: $color-text-gray;
         background-color: #e4e4e4;
@@ -55,8 +64,6 @@
     }
 
     .TabPane {
-        display: none;
-
         &:global(.active) {
             display: block;
         }
diff --git a/lib/registries/addon/my-registrations/template.hbs b/lib/registries/addon/my-registrations/template.hbs
index 05ef429217b..9a28e86f72b 100644
--- a/lib/registries/addon/my-registrations/template.hbs
+++ b/lib/registries/addon/my-registrations/template.hbs
@@ -15,69 +15,47 @@
         </layout.heading>
         <layout.main>
             {{#if this.currentUser.user}}
-                <BsTab
+                <AriaTabs
                     local-class='NavTabs'
-                    @customTabs={{true}}
-                    @onChange={{this.changeTab}} 
-                    @activeId={{this.tab}}
+                    @onSelect={{this.changeTab}} 
+                    @defaultIndex={{if (eq this.tab 'submitted') 1 0}}
                     as |tab|
                 >
-                    <BsNav
-                        @type='tabs'
+                    <tab.tabList
                         as |nav|
                     >
-                        <nav.item
+                        <nav.tab
                             data-test-my-registrations-nav='drafts'
-                            @active={{bs-eq tab.activeId 'drafts'}}
+                            local-class='NavItem'
                         >
-                            <button
-                                data-test-my-registrations-nav-button='drafts'
-                                local-class='NavItem'
-                                type='button'
-                                role='tab'
-                                {{on 'click' (fn this.changeTab 'drafts')}}
-                            >
-                                {{t 'registries.my_registrations.drafts'}}
-                            </button>
-                        </nav.item>
-                        <nav.item
+                            {{t 'registries.my_registrations.drafts'}}
+                        </nav.tab>
+                        <nav.tab
                             data-test-my-registrations-nav='submitted'
-                            @active={{bs-eq tab.activeId 'submitted'}}
+                            local-class='NavItem'
                         >
-                            <button
-                                data-test-my-registrations-nav-button='submitted'
-                                local-class='NavItem'
-                                type='button'
-                                role='tab'
-                                {{on 'click' (fn this.changeTab 'submitted')}}
-                            >
-                                {{t 'registries.my_registrations.submitted'}}
-                            </button>
-                        </nav.item>
-                    </BsNav>
+                            {{t 'registries.my_registrations.submitted'}}
+                        </nav.tab>
+                    </tab.tabList>
                     <div
                         data-test-my-registrations-sort-description
                         local-class='SortDescription'
                     >
                         {{t 'registries.my_registrations.sorted'}}
                     </div>
-                    <tab.pane
+                    <tab.tabPanel
                         data-test-my-registrations-pane='drafts'
                         local-class='TabPane'
-                        @title={{t 'registries.my_registrations.drafts'}}
-                        @id='drafts'
                     >
                         <Registries::MyRegistrationsList::Drafts />
-                    </tab.pane>
-                    <tab.pane
+                    </tab.tabPanel>
+                    <tab.tabPanel
                         data-test-my-registrations-pane='submitted'
                         local-class='TabPane'
-                        @title={{t 'registries.my_registrations.submitted'}}
-                        @id='submitted'
                     >
                         <Registries::MyRegistrationsList::Registrations @user={{this.currentUser.user}} />
-                    </tab.pane>
-                </BsTab>
+                    </tab.tabPanel>
+                </AriaTabs>
             {{/if}}
         </layout.main>
     </OsfLayout>
diff --git a/lib/registries/package.json b/lib/registries/package.json
index c9e4c9b8031..7f607c165ee 100644
--- a/lib/registries/package.json
+++ b/lib/registries/package.json
@@ -13,6 +13,7 @@
     "@glimmer/component": "*",
     "@glimmer/tracking": "*",
     "ember-angle-bracket-invocation-polyfill": "*",
+    "ember-aria-tabs": "*",
     "ember-basic-dropdown": "*",
     "ember-bootstrap": "*",
     "ember-changeset": "*",
diff --git a/tests/engines/registries/acceptance/my-registrations-page-test.ts b/tests/engines/registries/acceptance/my-registrations-page-test.ts
index 37157610836..9c0155ffe29 100644
--- a/tests/engines/registries/acceptance/my-registrations-page-test.ts
+++ b/tests/engines/registries/acceptance/my-registrations-page-test.ts
@@ -26,18 +26,21 @@ module('Registries | Acceptance | my-registrations page', hooks => {
         await visit('/registries/my-registrations');
         assert.dom('[data-test-my-registrations-sort-description]').exists('Sort description shown');
         assert.notOk(currentURL().includes('tab'), 'Tab query param not visible on submitted');
-        assert.dom('[data-test-my-registrations-nav="submitted"]').hasClass('active', 'Submitted tab is active');
-        assert.dom('[data-test-my-registrations-nav="drafts"]').doesNotHaveClass('active', 'Draft tab is not active');
+        assert.dom('[data-test-my-registrations-nav="submitted"]')
+            .hasClass('ember-tabs__tab--selected', 'Submitted tab is active');
+        assert.dom('[data-test-my-registrations-nav="drafts"]')
+            .doesNotHaveClass('ember-tabs__tab--selected', 'Draft tab is not active');
         assert.dom('[data-test-my-registrations-pane="submitted"]').isVisible('Submitted pane is shown');
         assert.dom('[data-test-my-registrations-pane="drafts"]').isNotVisible('Drafts pane is not shown');
         assert.dom('[data-test-node-card]').exists({ count: 3 }, 'All submitted registrations shown');
         await percySnapshot(assert);
 
-        await click('[data-test-my-registrations-nav-button="drafts"]');
+        await click('[data-test-my-registrations-nav="drafts"]');
         assert.ok(currentURL().includes('tab=drafts'), 'Tab query param visible on drafts');
-        assert.dom('[data-test-my-registrations-nav="drafts"]').hasClass('active', 'Drafts tab is active');
-        assert.dom('[data-test-my-registrations-nav="submitted"]').doesNotHaveClass('active',
-            'Submitted tab is not active');
+        assert.dom('[data-test-my-registrations-nav="drafts"]')
+            .hasClass('ember-tabs__tab--selected', 'Drafts tab is active');
+        assert.dom('[data-test-my-registrations-nav="submitted"]')
+            .doesNotHaveClass('ember-tabs__tab--selected', 'Submitted tab is not active');
         assert.dom('[data-test-my-registrations-pane="drafts"]').isVisible('Drafts pane is shown');
         assert.dom('[data-test-my-registrations-pane="submitted"]').isNotVisible('Submitted pane is not shown');
         assert.dom('[data-test-draft-registration-card]').exists({ count: 2 }, 'All drafts shown');