diff --git a/action.yml b/action.yml
index 776b96f4..4a531221 100644
--- a/action.yml
+++ b/action.yml
@@ -1216,6 +1216,7 @@ runs:
     - run: |
         # Create environment file from inputs and GitHub variables
         echo "::group::Metrics docker image setup"
+        echo "GitHub action: $METRICS_ACTION ($METRICS_ACTION_PATH)"
         cd $METRICS_ACTION_PATH
         touch .env
         for INPUT in $(echo $INPUTS | jq -r 'to_entries|map("INPUT_\(.key|ascii_upcase)=\(.value|@uri)")|.[]'); do
@@ -1230,7 +1231,7 @@ runs:
         echo "Renders output folder: $METRICS_RENDERS"
 
         # Source repository (picked from action name)
-        METRICS_SOURCE=$(echo $METRICS_ACTION | sed -E 's/metrics.*?$//g')
+        METRICS_SOURCE=$(echo $METRICS_ACTION | sed -E 's/metrics.*?$//g' | sed -E 's/_//g')
         echo "Source: $METRICS_SOURCE"
 
         # Version (picked from package.json)
diff --git a/source/app/action/action.yml b/source/app/action/action.yml
index 5e21c22b..0e016b70 100644
--- a/source/app/action/action.yml
+++ b/source/app/action/action.yml
@@ -28,6 +28,7 @@ runs:
     - run: |
         # Create environment file from inputs and GitHub variables
         echo "::group::Metrics docker image setup"
+        echo "GitHub action: $METRICS_ACTION ($METRICS_ACTION_PATH)"
         cd $METRICS_ACTION_PATH
         touch .env
         for INPUT in $(echo $INPUTS | jq -r 'to_entries|map("INPUT_\(.key|ascii_upcase)=\(.value|@uri)")|.[]'); do
@@ -42,7 +43,7 @@ runs:
         echo "Renders output folder: $METRICS_RENDERS"
 
         # Source repository (picked from action name)
-        METRICS_SOURCE=$(echo $METRICS_ACTION | sed -E 's/metrics.*?$//g')
+        METRICS_SOURCE=$(echo $METRICS_ACTION | sed -E 's/metrics.*?$//g' | sed -E 's/_//g')
         echo "Source: $METRICS_SOURCE"
 
         # Version (picked from package.json)