diff --git a/daq/Dockerfile.rpi b/daq/Dockerfile.rpi
index 9e3ecbf..a1479f7 100644
--- a/daq/Dockerfile.rpi
+++ b/daq/Dockerfile.rpi
@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y python python-pip git
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install some python packages
-RUN pip install --upgrade pip
-RUN pip install requests
+RUN pip install --upgrade pip setuptools
+RUN pip install --upgrade requests
 RUN pip install git+https://github.com/Henry-Pump/Pycomm-Helper.git
 RUN pip install git+https://github.com/ruscito/pycomm.git
 
diff --git a/daq_sample/Dockerfile.rpi b/daq_sample/Dockerfile.rpi
index d9dda9d..ad442d2 100644
--- a/daq_sample/Dockerfile.rpi
+++ b/daq_sample/Dockerfile.rpi
@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y python python-pip git
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install some python packages
-RUN pip install --upgrade pip
-RUN pip install requests
+RUN pip install --upgrade pip setuptools
+RUN pip install --upgrade requests
 RUN pip install git+https://github.com/Henry-Pump/Pycomm-Helper.git
 RUN pip install git+https://github.com/ruscito/pycomm.git
 
diff --git a/docker-compose-rpi.yml b/docker-compose-rpi.yml
index 33cee46..66fb536 100644
--- a/docker-compose-rpi.yml
+++ b/docker-compose-rpi.yml
@@ -1,13 +1,13 @@
 version : '2'
 services:
     web_db:
-        image: docker.henrypump.cloud/datalogger/rpi-web_db
+        image: docker.henrypump.cloud/datalogger/web_db-rpi
         ports:
             - "443:5000"
             - "6603:3306"
         restart: on-failure
     daq:
-        image: docker.henrypump.cloud/datalogger/rpi-daq
+        image: docker.henrypump.cloud/datalogger/daq-rpi
         depends_on:
             - web_db
         links: