diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7b56150e60c84a95981a131b0b8ab4933d89d54..1e6325cdb92fa1becd542e959b430729fec6050b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -36,7 +36,7 @@ variables:
 # include jobs
 include:
   - project: $PIPELINE_TEMPLATE_PROJECT
-    ref: v0.0.12
+    ref: v1.1.1
     file:
       - gitlab-ci/common_gitlab-ci.yml
       - gitlab-ci/docker-image-base_gitlab-ci.yml
diff --git a/.gitlab/Dockerfiles/kas-build-image/Dockerfile b/.gitlab/Dockerfiles/kas-build-image/Dockerfile
deleted file mode 100644
index 7d631fd8adb80f792b2e0c10d87890b3aa62eb58..0000000000000000000000000000000000000000
--- a/.gitlab/Dockerfiles/kas-build-image/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
-#
-# SPDX-License-Identifier: MIT
-ARG GHCR_MIRROR=ghcr.io/
-
-FROM ${GHCR_MIRROR}siemens/kas/kas
-
-ARG local_user=cassini-ci
-ARG user_id=999
-ARG group_id=999
-
-RUN groupadd -g $group_id $local_user && useradd --no-log-init -m -d /builder -g $local_user -u $user_id $local_user \
-  && chown -R $local_user:$local_user /builder \
-  && cd /builder
-
-USER $local_user
diff --git a/.gitlab/ci/cassini-build.yml b/.gitlab/ci/cassini-build.yml
index 50a21993ecd43d4d919aa74bbe8a7eb5a634f8b1..8b5f5fa59cc7f56016d13e3f3681902a30e65c10 100644
--- a/.gitlab/ci/cassini-build.yml
+++ b/.gitlab/ci/cassini-build.yml
@@ -13,10 +13,15 @@
     TOOLCHAIN_DIR: $CACHE_DIR/$PROJECT_VERSION/toolchains
 
 .kas_build:
-  image: $CI_REGISTRY/$CI_PROJECT_PATH/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG
+  image: ${MIRROR_GHCR}/siemens/kas/kas:3.2
   variables:
-    DOCKER_IMAGE_NAME: kas-build-image
     KAS_REPO_REF_DIR: $CACHE_DIR/$PROJECT_VERSION/repos
+    # These are needed as GitLab doesn't respect the container
+    # entrypoint by default
+    FF_KUBERNETES_HONOR_ENTRYPOINT: 1
+    FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0
+    USER_ID: 999
+    GROUP_ID: 999
 
 # Extend the kas base build to enab;e to use of repos that are not yet public
 .kas_build_cassini:
@@ -36,6 +41,7 @@
         https://${CI_SERVER_HOST}
     - git config --global user.email "you@example.com"
     - git config --global user.name "Your Name"
+    - git config --global --add safe.directory ${CI_PROJECT_DIR}
     # export parent pipeline global variables
     - echo PARENT_PIPELINE_ID = $PARENT_PIPELINE_ID
     - !reference [".kas_build", before_script]
diff --git a/.gitlab/ci/docker-image-builds.yml b/.gitlab/ci/docker-image-builds.yml
index de26eab104f76456e4e95b539f3cef7c7f8d5736..6debbb5abf7b85b1f7fb269b68e87d94f4f55e35 100644
--- a/.gitlab/ci/docker-image-builds.yml
+++ b/.gitlab/ci/docker-image-builds.yml
@@ -1,8 +1,12 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
-Build-Kas-Docker-Arch-Image:
+# Conditions
+.if-new-merge-request: &if-new-merge-request
+  if: '$CI_MERGE_REQUEST_IID && ($CI_MERGE_REQUEST_PROJECT_ID != $CI_MERGE_REQUEST_SOURCE_PROJECT_ID)'
+
+Build-Utility-Docker-Arch-Image:
   extends: .build-docker-image
   parallel: &Build-Matrix
     matrix:
@@ -10,34 +14,11 @@ Build-Kas-Docker-Arch-Image:
         ARCH_SUFFIX: -amd64
       - BUILD_ARCH: arm64
         ARCH_SUFFIX: -arm64v8
-  tags: &Build-Kas-Docker-Arch-Image_tags
+  tags: &Build-Arch-Image_tags
     - ${BUILD_ARCH}
-  variables: &Build-Kas-Docker-Arch-Image_variables
-    DOCKER_IMAGE_NAME: kas-build-image
-    KANIKO_BUILD_CONTEXT: $CI_PROJECT_DIR/.gitlab/Dockerfiles/$DOCKER_IMAGE_NAME
-  rules: &Build-Kas-Docker-Arch-Image_rules
-    - changes:
-        - .gitlab-ci.yml
-        - .gitlab/ci/docker-image-builds.yml
-        - .gitlab/Dockerfiles/kas-build-image/**/*
-
-Build-Kas-Docker-Image:
-  extends:
-    - .build-docker-image
-    - .build-docker-multiarch-image
-  variables: *Build-Kas-Docker-Arch-Image_variables
-  rules: *Build-Kas-Docker-Arch-Image_rules
-  needs:
-    - job: Build-Kas-Docker-Arch-Image
-      artifacts: false
-
-Build-Utility-Docker-Arch-Image:
-  extends: .build-docker-image
-  parallel: *Build-Matrix
-  tags: *Build-Kas-Docker-Arch-Image_tags
   variables: &Build-Utility-Docker-Arch-Image_variables
     DOCKER_IMAGE_NAME: utility-image
-    KANIKO_BUILD_CONTEXT: $CI_PROJECT_DIR/.gitlab/Dockerfiles/$DOCKER_IMAGE_NAME
+    BUILD_CONTEXT: $CI_PROJECT_DIR/.gitlab/Dockerfiles/$DOCKER_IMAGE_NAME
   rules: &Build-Utility-Docker-Arch-Image_rules
     - changes:
         - .gitlab-ci.yml
@@ -57,10 +38,10 @@ Build-Utility-Docker-Image:
 Build-Lava-Docker-Arch-Image:
   extends: .build-docker-image
   parallel: *Build-Matrix
-  tags: *Build-Kas-Docker-Arch-Image_tags
+  tags: *Build-Arch-Image_tags
   variables: &Build-Lava-Docker-Arch-Image_variables
     DOCKER_IMAGE_NAME: lava-test-image
-    KANIKO_BUILD_CONTEXT: $CI_PROJECT_DIR/.gitlab/Dockerfiles/$DOCKER_IMAGE_NAME
+    BUILD_CONTEXT: $CI_PROJECT_DIR/.gitlab/Dockerfiles/$DOCKER_IMAGE_NAME
   rules: &Build-Lava-Docker-Arch-Image_rules
     - changes:
         - .gitlab-ci.yml
diff --git a/.gitlab/ci/trigger-image-builds.yml b/.gitlab/ci/trigger-image-builds.yml
index 26cc461d736351d0c1d9f303257fa1aabc8d4ac0..2787ee0cfc93fea3ec074c1089033475306602c6 100644
--- a/.gitlab/ci/trigger-image-builds.yml
+++ b/.gitlab/ci/trigger-image-builds.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -38,9 +38,6 @@ merge_jobs:
 trigger_jobs:
   needs:
     - merge_jobs
-    - job: Build-Kas-Docker-Image
-      optional: true
-      artifacts: false
     - job: Build-Utility-Docker-Image
       optional: true
       artifacts: false