diff --git a/apps/scandic-web/hooks/booking/useAvailablePaymentOptions.ts b/apps/scandic-web/hooks/booking/useAvailablePaymentOptions.ts
index 0947e3209..38ad26c7b 100644
--- a/apps/scandic-web/hooks/booking/useAvailablePaymentOptions.ts
+++ b/apps/scandic-web/hooks/booking/useAvailablePaymentOptions.ts
@@ -7,7 +7,9 @@ import { PaymentMethodEnum } from "@/constants/booking"
 export function useAvailablePaymentOptions(
   otherPaymentOptions: PaymentMethodEnum[]
 ) {
-  const [availablePaymentOptions, setAvailablePaymentOptions] = useState(
+  const [availablePaymentOptions, setAvailablePaymentOptions] = useState<
+    PaymentMethodEnum[]
+  >(
     otherPaymentOptions.filter(
       (option) => option !== PaymentMethodEnum.applePay
     )
diff --git a/apps/scandic-web/i18n/index.ts b/apps/scandic-web/i18n/index.ts
index 8d72b208f..078a48d76 100644
--- a/apps/scandic-web/i18n/index.ts
+++ b/apps/scandic-web/i18n/index.ts
@@ -31,6 +31,5 @@ export async function getIntl(options?: { lang: Lang | undefined }) {
     )
   }
 
-  // Exclamation mark can be removed once we update TS to 5.8.2+
-  return instances[lang]!
+  return instances[lang]
 }
diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json
index 137bf8a5b..64a27c012 100644
--- a/apps/scandic-web/package.json
+++ b/apps/scandic-web/package.json
@@ -154,7 +154,7 @@
     "ts-jest": "^29.3.2",
     "ts-morph": "^25.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "5.4.5",
+    "typescript": "5.8.3",
     "typescript-plugin-css-modules": "^5.1.0"
   },
   "engines": {
diff --git a/apps/scandic-web/server/routers/contentstack/contentPage/utils.ts b/apps/scandic-web/server/routers/contentstack/contentPage/utils.ts
index f50d4ce53..190c660fc 100644
--- a/apps/scandic-web/server/routers/contentstack/contentPage/utils.ts
+++ b/apps/scandic-web/server/routers/contentstack/contentPage/utils.ts
@@ -95,7 +95,6 @@ export function getConnections({ content_page }: ContentPageRefs) {
         case ContentPageEnum.ContentStack.blocks.Content:
           {
             if (block.content.length) {
-              // @ts-expect-error: TS has trouble infering the filtered types
               connections.push(...block.content)
             }
           }
diff --git a/yarn.lock b/yarn.lock
index 802f4de3a..918a1cdee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8536,7 +8536,7 @@ __metadata:
     ts-jest: "npm:^29.3.2"
     ts-morph: "npm:^25.0.1"
     ts-node: "npm:^10.9.2"
-    typescript: "npm:5.4.5"
+    typescript: "npm:5.8.3"
     typescript-plugin-css-modules: "npm:^5.1.0"
     usehooks-ts: "npm:3.1.1"
     zod: "npm:^3.24.4"
@@ -23880,16 +23880,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.4.5":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
-  languageName: node
-  linkType: hard
-
 "typescript@npm:5.7.3":
   version: 5.7.3
   resolution: "typescript@npm:5.7.3"
@@ -23900,6 +23890,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:5.8.3":
+  version: 5.8.3
+  resolution: "typescript@npm:5.8.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>":
   version: 5.8.2
   resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
@@ -23910,16 +23910,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
-  languageName: node
-  linkType: hard
-
 "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>":
   version: 5.7.3
   resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
@@ -23930,6 +23920,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>":
+  version: 5.8.3
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
+  languageName: node
+  linkType: hard
+
 "typical@npm:^4.0.0":
   version: 4.0.0
   resolution: "typical@npm:4.0.0"