diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 5f2f90797963cec26eef34030f7bb359f4a895bf..8b86e28b5eb78c4df67b7bed6e653174113f82c1 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -195,7 +195,7 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
@@ -207,8 +207,10 @@ oc.ocaml_fmt:
     - .gitlab-ci.yml
     - .gitlab/**/*
     when: on_success
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index c23eac2a4c3d467d11f28bd290c340c1467f9d51..73e0cccba101f52ae269ac31f3bb721c986d0396 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -195,7 +195,7 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
@@ -207,8 +207,10 @@ oc.ocaml_fmt:
     - .gitlab-ci.yml
     - .gitlab/**/*
     when: on_success
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index d49da8719c53bb318f9de4c12914b8a08760713c..148808655ce11e3b800a35a896cd9882538fcffe 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -188,14 +188,16 @@ docker:hadolint:
   - hadolint Dockerfile
 
 oc.ocaml_fmt:
-  image: ${ci_image_name_protected}/build:amd64--master
+  image: ${ci_image_name}/build:${ci_image_tag}
   stage: sanity
   tags:
   - gcp
   rules:
   - when: always
-  needs: []
-  dependencies: []
+  needs:
+  - oc.docker:ci:amd64
+  dependencies:
+  - oc.docker:ci:amd64
   timeout: 60 minutes
   cache:
     key: dune_cache-$CI_JOB_NAME_SLUG
diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml
index 075d0ebd95523eefb1e5bc3f7f0ee06967650710..8445bb416e21b2b8f534a598d1df08e53089fde4 100644
--- a/ci/bin/code_verification.ml
+++ b/ci/bin/code_verification.ml
@@ -423,7 +423,7 @@ let jobs pipeline_type =
       job
         ~__POS__
         ~name:"oc.ocaml_fmt"
-        ~image:Images.CI.build_master
+        ~image:Images.CI.build
         ~stage
         ~dependencies
         ~rules:(make_rules ~changes:changeset_ocaml_fmt_files ())
diff --git a/src/lib_agnostic_baker/commands.ml b/src/lib_agnostic_baker/commands.ml
index 9d283af42f0c59e29a7aa5dcd43efcd4f4e9fe7a..08096dbf989b5fa81831dd5405e1e3fe06432e96 100644
--- a/src/lib_agnostic_baker/commands.ml
+++ b/src/lib_agnostic_baker/commands.ml
@@ -267,7 +267,11 @@ module Baker = struct
         ~verbose_rpc_error_diagnostics:false
     in
     let* parsed, _remaining =
-      C.parse_config_args full (Array.to_list Sys.argv)
+      C.parse_config_args
+        full
+        (match Array.to_list Sys.argv with
+        | _ :: original_args -> original_args
+        | [] -> [])
     in
     let parsed_config_file = parsed.Client_config.parsed_config_file in
     let parsed_args = parsed.Client_config.parsed_args in