diff --git a/Dockerfile b/Dockerfile
index 2ab0de4..8b1eb25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,8 @@
-FROM ruby:alpine
-
-ENV STOMP_VERSION 1.4.4
-ENV MCO_VERSION 2.12.1
-
-RUN gem install stomp --version $STOMP_VERSION --no-ri --no-rdoc \
-  && gem install mcollective-client --version $MCO_VERSION --no-ri --no-rdoc
-
-RUN apk add --update git \
- && rm -rf /var/cache/apk/*
-
-RUN mkdir -p /usr/share/mcollective/plugins/mcollective
+FROM vshn/puppet-mcoclient
 
 # Install puppetenvsh plugin
 RUN git clone https://github.com/optiz0r/mcollective-puppetenvsh-agent \
-  && cp -r mcollective-puppetenvsh-agent/application /usr/share/mcollective/plugins/mcollective/ \
-  && cp -r mcollective-puppetenvsh-agent/agent /usr/share/mcollective/plugins/mcollective/ \
-  && cp -r mcollective-puppetenvsh-agent/util /usr/share/mcollective/plugins/mcollective/ \
+  && cp -r mcollective-puppetenvsh-agent/application /opt/puppetlabs/mcollective/plugins/mcollective/ \
+  && cp -r mcollective-puppetenvsh-agent/agent /opt/puppetlabs/mcollective/plugins/mcollective/ \
+  && cp -r mcollective-puppetenvsh-agent/util /opt/puppetlabs/mcollective/plugins/mcollective/ \
   && rm -rf mcollective-puppetenvsh-agent
-
-COPY ./client.cfg /root/.mcollective
-
-COPY ./ca.crt /root/ca.pem
-
-ENTRYPOINT [ "mco" ]
-CMD [ "--help" ]