diff --git a/.pipelines/containers/manifest-template.yaml b/.pipelines/containers/manifest-template.yaml
index c5772d1a70..7405d2c6d6 100644
--- a/.pipelines/containers/manifest-template.yaml
+++ b/.pipelines/containers/manifest-template.yaml
@@ -4,47 +4,51 @@ parameters:
   tag: ""
 
 steps:
-- task: Docker@2
-  displayName: Login
-  inputs:
-    containerRegistry: $(ACR_SERVICE_CONNECTION)
-    command: 'login'
-    addPipelineData: false
+  - task: Docker@2
+    displayName: Login
+    inputs:
+      containerRegistry: $(ACR_SERVICE_CONNECTION)
+      command: "login"
+      addPipelineData: false
 
-- script: |
-    set -e
-    make ${{ parameters.name }}-multiarch-manifest-create PLATFORMS="${{ parameters.platforms }}" TAG=${{ parameters.tag }}
-    make ${{ parameters.name }}-image-info TAG=${{ parameters.tag }}
-  name: manifest_build
-  displayName: Manifest Build
+  - script: |
+      set -e
+      make ${{ parameters.name }}-multiarch-manifest-create PLATFORMS="${{ parameters.platforms }}" TAG=${{ parameters.tag }}
+      make ${{ parameters.name }}-image-info TAG=${{ parameters.tag }}
+    name: manifest_build
+    displayName: Manifest Build
 
-- script: |
-    set -e
-    make multiarch-manifest-push IMAGE=$(make ${{ parameters.name }}-image-name) TAG=${{ parameters.tag }}
-    make container-pull IMAGE=$(make ${{ parameters.name }}-image-name) TAG=${{ parameters.tag }}
-  name: manifest_push
-  displayName: Manifest Push
+  - script: |
+      set -e
+      export IMAGE=$(make ${{ parameters.name }}-image-name)
+      export TAG=${{ parameters.tag }}
+      make multiarch-manifest-push IMAGE=$IMAGE TAG=$TAG
+      make container-pull IMAGE=$IMAGE TAG=$TAG
+      mkdir -p $(Build.ArtifactStagingDirectory)/images
+      skopeo copy --all docker://$IMAGE_REGISTRY/$IMAGE:$TAG oci-archive:$(Build.ArtifactStagingDirectory)/images/$IMAGE-$TAG.tar
+    name: manifest_push
+    displayName: Manifest Push
 
-- task: Docker@2
-  displayName: Logout
-  inputs:
-    containerRegistry: $(ACR_SERVICE_CONNECTION)
-    command: 'logout'
-    addPipelineData: false
+  - task: Docker@2
+    displayName: Logout
+    inputs:
+      containerRegistry: $(ACR_SERVICE_CONNECTION)
+      command: "logout"
+      addPipelineData: false
 
-- task: CopyFiles@2
-  inputs:
-    sourceFolder: "output"
-    targetFolder: $(Build.ArtifactStagingDirectory)
-  condition: succeeded()
+  - task: CopyFiles@2
+    inputs:
+      sourceFolder: "output"
+      targetFolder: $(Build.ArtifactStagingDirectory)
+    condition: succeeded()
 
-- task: ManifestGeneratorTask@0
-  displayName: "Add SBOM Generator tool"
-  inputs:
-    BuildDropPath: '$(Build.ArtifactStagingDirectory)'
+  - task: ManifestGeneratorTask@0
+    displayName: "Add SBOM Generator tool"
+    inputs:
+      BuildDropPath: "$(Build.ArtifactStagingDirectory)"
 
-- task: PublishBuildArtifacts@1
-  inputs:
-    artifactName: "output"
-    pathtoPublish: "$(Build.ArtifactStagingDirectory)"
-  condition: succeeded()
+  - task: PublishBuildArtifacts@1
+    inputs:
+      artifactName: "output"
+      pathtoPublish: "$(Build.ArtifactStagingDirectory)"
+    condition: succeeded()
diff --git a/Makefile b/Makefile
index 209a36745d..ac1350db8d 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,6 @@ container-info: # util target to write container info file. do not invoke direct
 	sudo mkdir -p $(IMAGE_DIR) 
 	sudo chown -R $$(whoami) $(IMAGE_DIR) 
 	sudo chmod -R 777 $(IMAGE_DIR)
-	echo $(IMAGE):$(TAG) > $(IMAGE_DIR)/$(FILE)
 
 cni-manager-image-name: # util target to print the CNI manager image name.
 	@echo $(CNI_IMAGE)