diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae365d25..665b71dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -873,8 +873,6 @@ black-duck:
     - if: ( $SCHEDULED_JOB_TO_RUN == "run-blackduck-scan" )
   script:
     - export PROJECTNAME="${BLACKDUCK_PROJECT_NAME}"
-    - apt update -y
-    - apt install default-jdk -y
     - echo "-------Starting Black Duck Scan-------"
     - bash <(curl -s -L ${BLACKDUCK_DETECT_SCRIPT})
       --blackduck.url="${BLACKDUCK_URL}"
diff --git a/bsp/common/syscalls_stub.c b/bsp/common/syscalls_stub.c
index 6c5b077c..875f3a76 100644
--- a/bsp/common/syscalls_stub.c
+++ b/bsp/common/syscalls_stub.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Based on: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/platform/ext/common/syscalls_stub.c?id=9ca8a5eb3c85eecee1303dffa262800ea0385584
+ * Based on: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m.git/+/9ca8a5eb3c85eecee1303dffa262800ea0385584/platform/ext/common/syscalls_stub.c
  *
  */
 
diff --git a/release_changes/202507041323.change.md b/release_changes/202507041323.change.md
new file mode 100644
index 00000000..e243ed1c
--- /dev/null
+++ b/release_changes/202507041323.change.md
@@ -0,0 +1,2 @@
+ci: Remove redundant default-jdk installation
+syscalls-stub: Fix TF-M link