diff --git a/nodepool/elements/puppet/install.d/95-clean-repos b/nodepool/elements/puppet/install.d/95-clean-repos
index 1c37a5f44f..a5a4e24a17 100755
--- a/nodepool/elements/puppet/install.d/95-clean-repos
+++ b/nodepool/elements/puppet/install.d/95-clean-repos
@@ -45,6 +45,10 @@ case $OS_FAMILY in
         repo=/tmp/fakerepo
         update=""
         ;;
+    "Suse")
+        repo=/etc/zypp/repos.d/systemsmanagement_puppet.repo
+        update=""
+        ;;
     *)
         die "Don't know how to cleanup!"
         ;;
diff --git a/nodepool/elements/stackviz/pkg-map b/nodepool/elements/stackviz/pkg-map
index 3c850bc940..555ca5332e 100644
--- a/nodepool/elements/stackviz/pkg-map
+++ b/nodepool/elements/stackviz/pkg-map
@@ -4,6 +4,12 @@
       "24": {
         "npm": ""
       }
+    },
+    "opensuse": {
+      "42.2": {
+        "nodejs": "nodejs4",
+        "npm": "npm4"
+      }
     }
   },
   "family": {
@@ -11,7 +17,8 @@
       "nodejs": "nodejs-legacy"
     },
     "suse": {
-      "npm": "nodejs-npm"
+      "nodejs": "nodejs6",
+      "npm": "npm6"
     }
   },
   "default": {
diff --git a/nodepool/elements/zuul-worker/pkg-map b/nodepool/elements/zuul-worker/pkg-map
index 36e677f2c8..e1a5bbf20d 100644
--- a/nodepool/elements/zuul-worker/pkg-map
+++ b/nodepool/elements/zuul-worker/pkg-map
@@ -5,6 +5,9 @@
     },
     "gentoo": {
       "libselinux-python": "sys-libs/libselinux"
+    },
+    "suse": {
+      "libselinux-python": ""
     }
   }
 }