diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index f9bc95a11..3f1733806 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -21,7 +21,7 @@
 
 - name: Set up Node.js 6.x apt sources (debuntu)
   shell: curl -sL https://deb.nodesource.com/setup_6.x | bash -
-  when: internet_available and is_debuntu
+  when: internet_available and is_debuntu and not ubuntu-18
 
 - name: Install latest Node.js which includes /usr/bin/npm (debuntu)
   package:
@@ -29,7 +29,7 @@
     state: latest
 # package: name=nodejs=6.*
 #          state=present
-  when: internet_available and is_debuntu
+  when: internet_available and is_debuntu and not ubuntu-18
 
 - name: Install npm (OS's other than debuntu)
   package:
@@ -43,10 +43,11 @@
 - name: Install npm (ubuntu-18)
   package:
     name: "{{ item }}"
-    state: present
+    state: latest
   when: internet_available and is_ubuntu_18
   with_items:
     - npm
+    - nodejs
 
 # attempting to reinstall npm is broken on Raspbian 9
 - name: Check for Sugarizer already installed