diff --git a/repoman_docker/Dockerfile b/repoman_docker/Dockerfile
deleted file mode 100644
index 3b837052..00000000
--- a/repoman_docker/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM gentoo/stage3-amd64
-
-RUN mkdir -p /usr/portage/gentoo && emerge-webrsync && emerge --sync \
-    && eselect profile set 12 && emerge app-crypt/gnupg repoman dev-vcs/git --autounmask-write
-
-ENV FEATURES sign
-ENV PORTAGE_GPG_DIR ~/.gnupg/
-
-RUN mkdir -p /usr/local/portage
-RUN printf '\nPORTDIR_OVERLAY="/usr/local/portage"' >> /etc/portage/make.conf
diff --git a/repoman_docker/__init__.py b/repoman_docker/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/setup.py b/setup.py
index 44e596e6..573dd772 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@
     license='Apache 2.0',
     test_suite='tests',
     data_files=[
-        ('repoman_docker', ['repoman_docker/Dockerfile']),
         ('test_docker', ['tests/docker/Dockerfile']),
     ],
     include_package_data = True,
diff --git a/superflore/generators/ebuild/overlay_instance.py b/superflore/generators/ebuild/overlay_instance.py
index 0f7aa302..2cd8a226 100644
--- a/superflore/generators/ebuild/overlay_instance.py
+++ b/superflore/generators/ebuild/overlay_instance.py
@@ -15,7 +15,6 @@
 import os
 import time
 
-from pkg_resources import resource_filename
 from superflore.docker import Docker
 from superflore.repo_instance import RepoInstance
 from superflore.utils import info
@@ -44,11 +43,16 @@ def commit_changes(self, distro):
         }[distro or 'update'] + time.ctime()
         self.repo.git.commit(m='{0}'.format(commit_msg))
 
-    def regenerate_manifests(self, regen_dict):
-        info('Building docker image...')
-        docker_file = resource_filename('repoman_docker', 'Dockerfile')
+    def regenerate_manifests(
+        self, regen_dict, image_owner='allenh1', image_name='ros_gentoo_base'
+    ):
+        info(
+            "Pulling docker image '%s/%s:latest'..." % (
+                image_owner, image_name
+            )
+        )
         dock = Docker()
-        dock.build(docker_file)
+        dock.pull(image_owner, image_name)
         info('Running docker image...')
         info('Generating manifests...')
         dock.map_directory(