diff --git a/README.md b/README.md
index 8e553b3..a1592ac 100644
--- a/README.md
+++ b/README.md
@@ -21,13 +21,10 @@ This action requires 3 input variables:
 - **riskscore**: this variable will contain the risk score calculated by OWASP Dependency Track based on the found vulnerabilities. This output can be used to make decision such as notify the developer or use it as the input of the next step of the workflow.
 ## Supported languages
 Currently this action supports the generation of upload of projects devloped in the languages as follows:
-- **Node.js**: define the language variable as `nodejs`. `npm install` will be executed within the container to gather all the dependencies.  
-- **Python**: define the language variable as `python`. It will get the package information from requirements.txt. 
-- **Golang**: define the language variable as `golang`. It will get the package information from go.mod, which is typically present in the repository.
-- **Ruby**: define the language variable as `ruby`. It will get the package information from Gemfile.lock. 
 - **Maven**: define the language variable as `java`. It will get the package information from pom.xml.
-- **NuGet (.NET)**: define the language variable as `dotnet`. It will get the package information from a .sln, .csproj, .vbproj, or packages.config file. 
-- **Php Composer**: define the language variable as `php`. It will get the package information from composer.json.
+- **Python**: define the language variable as `python`. It will get the package information from requirements.txt.
+- **npm**: define the language variable as `npm`. `npm install` will be executed within the container to gather all the dependencies.
+- **pnpm**: define the language variable as `pnpm`. `pnpm install` will be executed within the container to gather all the dependencies.
 
 
 Please note that if any of the files above is not available the action will fail when trying to generate the BoM files. 
diff --git a/action.yaml b/action.yaml
index 356a673..ed613e3 100644
--- a/action.yaml
+++ b/action.yaml
@@ -17,7 +17,7 @@ inputs:
   language:
     description: 'Programming language'
     required: true
-    default: 'nodejs'
+    default: 'java'
   paths:
     description: 'Array of paths to specific files or directories to be analyzed'
     required: false
diff --git a/entrypoint.sh b/entrypoint.sh
index d06dc7d..060cf6f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -114,6 +114,35 @@ python() {
     upload_bom "bom.json" "."
 }
 
+process_npm() {
+    echo "[*]  Processing npm BoM"
+    curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+    apt-get install -y nodejs
+    npm install
+    npm audit fix --force
+    if [ ! $? = 0 ]; then
+        echo "[-] Error executing npm install. Stopping the action!"
+        exit 1
+    fi
+    npx --yes cyclonedx-bom -o bom.xml
+    upload_bom "bom.xml" "."
+}
+
+process_pnpm() {
+    echo "[*]  Processing pnpm BoM"
+    curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+    apt-get install -y nodejs
+    npm install -g pnpm
+    pnpm install
+    pnpm audit --fix
+    if [ ! $? = 0 ]; then
+        echo "[-] Error executing pnpm install. Stopping the action!"
+        exit 1
+    fi
+    npx --yes cyclonedx-bom -o bom.xml
+    upload_bom "bom.xml" "."
+}
+
 java
 
 case $LANGUAGE in
@@ -124,6 +153,15 @@ case $LANGUAGE in
 "python")
     python
     ;;
+
+"npm")
+    process_npm
+    ;;
+
+"pnpm")
+    process_pnpm
+    ;;
+
 *)
     echo "[-] Unsupported language: $LANGUAGE"
     exit 1