diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian
index 651bf58..bc21504 100644
--- a/Dockerfile.raspbian
+++ b/Dockerfile.raspbian
@@ -4,8 +4,22 @@ MAINTAINER ViViDboarder <vividboarder@gmail.com>
 RUN [ "cross-build-start" ]
 
 RUN apt-get update \
-        && apt-get install -y --no-install-recommends duplicity python-setuptools \
-        ncftp cron python-boto python-swiftclient python-pexpect openssh-client \
+        && apt-get install -y --no-install-recommends \
+            duplicity python-setuptools cron python-pexpect openssh-client \
+            lftp \
+            ncftp \
+            python-cloudfiles \
+            python-gdata \
+            python-oauthlib \
+            python-paramiko \
+            python-urllib3 \
+            rsync \
+            tahoe-lafs \
+            python-pip \
+        && pip install -U boto  \
+        && apt-get remove -y python-pip \
+        && apt-get install -y --no-install-recommends \
+            python-swiftclient \
         && rm -rf /var/apt/lists/*
 
 RUN [ "cross-build-end" ]
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 0485701..6b1b2f8 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -3,13 +3,23 @@ MAINTAINER ViViDboarder <vividboarder@gmail.com>
 
 RUN apt-get update \
         && apt-get install -y --no-install-recommends \
-        software-properties-common python-software-properties \
+            software-properties-common python-software-properties \
         && add-apt-repository ppa:duplicity-team/ppa \
         && apt-get update \
         && apt-get install -y --no-install-recommends \
-        duplicity python-setuptools ncftp \
-        python-swiftclient python-pip python-pexpect openssh-client \
-        && pip install boto \
+            duplicity python-setuptools python-pexpect openssh-client \
+            lftp \
+            ncftp \
+            python-cloudfiles \
+            python-gdata \
+            python-oauthlib \
+            python-paramiko \
+            python-swiftclient \
+            python-urllib3 \
+            rsync \
+            tahoe-lafs \
+            python-pip \
+        && pip install -U boto  \
         && apt-get autoremove -y python-pip \
         && apt-get clean \
         && rm -rf /var/apt/lists/*