diff --git a/src/angular/autocomplete/autocomplete-trigger.ts b/src/angular/autocomplete/autocomplete-trigger.ts
index 3046d3d4d3..98dc62d70a 100644
--- a/src/angular/autocomplete/autocomplete-trigger.ts
+++ b/src/angular/autocomplete/autocomplete-trigger.ts
@@ -114,7 +114,7 @@ export function getSbbAutocompleteMissingPanelError(): Error {
     '[attr.aria-autocomplete]': 'autocompleteDisabled ? null : "list"',
     '[attr.aria-activedescendant]': '(panelOpen && activeOption) ? activeOption.id : null',
     '[attr.aria-expanded]': 'autocompleteDisabled ? null : panelOpen.toString()',
-    '[attr.aria-owns]': '(autocompleteDisabled || !panelOpen) ? null : autocomplete?.id',
+    '[attr.aria-controls]': '(autocompleteDisabled || !panelOpen) ? null : autocomplete?.id',
     '[attr.aria-haspopup]': 'autocompleteDisabled ? null : "listbox"',
     '[class.sbb-focused]': 'panelOpen',
     // Note: we use `focusin`, as opposed to `focus`, in order to open the panel
diff --git a/src/angular/autocomplete/autocomplete.spec.ts b/src/angular/autocomplete/autocomplete.spec.ts
index f758a4ca16..dbbe630dba 100644
--- a/src/angular/autocomplete/autocomplete.spec.ts
+++ b/src/angular/autocomplete/autocomplete.spec.ts
@@ -2202,24 +2202,24 @@ describe('SbbAutocomplete', () => {
         .toBe('false');
     }));
 
-    it('should set aria-owns based on the attached autocomplete', () => {
+    it('should set aria-controls based on the attached autocomplete', () => {
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
 
       const panel = fixture.debugElement.query(By.css('.sbb-autocomplete-panel')).nativeElement;
 
-      expect(input.getAttribute('aria-owns'))
-        .withContext('Expected aria-owns to match attached autocomplete.')
+      expect(input.getAttribute('aria-controls'))
+        .withContext('Expected aria-controls to match attached autocomplete.')
         .toBe(panel.getAttribute('id'));
     });
 
-    it('should not set aria-owns while the autocomplete is closed', () => {
-      expect(input.getAttribute('aria-owns')).toBeFalsy();
+    it('should not set aria-controls while the autocomplete is closed', () => {
+      expect(input.getAttribute('aria-controls')).toBeFalsy();
 
       fixture.componentInstance.trigger.openPanel();
       fixture.detectChanges();
 
-      expect(input.getAttribute('aria-owns')).toBeTruthy();
+      expect(input.getAttribute('aria-controls')).toBeTruthy();
     });
 
     it('should restore focus to the input when clicking to select a value', fakeAsync(() => {
@@ -2246,7 +2246,7 @@ describe('SbbAutocomplete', () => {
       expect(input.getAttribute('role')).toBeFalsy();
       expect(input.getAttribute('aria-autocomplete')).toBeFalsy();
       expect(input.getAttribute('aria-expanded')).toBeFalsy();
-      expect(input.getAttribute('aria-owns')).toBeFalsy();
+      expect(input.getAttribute('aria-controls')).toBeFalsy();
     });
   });
 
diff --git a/src/angular/autocomplete/autocomplete.ts b/src/angular/autocomplete/autocomplete.ts
index 527f6958bc..2e71aa6ded 100644
--- a/src/angular/autocomplete/autocomplete.ts
+++ b/src/angular/autocomplete/autocomplete.ts
@@ -252,7 +252,7 @@ export class SbbAutocomplete implements AfterContentInit, OnDestroy {
   }
   private _showHintIfNoOptions: boolean = false;
 
-  /** Unique ID to be used by autocomplete trigger's "aria-owns" property. */
+  /** Unique ID to be used by autocomplete trigger's "aria-controls" property. */
   id: string = `sbb-autocomplete-${nextId++}`;
 
   /**
diff --git a/src/angular/chips/chip-list.spec.ts b/src/angular/chips/chip-list.spec.ts
index 3f00e53951..411cbd95f2 100644
--- a/src/angular/chips/chip-list.spec.ts
+++ b/src/angular/chips/chip-list.spec.ts
@@ -462,7 +462,6 @@ describe('SbbChipList', () => {
 
       expect(label.getAttribute('for')).toBeTruthy();
       expect(label.getAttribute('for')).toBe(input.getAttribute('id'));
-      expect(label.getAttribute('aria-owns')).toBe(input.getAttribute('id'));
     });
   });
 
diff --git a/src/angular/core/option/option-hint.ts b/src/angular/core/option/option-hint.ts
index 2c2be77cc3..13b8ae2f95 100644
--- a/src/angular/core/option/option-hint.ts
+++ b/src/angular/core/option/option-hint.ts
@@ -14,6 +14,6 @@ let nextId = 0;
   },
 })
 export class SbbOptionHint {
-  /** Unique ID to be used by autocomplete trigger's "aria-owns" property. */
+  /** Unique ID to be used by autocomplete trigger's "aria-controls" property. */
   id: string = `sbb-option-hint-${nextId++}`;
 }
diff --git a/src/angular/form-field/form-field.html b/src/angular/form-field/form-field.html
index dfb163c4e1..2fd2dacaf2 100644
--- a/src/angular/form-field/form-field.html
+++ b/src/angular/form-field/form-field.html
@@ -1,12 +1,9 @@
 <div class="sbb-form-field-wrapper">
   <div class="sbb-form-field-label-wrapper" (click)="_control.onContainerClick($event)">
-    <!-- We add aria-owns as a workaround for an issue in JAWS & NVDA where the label isn't
-       read if it comes before the control in the DOM. -->
     <label
       class="sbb-label sbb-form-field-label"
       [id]="_labelId"
       [attr.for]="_control.id"
-      [attr.aria-owns]="_control.id"
       [class.sbb-form-field-empty]="_control.empty"
       [ngSwitch]="_hasLabel()"
     >
diff --git a/src/angular/input/input.spec.ts b/src/angular/input/input.spec.ts
index be423c0e98..b8e6ccdc9c 100644
--- a/src/angular/input/input.spec.ts
+++ b/src/angular/input/input.spec.ts
@@ -132,20 +132,6 @@ describe('SbbInput without forms', () => {
     expect(inputElement.id).toEqual(labelElement.getAttribute('for')!);
   }));
 
-  it('should add aria-owns to the label for the associated control', fakeAsync(() => {
-    const fixture = createComponent(SbbInputTextTestController);
-    fixture.detectChanges();
-
-    const inputElement: HTMLInputElement = fixture.debugElement.query(
-      By.css('input'),
-    )!.nativeElement;
-    const labelElement: HTMLInputElement = fixture.debugElement.query(
-      By.css('label'),
-    )!.nativeElement;
-
-    expect(labelElement.getAttribute('aria-owns')).toBe(inputElement.id);
-  }));
-
   it('should add aria-required reflecting the required state', fakeAsync(() => {
     const fixture = createComponent(SbbInputWithRequired);
     fixture.detectChanges();
diff --git a/src/angular/select/select.spec.ts b/src/angular/select/select.spec.ts
index 91003d9aa6..b4c93a716e 100644
--- a/src/angular/select/select.spec.ts
+++ b/src/angular/select/select.spec.ts
@@ -952,7 +952,7 @@ describe('SbbSelect', () => {
         it('should set the role of the select to combobox', fakeAsync(() => {
           expect(select.getAttribute('role')).toEqual('combobox');
           expect(select.getAttribute('aria-autocomplete')).toBe('none');
-          expect(select.getAttribute('aria-haspopup')).toBe('true');
+          expect(select.getAttribute('aria-haspopup')).toBe('listbox');
         }));
 
         it('should point the aria-controls attribute to the listbox', fakeAsync(() => {
@@ -967,17 +967,6 @@ describe('SbbSelect', () => {
           expect(ariaControls).toBe(document.querySelector('.sbb-panel')!.id);
         }));
 
-        it('should point the aria-owns attribute to the listbox on the trigger', fakeAsync(() => {
-          expect(select.hasAttribute('aria-owns')).toBe(false);
-          fixture.componentInstance.select.open();
-          fixture.detectChanges();
-          flush();
-
-          const ariaOwns = select.getAttribute('aria-owns');
-          expect(ariaOwns).toBeTruthy();
-          expect(ariaOwns).toBe(document.querySelector('.sbb-panel')!.id);
-        }));
-
         it('should set aria-expanded based on the select open state', fakeAsync(() => {
           expect(select.getAttribute('aria-expanded')).toBe('false');
 
diff --git a/src/angular/select/select.ts b/src/angular/select/select.ts
index f3ee290e1f..c2115a4db0 100644
--- a/src/angular/select/select.ts
+++ b/src/angular/select/select.ts
@@ -185,15 +185,11 @@ const _SbbSelectMixinBase = mixinTabIndex(
   host: {
     role: 'combobox',
     'aria-autocomplete': 'none',
-    // TODO(crisbeto): the value for aria-haspopup should be `listbox`, but currently it's difficult
-    // to sync into Google, because of an outdated automated a11y check which flags it as an invalid
-    // value. At some point we should try to switch it back to being `listbox`.
-    'aria-haspopup': 'true',
+    'aria-haspopup': 'listbox',
     class: 'sbb-select sbb-input-element',
     '[attr.id]': 'id',
     '[attr.tabindex]': 'readonly ? -1 : tabIndex',
     '[attr.aria-controls]': 'panelOpen ? id + "-panel" : null',
-    '[attr.aria-owns]': "panelOpen ? id + '-panel' : null",
     '[attr.aria-expanded]': 'panelOpen',
     '[attr.aria-label]': 'ariaLabel || null',
     '[attr.aria-required]': 'required.toString()',