diff --git a/pyclient/Dockerfile b/pyclient/Dockerfile
index c0b6e23..1530186 100644
--- a/pyclient/Dockerfile
+++ b/pyclient/Dockerfile
@@ -17,13 +17,41 @@ FROM ubuntu:bionic
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN \
- apt-get update \
- && apt-get install -y -q curl gnupg \
- && curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
- && echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
+
+RUN apt-get update \
+ && apt-get install gnupg -y
+
+RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/apt/sources.list \
+ && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
+ || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
  && apt-get update
 
+#RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sources.list \
+ # && apt-get update \
+  #&& apt-get install -y gnupg \
+  #&& gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \
+  #|| gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD \
+  #&& gpg --export 8AA7AF1F1091A5FD | apt-key add - \
+  #&& apt-get update \
+  #&& apt-get install -y -q git python3 python3-stdeb
+
+
+#RUN echo "deb http://repo.sawtooth.me/ubuntu/ci bionic universe" >> /etc/apt/sources.list \
+# && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \
+# || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \
+# && apt-get update \
+# && apt-get install -y -q \
+#    git \
+#    python3 \
+#    python3-stdeb
+
+#RUN \
+# apt-get update \
+# && apt-get install -y -q curl gnupg \
+# && curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
+# && echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
+# && apt-get update
+
 RUN \
  apt-get install -y -q --no-install-recommends \
     apt-utils \
@@ -82,3 +110,5 @@ ENV PATH "$PATH:/project/simplewallet/pyclient"
 EXPOSE 3000
 
 CMD unset PYTHONPATH && python3 setup.py clean --all && python3 setup.py build
+
+
diff --git a/pyclient/Dockerfile.old b/pyclient/Dockerfile.old
new file mode 100644
index 0000000..c0b6e23
--- /dev/null
+++ b/pyclient/Dockerfile.old
@@ -0,0 +1,84 @@
+# Copyright 2018 Intel Corporation
+#
+# 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.
+# -----------------------------------------------------------------------------
+
+FROM ubuntu:bionic
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN \
+ apt-get update \
+ && apt-get install -y -q curl gnupg \
+ && curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
+ && echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
+ && apt-get update
+
+RUN \
+ apt-get install -y -q --no-install-recommends \
+    apt-utils \
+ && apt-get install -y -q \
+    apt-transport-https \
+    build-essential \
+    ca-certificates \
+    inetutils-ping \
+    libffi-dev \
+    libssl-dev \
+    python3-aiodns \
+    python3-aiohttp \
+    python3-aiopg \
+    python3-async-timeout \
+    python3-bitcoin \
+    python3-cbor \
+    python3-cchardet \
+    python3-chardet \
+    python3-colorlog \
+    python3-cov-core \
+    python3-cryptography-vectors \
+    python3-cryptography \
+    python3-dev \
+    python3-grpcio-tools \
+    python3-grpcio \
+    python3-lmdb \
+    python3-multidict \
+    python3-netifaces \
+    python3-nose2 \
+    python3-pip \
+    python3-protobuf \
+    python3-psycopg2 \
+    python3-pycares \
+    python3-pyformance \
+    python3-pytest-runner \
+    python3-pytest \
+    python3-pytz \
+    python3-requests \
+    python3-secp256k1 \
+    python3-setuptools-scm \
+    python3-six \
+    python3-toml \
+    python3-yaml \
+    python3-yarl\
+    python3-zmq \
+    software-properties-common \
+    python3-sawtooth-sdk \
+    python3-sawtooth-cli \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /project/simplewallet/pyclient
+
+ENV PATH "$PATH:/project/simplewallet/pyclient"
+
+EXPOSE 3000
+
+CMD unset PYTHONPATH && python3 setup.py clean --all && python3 setup.py build
diff --git a/pyprocessor/Dockerfile b/pyprocessor/Dockerfile
index 3f949e3..bdfad00 100644
--- a/pyprocessor/Dockerfile
+++ b/pyprocessor/Dockerfile
@@ -17,12 +17,24 @@ FROM ubuntu:bionic
 
 ARG DEBIAN_FRONTEND=noninteractive
 
+
+RUN apt-get update \
+ && apt-get install gnupg -y
+
+RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/apt/sources.list \
+ && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
+ || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
+ && apt-get update
+
+
+
+#RUN \
+ #apt-get update \
+ #&& apt-get install -y -q curl gnupg \
+ #&& curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
+ #&& echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
 RUN \
- apt-get update \
- && apt-get install -y -q curl gnupg \
- && curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
- && echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
- && apt-get update \
+    apt-get update \
  && apt-get install -y -q \
     apt-transport-https \
     build-essential \
diff --git a/pyprocessor/Dockerfile.old b/pyprocessor/Dockerfile.old
new file mode 100644
index 0000000..3f949e3
--- /dev/null
+++ b/pyprocessor/Dockerfile.old
@@ -0,0 +1,41 @@
+# Copyright 2018 Intel Corporation
+#
+# 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.
+# -----------------------------------------------------------------------------
+
+FROM ubuntu:bionic
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN \
+ apt-get update \
+ && apt-get install -y -q curl gnupg \
+ && curl -sSL 'http://p80.pool.sks-keyservers.net/pks/lookup?op=get&search=0x8AA7AF1F1091A5FD' | apt-key add -  \
+ && echo 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe' >> /etc/apt/sources.list \
+ && apt-get update \
+ && apt-get install -y -q \
+    apt-transport-https \
+    build-essential \
+    ca-certificates \
+    python3-sawtooth-sdk \
+    python3-protobuf \
+    python3-pandas \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+EXPOSE 4004/tcp
+
+WORKDIR /project/simplewallet/pyprocessor
+ENV PATH "$PATH:/project/simplewallet/pyprocessor"
+
+CMD bash -c './simplewallet-tp'