diff --git a/blockinfo_fix.patch b/blockinfo_fix.patch
deleted file mode 100644
index a63682af..00000000
--- a/blockinfo_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /usr/lib/python3/dist-packages/sawtooth_block_info/processor/handler.py
-+++ /usr/lib/python3/dist-packages/sawtooth_block_info/processor/handler.py
-@@ -46,7 +46,7 @@ def validate_hex(string, length):
- 
- def validate_timestamp(timestamp, tolerance):
-     now = time.time()
--    if (timestamp - now) > tolerance:
-+    if timestamp > now + tolerance:
-         raise InvalidTransaction(
-             "Timestamp must be less than local time."
-             " Expected {0} in ({1}-{2}, {1}+{2})".format(
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 913d1ec8..77d8aeaa 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -15,12 +15,6 @@
 version: '3.4'
 
 services:
-  sawtooth:
-    build:
-      context: ..
-      dockerfile: docker/sawtooth.dockerfile
-    image: remme/sawtooth:latest
-
   remme-build:
     build:
       context: ..
diff --git a/build/release.sh b/build/release.sh
index c4797bfe..718c016c 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -6,6 +6,7 @@ RELEASE_NUMBER=$(git describe --abbrev=0 --tags)
 COMPOSE_DIR=./docker/compose
 RELEASE_DIR=./remme-core-$RELEASE_NUMBER-release
 COMPOSE_RELEASE_DIR=$RELEASE_DIR/docker/compose
+SCRIPTS_RELEASE_DIR=$RELEASE_DIR/scripts/node
 
 mkdir -p $RELEASE_DIR
 mkdir -p $COMPOSE_RELEASE_DIR
@@ -13,6 +14,7 @@ mkdir -p $COMPOSE_RELEASE_DIR
 cp $COMPOSE_DIR/base.yml ./$COMPOSE_RELEASE_DIR
 cp $COMPOSE_DIR/genesis.yml ./$COMPOSE_RELEASE_DIR
 cp -R config ./$RELEASE_DIR
+cp -R ./scripts/node $SCRIPTS_RELEASE_DIR
 cp ./scripts/run.sh ./$RELEASE_DIR
 
 for IMAGE in $IMAGES; do
diff --git a/docker/compose/base.yml b/docker/compose/base.yml
index 0df26fc1..21f524f7 100644
--- a/docker/compose/base.yml
+++ b/docker/compose/base.yml
@@ -18,7 +18,7 @@ version: '3.4'
 services:
   validator:
     container_name: remme_validator
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-validator:1.1.4
     hostname: remme.validator
     volumes:
       - validator_keys:/etc/sawtooth/keys
@@ -28,6 +28,7 @@ services:
       - ../../config/seeds-list.txt:/config/seeds-list.txt
       - ../../config/log/validator.toml:/etc/sawtooth/log_config.toml
       - ../../config/network-config.env:/config/network-config.env
+      - ../../scripts/node:/scripts
       - logs:/var/log/remme
     network_mode: bridge
     ports:
@@ -50,7 +51,7 @@ services:
 
   validator-rest-api:
     container_name: remme_validator_rest_api
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-rest-api:1.1.4
     network_mode: "service:validator"
     volumes:
       - ../../config/log/validator-rest-api.toml:/etc/sawtooth/rest_api_log_config.toml
@@ -59,7 +60,7 @@ services:
 
   block-info-tp:
     container_name: remme_block_info_tp
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-block-info-tp:1.1.4
     network_mode: "service:validator"
     volumes:
       - ../../config/log/block-info-tp.toml:/etc/sawtooth/block_info_log_config.toml
@@ -68,7 +69,7 @@ services:
 
   settings-tp:
     container_name: remme_settings_tp
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-settings-tp:1.1.4
     network_mode: "service:validator"
     entrypoint: settings-tp -vv -C tcp://127.0.0.1:4004
     volumes:
diff --git a/docker/compose/development-genesis.yml b/docker/compose/development-genesis.yml
index 3f46adba..33b11c1c 100644
--- a/docker/compose/development-genesis.yml
+++ b/docker/compose/development-genesis.yml
@@ -19,4 +19,4 @@ services:
   remme-genesis:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && /project/remme/scripts/node/genesis.sh"
\ No newline at end of file
+    entrypoint: sh /project/remme/scripts/node/genesis.sh
diff --git a/docker/compose/development.yml b/docker/compose/development.yml
index ba8f5a26..a389ba72 100644
--- a/docker/compose/development.yml
+++ b/docker/compose/development.yml
@@ -19,9 +19,9 @@ services:
   remme-tp:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && python3 -m remme.tp"
+    entrypoint: python3 -m remme.tp
 
   remme-rpc-api:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && python3 -m remme.rpc_api"
+    entrypoint: python3 -m remme.rpc_api
diff --git a/docker/sawtooth.dockerfile b/docker/sawtooth.dockerfile
deleted file mode 100644
index 1e5692bc..00000000
--- a/docker/sawtooth.dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM ubuntu:xenial
-# TODO Change repo to bumper/stable when available
-RUN apt-get update && \
-    apt-get install -y software-properties-common patch && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD && \
-    add-apt-repository 'deb [arch=amd64] http://repo.sawtooth.me/ubuntu/bumper/stable xenial universe' && \
-    apt-get update && \
-    apt-get install -y python3-sawtooth-block-info \
-        python3-sawtooth-cli \
-        python3-sawtooth-rest-api \
-        python3-sawtooth-settings \
-        python3-sawtooth-validator \
-        sawtooth-devmode-engine-rust
-COPY ./scripts/node /scripts
-RUN chmod +x /scripts/toml-to-env.py
-COPY ./blockinfo_fix.patch /blockinfo_fix.patch
-RUN patch -p0 < /blockinfo_fix.patch