diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30976b2311203d3e61f10a047314c95b2d3eb460..3e098dd675a4a81ea06c4b7ed85afc9ae7403790 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
 variables:
   # CI_IMAGES_BASEPATH: Environment variable configure in gitlab
   CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/ci-images
-  CI_IMAGES_REVISION: 835a7096092eef5cecde23fd933209e7a8488637
+  CI_IMAGES_REVISION: 44965ccdd847f1e077670f49d546047f8ad0110c
   CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/python/3.9:${CI_IMAGES_REVISION}"
   CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
 
diff --git a/package_release.py b/package_release.py
index 93d4d5c147cb96a9bcec077da65d9e93f867b314..e141bc5f63f2b0d18db3d4542cff2d2fa3094d54 100755
--- a/package_release.py
+++ b/package_release.py
@@ -302,14 +302,15 @@ def main():
         )
 
     # Generate metadata
-    generate_metadata(
-        machine,
-        version,
-        artifacts_all,
-        sdkname,
-        output_dir,
-        outlocal_dir,
-    )
+    if args.sdk_dir is None:
+        generate_metadata(
+            machine,
+            version,
+            artifacts_all,
+            sdkname,
+            output_dir,
+            outlocal_dir,
+        )
 
     # Handle SDK if available
     if args.sdk_dir is not None: