diff --git a/.github/workflows/onCodeChanges.yml b/.github/workflows/onCodeChanges.yml
index bf2f7af..9a46048 100644
--- a/.github/workflows/onCodeChanges.yml
+++ b/.github/workflows/onCodeChanges.yml
@@ -336,7 +336,6 @@ jobs:
           id: get_date
           run: |
             echo "$(date +'%d/%m/%Y_%H:%M:%S')" > DATE_HOUR
-            echo "metadata=$(cat DATE_HOUR)" > DATE_HOUR_TAG
             echo "DATE_HOUR_TAG=$(cat DATE_HOUR_TAG)" >> $GITHUB_OUTPUT
           
  ##################### Here we check the release version and replace Custom with stable only for the image name ######################
@@ -816,4 +815,4 @@ jobs:
             repository: ${{ env.REPOSITORY_NAME }}
             event-type: cron_trigger
             client-payload: '{"type": "cron_trigger", "img_list": "${{ needs.check_files.outputs.children_matrix }}"}'
-            
+            
\ No newline at end of file
diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml
index 39cfd5a..e58416b 100644
--- a/.github/workflows/pr-validation.yaml
+++ b/.github/workflows/pr-validation.yaml
@@ -152,18 +152,18 @@ jobs:
           while read -r line || [ -n "$line" ]
           do
             # Expand workflow and env variables in the line
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{matrix.apps}}/${{matrix.apps}}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{matrix.version}}/${{matrix.version}}/g' temp.tmp && cat temp.tmp)
             line=$(echo "$line" > temp.tmp && sed -i 's/{{matrix.tag}}/${{matrix.tag}}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{steps.get_version.outputs.VERSION}}/${{steps.get_version.outputs.VERSION}}/g' temp.tmp && cat temp.tmp)
             line=$(echo "$line" > temp.tmp && sed -i 's/{{steps.get_version.outputs.TAG}}/${{steps.get_version.outputs.TAG}}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{steps.get_date.outputs.DATE_HOUR_TAG}}/${{ steps.get_date.outputs.DATE_HOUR_TAG }}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.REGISTRY}}/${{ env.REGISTRY }}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's@{{env.REPOSITORY_NAME}}@${{ env.REPOSITORY_NAME }}@g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.IMAGE_PREFIX}}/${{ env.IMAGE_PREFIX }}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.REPOSITORY_OWNER}}/${{ env.REPOSITORY_OWNER }}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.DEFAULT_USER}}/${{ env.DEFAULT_USER }}/g' temp.tmp && cat temp.tmp)
-            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.SUPERBUILD_TAG}}/${{ env.SUPERBUILD_TAG }}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{matrix.version}}/${{matrix.version}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{matrix.apps}}/${{matrix.apps}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{steps.get_version.outputs.VERSION}}/${{steps.get_version.outputs.VERSION}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{steps.get_date.outputs.DATE_HOUR_TAG}}/${{steps.get_date.outputs.DATE_HOUR_TAG}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.REGISTRY}}/${{env.REGISTRY}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's@{{env.REPOSITORY_NAME}}@${{env.REPOSITORY_NAME}}@g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.IMAGE_PREFIX}}/${{env.IMAGE_PREFIX}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.REPOSITORY_OWNER}}/${{env.REPOSITORY_OWNER}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.DEFAULT_USER}}/${{env.DEFAULT_USER}}/g' temp.tmp && cat temp.tmp)
+            line=$(echo "$line" > temp.tmp && sed -i 's/{{env.SUPERBUILD_TAG}}/${{env.SUPERBUILD_TAG}}/g' temp.tmp && cat temp.tmp)
 
             if [ "$line" == "[sources]" ]
             then
diff --git a/dockerfile_images/basic/superbuild-icubhead-withuser/conf_build.ini b/dockerfile_images/basic/superbuild-icubhead-withuser/conf_build.ini
index d988848..8a565a2 100644
--- a/dockerfile_images/basic/superbuild-icubhead-withuser/conf_build.ini
+++ b/dockerfile_images/basic/superbuild-icubhead-withuser/conf_build.ini
@@ -1,6 +1,6 @@
 [sources]
 START_IMG=ubuntu:jammy
-metadata={{steps.get_date.outputs.DATE_HOUR}}
+metadata={{steps.get_date.outputs.DATE_HOUR_TAG}}
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}