diff --git a/libs/doc-pages/accordion/src/lib/demos/animated/animated.ts b/libs/doc-pages/accordion/src/lib/demos/animated/animated.ts
index 6af8cdcb03..0096afaca1 100644
--- a/libs/doc-pages/accordion/src/lib/demos/animated/animated.ts
+++ b/libs/doc-pages/accordion/src/lib/demos/animated/animated.ts
@@ -1,8 +1,10 @@
-import { Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
   selector: 'demo-accordion-animation',
-  templateUrl: './animated.html'
+  templateUrl: './animated.html',
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DemoAccordionAnimatedComponent {}
+
diff --git a/libs/doc-pages/accordion/src/lib/demos/basic/basic.html b/libs/doc-pages/accordion/src/lib/demos/basic/basic.html
index 21a2759b8b..02ff0a98da 100644
--- a/libs/doc-pages/accordion/src/lib/demos/basic/basic.html
+++ b/libs/doc-pages/accordion/src/lib/demos/basic/basic.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Static Header">
     This content is straight in the template.
   </accordion-group>
diff --git a/libs/doc-pages/accordion/src/lib/demos/custom-html/custom-html.html b/libs/doc-pages/accordion/src/lib/demos/custom-html/custom-html.html
index 281f0598c7..905de847e5 100644
--- a/libs/doc-pages/accordion/src/lib/demos/custom-html/custom-html.html
+++ b/libs/doc-pages/accordion/src/lib/demos/custom-html/custom-html.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group>
     <button
       class="btn btn-link btn-block justify-content-between d-flex w-100  shadow-none"
diff --git a/libs/doc-pages/accordion/src/lib/demos/disabled/disabled.html b/libs/doc-pages/accordion/src/lib/demos/disabled/disabled.html
index 28e876a48f..874e103fdf 100644
--- a/libs/doc-pages/accordion/src/lib/demos/disabled/disabled.html
+++ b/libs/doc-pages/accordion/src/lib/demos/disabled/disabled.html
@@ -4,7 +4,7 @@
   </button>
 </p>
 
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Static Header"
                    [isDisabled]="isFirstDisabled">
     This content is straight in the template.
diff --git a/libs/doc-pages/accordion/src/lib/demos/dymanic/dynamic.html b/libs/doc-pages/accordion/src/lib/demos/dymanic/dynamic.html
index b04c0223f8..0a07c22de8 100644
--- a/libs/doc-pages/accordion/src/lib/demos/dymanic/dynamic.html
+++ b/libs/doc-pages/accordion/src/lib/demos/dymanic/dynamic.html
@@ -4,7 +4,7 @@
   </button>
 </p>
 
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group *ngFor="let group of groups" [heading]="group.title">
     {{ group?.content }}
   </accordion-group>
diff --git a/libs/doc-pages/accordion/src/lib/demos/dynamic-body/dynamic-body.html b/libs/doc-pages/accordion/src/lib/demos/dynamic-body/dynamic-body.html
index e122e3ba74..30510a373d 100644
--- a/libs/doc-pages/accordion/src/lib/demos/dynamic-body/dynamic-body.html
+++ b/libs/doc-pages/accordion/src/lib/demos/dynamic-body/dynamic-body.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Dynamic Body Content">
     <p>The body of the accordion group grows to fit the contents</p>
     <button type="button" class="btn btn-primary btn-sm" (click)="addItem()">Add
diff --git a/libs/doc-pages/accordion/src/lib/demos/manual-toggle/manual-toggle.html b/libs/doc-pages/accordion/src/lib/demos/manual-toggle/manual-toggle.html
index 33cc5e8968..4fb062b140 100644
--- a/libs/doc-pages/accordion/src/lib/demos/manual-toggle/manual-toggle.html
+++ b/libs/doc-pages/accordion/src/lib/demos/manual-toggle/manual-toggle.html
@@ -4,7 +4,7 @@
   </button>
 </p>
 
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Content 1">
     <p>accordion 1</p>
   </accordion-group>
diff --git a/libs/doc-pages/accordion/src/lib/demos/open-event/open-event.html b/libs/doc-pages/accordion/src/lib/demos/open-event/open-event.html
index 03e913c4b7..8d7a3eeb58 100644
--- a/libs/doc-pages/accordion/src/lib/demos/open-event/open-event.html
+++ b/libs/doc-pages/accordion/src/lib/demos/open-event/open-event.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Group without isOpenChange event listener">
     <p>Some content</p>
   </accordion-group>
diff --git a/libs/doc-pages/accordion/src/lib/demos/opened/opened.html b/libs/doc-pages/accordion/src/lib/demos/opened/opened.html
index 64561b29a2..05503cb57a 100644
--- a/libs/doc-pages/accordion/src/lib/demos/opened/opened.html
+++ b/libs/doc-pages/accordion/src/lib/demos/opened/opened.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Content 1">
     <p>accordion 1</p>
   </accordion-group>
diff --git a/libs/doc-pages/accordion/src/lib/demos/styling/styling.html b/libs/doc-pages/accordion/src/lib/demos/styling/styling.html
index 1a78a356e3..7332ee96cb 100644
--- a/libs/doc-pages/accordion/src/lib/demos/styling/styling.html
+++ b/libs/doc-pages/accordion/src/lib/demos/styling/styling.html
@@ -1,4 +1,4 @@
-<accordion>
+<accordion [isAnimated]="false">
   <accordion-group heading="Static Header, initially expanded"
                    [panelClass]="customClass"
                    [isOpen]="isFirstOpen">
diff --git a/src/accordion/accordion-group.component.html b/src/accordion/accordion-group.component.html
index 84b2c126de..a03d8e743d 100644
--- a/src/accordion/accordion-group.component.html
+++ b/src/accordion/accordion-group.component.html
@@ -1,20 +1,20 @@
-<div class="panel card" [ngClass]="panelClass">
+<div class="panel card" [ngClass]="panelClass()">
   <div
     class="panel-heading card-header"
     role="tab"
     (click)="toggleOpen()"
-    [ngClass]="isDisabled ? 'panel-disabled' : 'panel-enabled'"
+    [ngClass]="isDisabled() ? 'panel-disabled' : 'panel-enabled'"
   >
     <div class="panel-title">
-      <div role="button" class="accordion-toggle" [attr.aria-expanded]="isOpen">
-        <button class="btn btn-link" *ngIf="heading" [ngClass]="{ 'text-muted': isDisabled }" type="button">
-          {{ heading }}
+      <div role="button" class="accordion-toggle" [attr.aria-expanded]="isOpen()">
+        <button class="btn btn-link" *ngIf="heading()" [ngClass]="{ 'text-muted': isDisabled() }" type="button">
+          {{ heading() }}
         </button>
         <ng-content select="[accordion-heading]"></ng-content>
       </div>
     </div>
   </div>
-  <div class="panel-collapse collapse" role="tabpanel" [collapse]="!isOpen" [isAnimated]="isAnimated">
+  <div class="panel-collapse collapse" role="tabpanel" [collapse]="!isOpen()" [isAnimated]="isAnimated">
     <div class="panel-body card-block card-body">
       <ng-content></ng-content>
     </div>
diff --git a/src/accordion/accordion-group.component.ts b/src/accordion/accordion-group.component.ts
index 20e01f29a4..e1959b5e12 100644
--- a/src/accordion/accordion-group.component.ts
+++ b/src/accordion/accordion-group.component.ts
@@ -1,5 +1,5 @@
 import {
-  Component, HostBinding, Inject, Input, OnDestroy, OnInit, Output, EventEmitter
+  Component, HostBinding, Inject, OnDestroy, OnInit, input, output, model
 } from '@angular/core';
 import { AccordionComponent } from './accordion.component';
 import { CollapseModule } from 'ngx-bootstrap/collapse';
@@ -27,44 +27,38 @@ export class AccordionPanelComponent implements OnInit, OnDestroy {
   /** turn on/off animation */
   isAnimated = false;
   /** Clickable text in accordion's group header, check `accordion heading` below for using html in header */
-  @Input() heading!: string;
+  public heading = input<string>();
   /** Provides an ability to use Bootstrap's contextual panel classes
    * (`panel-primary`, `panel-success`, `panel-info`, etc...).
    * List of all available classes [available here]
    * (https://getbootstrap.com/docs/3.3/components/#panels-alternatives)
    */
-  @Input() panelClass = 'panel-default';
+  public panelClass = input<string>('panel-default');
   /** if <code>true</code> — disables accordion group */
-  @Input() isDisabled = false;
+  public isDisabled = input<boolean>(false);
   /** Emits when the opened state changes */
-  @Output() isOpenChange: EventEmitter<boolean> = new EventEmitter();
+  public isOpenChange = output<boolean>();
 
   // Questionable, maybe .panel-open should be on child div.panel element?
   /** Is accordion group open or closed. This property supports two-way binding */
   @HostBinding('class.panel-open')
-  @Input()
-  get isOpen(): boolean {
-    return this._isOpen;
-  }
-
-  set isOpen(value: boolean) {
-    if (value !== this.isOpen) {
-      if (value) {
-        this.accordion.closeOtherPanels(this);
-      }
-      this._isOpen = value;
-      Promise.resolve(null)
-      .then(() => {
-        this.isOpenChange.emit(value);
-      });
-    }
-  }
+  public isOpen = model<boolean>(false);
 
   protected _isOpen = false;
   protected accordion: AccordionComponent;
 
   constructor(@Inject(AccordionComponent) accordion: AccordionComponent) {
     this.accordion = accordion;
+
+    this.isOpen.subscribe((value) => {
+      if (value !== this._isOpen) {
+        if (value) {
+          this.accordion.closeOtherPanels(this);
+        }
+        this._isOpen = value;
+        this.isOpenChange.emit(value);
+      }
+    });
   }
 
   ngOnInit(): void {
@@ -76,8 +70,8 @@ export class AccordionPanelComponent implements OnInit, OnDestroy {
   }
 
   toggleOpen(): void {
-    if (!this.isDisabled) {
-      this.isOpen = !this.isOpen;
+    if (!this.isDisabled()) {
+      this.isOpen.set(!this.isOpen());
     }
   }
 }
diff --git a/src/accordion/accordion.component.ts b/src/accordion/accordion.component.ts
index c6782fa87a..d62233c0f2 100644
--- a/src/accordion/accordion.component.ts
+++ b/src/accordion/accordion.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core';
+import { Component, effect, input } from '@angular/core';
 import { AccordionPanelComponent } from './accordion-group.component';
 import { AccordionConfig } from './accordion.config';
 
@@ -8,7 +8,7 @@ import { AccordionConfig } from './accordion.config';
     template: `<ng-content></ng-content>`,
     // eslint-disable-next-line @angular-eslint/no-host-metadata-property
     host: {
-        '[attr.aria-multiselectable]': 'closeOthers',
+        '[attr.aria-multiselectable]': '_closeOthers',
         role: 'tablist',
         class: 'panel-group',
         style: 'display: block'
@@ -17,30 +17,38 @@ import { AccordionConfig } from './accordion.config';
 })
 export class AccordionComponent {
   /** turn on/off animation */
-  @Input() isAnimated = false;
+  isAnimated = input<boolean>(false);
+  _isAnimated = this.isAnimated();
+
   /** if `true` expanding one item will close all others */
-  @Input() closeOthers = false;
+  closeOthers = input<boolean>(false);
+  _closeOthers = this.closeOthers();
 
   protected groups: AccordionPanelComponent[] = [];
 
   constructor(config: AccordionConfig) {
     Object.assign(this, config);
+    effect(() => {
+      this._isAnimated = this.isAnimated();
+      this._closeOthers = this.closeOthers();
+
+    });
   }
 
   closeOtherPanels(openGroup: AccordionPanelComponent): void {
-    if (!this.closeOthers) {
+    if (!this._closeOthers) {
       return;
     }
 
     this.groups.forEach((group: AccordionPanelComponent) => {
       if (group !== openGroup) {
-        group.isOpen = false;
+        group.isOpen.set(false);
       }
     });
   }
 
   addGroup(group: AccordionPanelComponent): void {
-    group.isAnimated = this.isAnimated;
+    group.isAnimated = this._isAnimated;
     this.groups.push(group);
   }