diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60515ff2eb1f..194327c3efb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,7 @@ variables:
   PFBUILD_CENTOS_8_IMG: ghcr.io/inverse-inc/packetfence/pfbuild-centos-8
   PFBUILD_DEB_BULLSEYE_IMG: ghcr.io/inverse-inc/packetfence/pfbuild-debian-bullseye
   KANIKO_DEBUG_IMG: gcr.io/kaniko-project/executor:debug
+  KANIKOBUILD_IMG: ghcr.io/inverse-inc/packetfence/kaniko-build
   KNK_REGISTRY: ghcr.io
   KNK_REGISTRY_URL: ${KNK_REGISTRY}/inverse-inc/packetfence
   KNK_CACHE: "true"
@@ -279,6 +280,14 @@ variables:
     - shell
 
 .build_img_container_job:
+  stage: build_img_container
+  dependencies: []
+  image:
+    name: ${KANIKOBUILD_IMG}
+  tags:
+    - docker
+
+.build_img_container_kanikobuild_job:
   stage: build_img_container
   dependencies: []
   image:
@@ -528,10 +537,19 @@ run_pipeline_if_necessary:
 # BUILD_IMG_CONTAINER JOBS
 ########################################
 # devel
+kaniko_dev:
+  extends:
+    - .build_img_container_kanikobuild_job
+    - .build_img_container_devel_rules
+  variables:
+    IMAGE_NAME: "kaniko-build"
+    IMAGE_TAGS: "${CI_COMMIT_REF_SLUG},latest"
+
 pfdeb_dev:
   extends:
     - .build_img_container_job
     - .build_img_container_devel_rules
+  needs: ["kaniko_dev"]
   variables:
     IMAGE_NAME: "pfdebian"
     IMAGE_TAGS: "${CI_COMMIT_REF_SLUG},latest"
@@ -569,6 +587,7 @@ img_dev:
   extends:
     - .build_img_container_job
     - .build_img_container_devel_rules
+  needs: ["kaniko_dev"]
   variables:
     IMAGE_TAGS: "${CI_COMMIT_REF_SLUG},latest"
   parallel:
@@ -593,10 +612,19 @@ rad_based_dev:
           - "radiusd-eduroam"
 
 # branches and maintenance
+kaniko_br_maint:
+  extends:
+    - .build_img_container_kanikobuild_job
+    - .build_img_container_branches_and_maintenance_rules
+  variables:
+    IMAGE_NAME: "kaniko-build"
+    IMAGE_TAGS: ${CI_COMMIT_REF_SLUG}
+
 pfdeb_br_maint:
   extends:
     - .build_img_container_job
     - .build_img_container_branches_and_maintenance_rules
+  needs: ["kaniko_br_maint"]
   variables:
     IMAGE_NAME: "pfdebian"
     IMAGE_TAGS: ${CI_COMMIT_REF_SLUG}
@@ -634,6 +662,7 @@ img_br_maint:
   extends:
     - .build_img_container_job
     - .build_img_container_branches_and_maintenance_rules
+  needs: ["kaniko_br_maint"]
   variables:
     IMAGE_TAGS: ${CI_COMMIT_REF_SLUG}
   parallel:
@@ -658,10 +687,19 @@ rad_based_br_maint:
           - "radiusd-eduroam"
 
 # release
+kaniko_rel:
+  extends:
+    - .build_img_container_kanikobuild_job
+    - .release_only_rules
+  variables:
+    IMAGE_NAME: "kaniko-build"
+    IMAGE_TAGS: ${CI_COMMIT_TAG}
+
 pfdeb_rel:
   extends:
     - .build_img_container_job
     - .release_only_rules
+  needs: ["kaniko_rel"]
   variables:
     IMAGE_NAME: "pfdebian"
     IMAGE_TAGS: ${CI_COMMIT_TAG}
@@ -696,14 +734,15 @@ pfdeb_based_rel:
           - "proxysql"
 
 img_rel:
- extends:
-   - .build_img_container_job
-   - .release_only_rules
- variables:
+  extends:
+    - .build_img_container_job
+    - .release_only_rules
+  needs: ["kaniko_rel"]
+  variables:
    IMAGE_TAGS: ${CI_COMMIT_TAG}
- parallel:
-   matrix:
-     - IMAGE_NAME:
+  parallel:
+    matrix:
+      - IMAGE_NAME:
           - "fingerbank-db"
 
 rad_based_rel:
diff --git a/containers/kaniko-build/Dockerfile b/containers/kaniko-build/Dockerfile
new file mode 100644
index 000000000000..01425635e0f9
--- /dev/null
+++ b/containers/kaniko-build/Dockerfile
@@ -0,0 +1,6 @@
+FROM gcr.io/kaniko-project/executor:debug
+
+COPY containers/kanikobuild /bin/kanikobuild
+RUN chmod +x /bin/kanikobuild
+
+ENTRYPOINT /bin/kanikobuild
diff --git a/containers/manage-images.sh b/containers/manage-images.sh
index 8264da632a7b..84fdc850e61e 100755
--- a/containers/manage-images.sh
+++ b/containers/manage-images.sh
@@ -24,6 +24,7 @@ configure_and_check() {
                            -not -path "*/pfdebian/*" \
                            -not -path "*/radiusd/*" \
                            -not -path "*/pfconnector-*/*" \
+                           -not -path "*/kaniko-build/*" \
                            -printf "%P\n")
 
     for file in ${DOCKERFILE_DIRS}; do