diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5a535ca0..25a3338df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.0.17] - 2024-06-04
+
+- [ONCEHUB-25174] Fixed: Text links have rounded corner focus states in Safari browser
+
 ## [8.0.13] - 2024-03-04
 
 - [orion/ONCEHUB-78785-qa] es5-ext vulnerability has been fixed
diff --git a/package-lock.json b/package-lock.json
index 07ee58bbe..b4853b45d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "oncehub-ui",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oncehub-ui",
-      "version": "8.0.16",
+      "version": "8.0.17",
       "dependencies": {
         "@angular-devkit/architect": "0.1601.6",
         "@angular-devkit/core": "16.1.6",
diff --git a/package.json b/package.json
index d98d78b07..69037bebd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oncehub-ui",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "scripts": {
     "ng": "ng",
     "build": "ng build ui",
diff --git a/ui/package-lock.json b/ui/package-lock.json
index d937c5f1c..00a70a25a 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@oncehub/ui",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@oncehub/ui",
-      "version": "8.0.16",
+      "version": "8.0.17",
       "dependencies": {
         "tslib": "^2.4.0"
       }
diff --git a/ui/package.json b/ui/package.json
index 3f5d7fc84..becf4a3cf 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oncehub/ui",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "description": "Oncehub UI",
   "peerDependencies": {},
   "repository": {
diff --git a/ui/src/components/button/button.scss b/ui/src/components/button/button.scss
index 7606d7e81..7405783cc 100644
--- a/ui/src/components/button/button.scss
+++ b/ui/src/components/button/button.scss
@@ -113,7 +113,7 @@ $green-tick-icon: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTgiIGhlaWdodD0
     outline: 0 none;
   }
   &.cdk-keyboard-focused {
-    outline: solid 1px #006bb1 !important;
+    box-shadow: 0 0 0 1px #006bb1 !important;
     text-decoration: underline;
     border-radius: 5px;
   }
diff --git a/ui/src/components/button/button.ts b/ui/src/components/button/button.ts
index 57c51760e..dc513e564 100644
--- a/ui/src/components/button/button.ts
+++ b/ui/src/components/button/button.ts
@@ -59,6 +59,7 @@ export const OuiButtonMixinBase: CanDisableCtor &
   // eslint-disable-next-line @angular-eslint/no-host-metadata-property
   host: {
     '[disabled]': 'disabled || null',
+    '[tabindex]': 'tabIndex || 0',
   },
   templateUrl: 'button.html',
   styleUrls: ['button.scss'],