diff --git a/.github/workflows/datadog-analysis.yml b/.github/workflows/datadog-analysis.yml
deleted file mode 100644
index c02d93f7e3c0..000000000000
--- a/.github/workflows/datadog-analysis.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Datadog Static Analysis
-on:
-  push:
-    branches:
-      - 'main'
-      - 'release/**'
-      - 'pre-release/**'
-    paths-ignore:
-      - '**/*.md'
-  workflow_dispatch:
-  create:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-
-jobs:
-  static-analysis:
-    runs-on: ec2-runners
-    container:
-      image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
-    name: Datadog Static Analyzer
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Check code meets quality and security standards
-        id: datadog-static-analysis
-        uses: DataDog/datadog-static-analyzer-github-action@v1
-        with:
-          dd_api_key: ${{ secrets.DD_API_KEY }}
-          dd_app_key: ${{ secrets.DD_APP_KEY }}
-          dd_service: islandis
-          dd_env: ci
-          dd_site: datadoghq.eu
-          cpu_count: 2
-      - name: Check imported libraries are secure and compliant
-        id: datadog-software-composition-analysis
-        uses: DataDog/datadog-sca-github-action@main
-        with:
-          dd_api_key: ${{ secrets.DD_API_KEY }}
-          dd_app_key: ${{ secrets.DD_APP_KEY }}
-          dd_service: islandis
-          dd_env: ci
-          dd_site: datadoghq.eu
diff --git a/scripts/ci/00_prepare-base-tags.sh b/scripts/ci/00_prepare-base-tags.sh
index bfc83b8a63bd..0646576795c9 100755
--- a/scripts/ci/00_prepare-base-tags.sh
+++ b/scripts/ci/00_prepare-base-tags.sh
@@ -24,7 +24,7 @@ if [[ "$BUILD_REF" != "$LAST_GOOD_BUILD_SHA" ]]; then
   git log -1 "$BUILD_REF"
 fi
 LAST_GOOD_BUILD_DOCKER_BRANCH_TAG=$(echo "${LAST_GOOD_BUILD_BRANCH}" | tr "/." "-" )
-export LAST_GOOD_BUILD_DOCKER_TAG=${LAST_GOOD_BUILD_DOCKER_BRANCH_TAG:0:45}_${LAST_GOOD_BUILD_SHA}_${LAST_GOOD_BUILD_RUN_NUMBER}
+export LAST_GOOD_BUILD_DOCKER_TAG=${LAST_GOOD_BUILD_DOCKER_BRANCH_TAG:0:45}_${LAST_GOOD_BUILD_SHA:0:10}_${LAST_GOOD_BUILD_RUN_NUMBER}
 if [[ "$BUILD_REF" == "null" || "$BUILD_REF" == "" ]]; then
     curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"Change detection failed for $HTML_URL\"}" "$ISSUE_REPORTING_SLACK_WEBHOOK_URL"
     exit 1