diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 318ffb32f..059309619 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -2,10 +2,11 @@ steps:
   - name: gcr.io/cloud-builders/docker
     args:
     - 'build'
-    - '--build-arg NFD_VERSION=$_GIT_TAG'
-    - '--build-arg HOSTMOUNT_PREFIX=/host-'
-    - '-t gcr.io/$PROJECT_ID/node-feature-discovery:$_GIT_TAG'
-    - '-t gcr.io/$PROJECT_ID/node-feature-discovery:$_PULL_BASE_REF'
+    - '--build-arg=VERSION=$_GIT_TAG'
+    - '--build-arg=HOSTMOUNT_PREFIX=/host-'
+    - '--tag=gcr.io/$PROJECT_ID/node-feature-discovery:$_GIT_TAG'
+    - '--tag=gcr.io/$PROJECT_ID/node-feature-discovery:$_PULL_BASE_REF'
+    - '--tag=gcr.io/$PROJECT_ID/node-feature-discovery:$_PULL_BASE_REF-g$COMMIT_SHA'
     - '.'
 substitutions:
   _GIT_TAG: '0.0.0'
@@ -16,3 +17,4 @@ options:
 images:
   - 'gcr.io/$PROJECT_ID/node-feature-discovery:$_GIT_TAG'
   - 'gcr.io/$PROJECT_ID/node-feature-discovery:$_PULL_BASE_REF'
+  - 'gcr.io/$PROJECT_ID/node-feature-discovery:$_PULL_BASE_REF-g$COMMIT_SHA'