diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-image.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-image.sh
index 1db840a19e..917864249a 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-image.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-image.sh
@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
 #
-# Copyright 2021 Fabiano Fidêncio
+# Copyright 2022 Intel
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-KATA_DEPLOY_DIR="`dirname $0`/../"
-KATA_DEPLOY_ARTIFACT="$1"
+KATA_DEPLOY_DIR="`dirname $0`/../../kata-deploy-cc"
+KATA_DEPLOY_ARTIFACT="${1:-"kata-static.tar.xz"}"
 
 echo "Copying $KATA_DEPLOY_ARTIFACT to $KATA_DEPLOY_DIR"
 cp $KATA_DEPLOY_ARTIFACT $KATA_DEPLOY_DIR
 
 pushd $KATA_DEPLOY_DIR
 
-IMAGE_TAG="quay.io/kata-containers/kata-deploy-cc:v0"
+IMAGE_TAG="quay.io/confidential-containers/runtime-payload:kata-containers-$(git rev-parse HEAD)"
 
 echo "Building the image"
 docker build --tag $IMAGE_TAG .