diff --git a/nodepool/elements/infra-package-needs/package-installs.yaml b/nodepool/elements/infra-package-needs/package-installs.yaml
index 78bba3025d..09f10513f7 100644
--- a/nodepool/elements/infra-package-needs/package-installs.yaml
+++ b/nodepool/elements/infra-package-needs/package-installs.yaml
@@ -17,7 +17,6 @@ rsyslog:
 git:
 rsync:
 parted:
-puppet:
 wget:
 iputils-ping:
 dnsutils:
@@ -26,3 +25,4 @@ iptables:
 centos-release-openstack-ocata:
 redhat-rpm-config:
 redhat-lsb-core:
+curl:
diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index f58a714198..98ac2240b7 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -10,6 +10,7 @@
     "gentoo": {
       "build-essential": "",
       "cron": "sys-process/cronie",
+      "curl": "net-misc/curl",
       "ntp": "net-misc/ntp",
       "python-dev": "",
       "python3-dev": "",
@@ -38,7 +39,6 @@
       "git": "git-core",
       "iputils-ping": "iputils",
       "ntpdate": "",
-      "puppet": "ruby2.1-rubygem-puppet",
       "python-dev": "python-devel",
       "python3-dev": "python3-devel",
       "iptables": "iptables SuSEfirewall2",
@@ -46,6 +46,7 @@
     }
   },
   "default": {
+    "curl": "curl",
     "iptables": "iptables-persistent",
     "gentoolkit": "",
     "centos-release-openstack-ocata": "",
diff --git a/nodepool/elements/nodepool-base/element-deps b/nodepool/elements/nodepool-base/element-deps
index 1b4c1839e6..4ab83adafb 100644
--- a/nodepool/elements/nodepool-base/element-deps
+++ b/nodepool/elements/nodepool-base/element-deps
@@ -1,5 +1,4 @@
 jenkins-slave
 package-installs
 pip-and-virtualenv
-puppet
 zuul-worker
diff --git a/nodepool/elements/puppet/install.d/96-clean-cron b/nodepool/elements/nodepool-base/install.d/96-clean-cron
similarity index 100%
rename from nodepool/elements/puppet/install.d/96-clean-cron
rename to nodepool/elements/nodepool-base/install.d/96-clean-cron
diff --git a/nodepool/elements/puppet/pre-install.d/10-preseed b/nodepool/elements/nodepool-base/pre-install.d/10-preseed
similarity index 100%
rename from nodepool/elements/puppet/pre-install.d/10-preseed
rename to nodepool/elements/nodepool-base/pre-install.d/10-preseed
diff --git a/nodepool/elements/openstack-repos/element-deps b/nodepool/elements/openstack-repos/element-deps
index fcf86dcf66..827b787095 100644
--- a/nodepool/elements/openstack-repos/element-deps
+++ b/nodepool/elements/openstack-repos/element-deps
@@ -1,4 +1,3 @@
 cache-url
 prepare-node
-puppet
 source-repositories
diff --git a/nodepool/elements/prepare-node/element-deps b/nodepool/elements/prepare-node/element-deps
index 9a8eea29b9..8075e710a4 100644
--- a/nodepool/elements/prepare-node/element-deps
+++ b/nodepool/elements/prepare-node/element-deps
@@ -1,2 +1 @@
 nodepool-base
-puppet
diff --git a/nodepool/elements/prepare-node/install.d/20-prepare-node b/nodepool/elements/prepare-node/install.d/20-prepare-node
index d1917cd9f1..c150d16985 100755
--- a/nodepool/elements/prepare-node/install.d/20-prepare-node
+++ b/nodepool/elements/prepare-node/install.d/20-prepare-node
@@ -21,9 +21,5 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
 fi
 set -e
 
-export SUDO='true'
-
-prepare-node
-
 mkdir -p ~jenkins/cache/files
 mkdir -p ~jenkins/cache/pip
diff --git a/nodepool/elements/puppet/README.rst b/nodepool/elements/puppet/README.rst
deleted file mode 100644
index 071da1712b..0000000000
--- a/nodepool/elements/puppet/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bootstrap puppet on a node
diff --git a/nodepool/elements/puppet/bin/prepare-node b/nodepool/elements/puppet/bin/prepare-node
deleted file mode 100755
index c6968a16b7..0000000000
--- a/nodepool/elements/puppet/bin/prepare-node
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# dib-lint: disable=setu setpipefail dibdebugtrace indent
-set -e
-
-SUDO=${SUDO:-true}
-
-if [ -n "$NODEPOOL_SSH_KEY" ] ; then
-    puppet_ssh_key="ssh_key => '$NODEPOOL_SSH_KEY',"
-else
-    puppet_ssh_key=""
-fi
-
-export FACTER_in_chroot=true
-cat >/tmp/local.pp <<EOF
-Service {
-  start   => '/bin/true',
-  stop    => '/bin/true',
-  status  => '/bin/true',
-  restart => '/bin/true'
-}
-class {'openstack_project::single_use_slave':
-  sudo => $SUDO,
-  $puppet_ssh_key
-}
-EOF
-
-# Puppet doesn't return nonzero if some things fail by default.
-# Use detailed exit codes to get that info and determine whether
-# the return code indicates failure.
-set +e
-puppet apply --detailed-exitcodes --color=false \
-    --modulepath=/opt/build_git/openstack-infra/system-config/modules:/etc/puppet/modules \
-    /tmp/local.pp
-PUPPET_RETURN=$?
-if [ "$PUPPET_RETURN" -eq 4 ] || [ "$PUPPET_RETURN" -eq 6 ] ; then
-    exit $PUPPET_RETURN
-fi
-set -e
-
-# Make sure resolv.conf settings don't break dib
-if [ -n "$NODEPOOL_STATIC_NAMESERVER_V4" ] ; then
-    echo "nameserver $NODEPOOL_STATIC_NAMESERVER_V4"> /etc/resolv.conf
-fi
diff --git a/nodepool/elements/puppet/element-deps b/nodepool/elements/puppet/element-deps
deleted file mode 100644
index 6ee469fbe9..0000000000
--- a/nodepool/elements/puppet/element-deps
+++ /dev/null
@@ -1,4 +0,0 @@
-cache-url
-openstack-repos
-package-installs
-source-repositories
diff --git a/nodepool/elements/puppet/install.d/05-puppet b/nodepool/elements/puppet/install.d/05-puppet
deleted file mode 100755
index 1903d0845c..0000000000
--- a/nodepool/elements/puppet/install.d/05-puppet
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# dib-lint: disable=setu setpipefail
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -e
-
-# Unset the download cache for this invocation to prevent bleed from build host
-unset PIP_DOWNLOAD_CACHE
-
-SETUP_PIP=false /bin/bash /opt/build_git/openstack-infra/system-config/install_puppet.sh
-/bin/bash /opt/build_git/openstack-infra/system-config/install_modules.sh
-
-install -m 0755 -o root -g root $(dirname $0)/../bin/prepare-node /usr/local/bin
diff --git a/nodepool/elements/puppet/install.d/95-clean-repos b/nodepool/elements/puppet/install.d/95-clean-repos
deleted file mode 100755
index a5a4e24a17..0000000000
--- a/nodepool/elements/puppet/install.d/95-clean-repos
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Remove additional sources used to install puppet or special version of pypi.
-# We do this because leaving these sources in place causes every test that
-# does an apt-get update to hit those servers which may not have the uptime
-# of our local mirrors.
-
-# dib-lint: disable=sete setu setpipefail
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -e
-
-OS_FAMILY=$(facter osfamily)
-
-case $OS_FAMILY in
-    "Debian")
-        repo=/etc/apt/sources.list.d/puppetlabs.list
-        update="apt-get update"
-        ;;
-    "RedHat")
-        repo=/etc/yum.repos.d/puppetlabs.repo
-        # yum/dnf will notice this is gone, so don't need to spend
-        # time updating.
-        update=""
-        ;;
-    "Gentoo")
-        # make a fake repo to satisfy the removal below
-        touch /tmp/fakerepo
-        repo=/tmp/fakerepo
-        update=""
-        ;;
-    "Suse")
-        repo=/etc/zypp/repos.d/systemsmanagement_puppet.repo
-        update=""
-        ;;
-    *)
-        die "Don't know how to cleanup!"
-        ;;
-esac
-
-rm -f $repo
-$update
-
-rm /usr/local/bin/prepare-node
diff --git a/nodepool/elements/puppet/package-installs.yaml b/nodepool/elements/puppet/package-installs.yaml
deleted file mode 100644
index ed6f376221..0000000000
--- a/nodepool/elements/puppet/package-installs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-curl:
diff --git a/nodepool/elements/puppet/pkg-map b/nodepool/elements/puppet/pkg-map
deleted file mode 100644
index 7c786c0ab0..0000000000
--- a/nodepool/elements/puppet/pkg-map
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "family": {
-    "gentoo": {
-      "curl": "net-misc/curl"
-    }
-  },
-  "default": {
-    "curl": "curl"
-  }
-}
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 0f57d54750..c0d2a8d60f 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -869,7 +869,6 @@ diskimages:
       - openstack-repos
       - nodepool-base
       - cache-devstack
-      - puppet
       - cache-bindep
       - growroot
       - infra-package-needs
@@ -891,7 +890,6 @@ diskimages:
       - nodepool-base
       - cache-devstack
       - initialize-urandom
-      - puppet
       - cache-bindep
       - growroot
       - infra-package-needs