diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 520b68177..2f1c164c9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -13,6 +13,7 @@ Release with new features and bugfixes:
 * https://github.com/devonfw/ide/issues/1080[#1080]: auto-configure IntelliJ core settings
 * https://github.com/devonfw/ide/issues/1104[#1104]: IntelliJ plugin installation not working
 * https://github.com/devonfw/ide/issues/1099[#1099]: progress output when project is cloned
+* https://github.com/devonfw/ide/issues/1098[#1098]: devon node version set buggy
 
 The full list of changes for this release can be found in https://github.com/devonfw/ide/milestone/43?closed=1[milestone 2023.04.001].
 
diff --git a/scripts/src/main/resources/scripts/functions b/scripts/src/main/resources/scripts/functions
index 1d0764507..76506322e 100644
--- a/scripts/src/main/resources/scripts/functions
+++ b/scripts/src/main/resources/scripts/functions
@@ -1838,13 +1838,18 @@ function doSetSoftwareVersion() {
       doUpdateMirrors
       version="$(head -n 1 "${DEVON_IDE_HOME}/mirrors/${software}/available-versions")"
     fi
-    local software_version_variable
-    software_version_variable="$(echo "${software}" | awk '{print toupper($0)}')_VERSION"
+    local software_version_variable="${software}"
+    # temporary workaround for #1098 should be fixed and removed with #1085
+    if [ "${software_version_variable}" = "nodejs" ]
+    then
+      software_version_variable="node"
+    fi
+    software_version_variable="$(echo "${software_version_variable}" | awk '{print toupper($0)}')_VERSION"
     local devon_properties="${DEVON_IDE_HOME}/settings/devon.properties"
     grep -v "${software_version_variable}" "${devon_properties}" > "${devon_properties}.tmp"
     mv "${devon_properties}.tmp" "${devon_properties}"
-    echo "${software_version_variable}=\"${version}\"" >> "${devon_properties}"
-    doEchoInteraction "${software_version_variable}=\"${version}\" has been set in ${devon_properties}\nTo install that version call the following command:\ndevon ${commandlet} setup"
+    echo "${software_version_variable}=${version}" >> "${devon_properties}"
+    doEchoInteraction "${software_version_variable}=${version} has been set in ${devon_properties}\nTo install that version call the following command:\ndevon ${commandlet} setup"
   else
     doError "You have to specify the version you want to set."
   fi