diff --git a/Makefile b/Makefile
index 78200fbd804..dd9dbce37d2 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ BASEIMAGE_DEPS    = $(shell git ls-files images/base scripts/provision)
 
 JAVASHIM_DEPS =  $(shell git ls-files core/chaincode/shim/java)
 PROJECT_FILES = $(shell git ls-files)
-IMAGES = base src ccenv peer membersrvc javaenv
+IMAGES = base src ccenv peer membersrvc javaenv orderer
 
 
 all: peer membersrvc checks
@@ -71,6 +71,10 @@ $(SUBDIRS):
 peer: build/bin/peer
 peer-image: build/image/peer/.dummy
 
+.PHONY: orderer
+orderer: build/bin/orderer
+orderer-image: build/image/orderer/.dummy
+
 .PHONY: membersrvc
 membersrvc: build/bin/membersrvc
 membersrvc-image: build/image/membersrvc/.dummy
@@ -96,6 +100,7 @@ linter: gotools
 	go vet ./membersrvc/...
 	go vet ./peer/...
 	go vet ./protos/...
+	go vet ./orderer/...
 	@echo "Running goimports"
 	@./scripts/goimports.sh
 
diff --git a/bddtests/.behaverc b/bddtests/.behaverc
index 72dd59086c3..92eb6b9da04 100644
--- a/bddtests/.behaverc
+++ b/bddtests/.behaverc
@@ -6,5 +6,4 @@ tags=~@issue_767
 			~@issue_1565
 			~@issue_RBAC_TCERT_With_Attributes
 			~@sdk
-			~@orderer
 			~@endorser
diff --git a/bddtests/docker-compose-orderer-solo.yml b/bddtests/docker-compose-orderer-solo.yml
index b397d1a3e20..f762220b0b0 100644
--- a/bddtests/docker-compose-orderer-solo.yml
+++ b/bddtests/docker-compose-orderer-solo.yml
@@ -1,12 +1,12 @@
 orderer0:
-  image: hyperledger/fabric-orderer-solo
+  image: hyperledger/fabric-orderer
   environment:
-    - ORDERER_WINDOW_SIZE_MAX=1000
-    - ORDERER_BATCH_TIMEOUT=10s
-    - ORDERER_BATCH_SIZE=10
-    - ORDERER_BLOCK_HISTORY_SIZE=100
     - ORDERER_LISTEN_ADDRESS=0.0.0.0
-  # Startup of peer must be delayed to allow membersrvc to come up first
-  #command: sh -c "sleep 5; peer node start"
+    - ORDERER_LISTEN_PORT=5005
+    #- ORDERER_WINDOW_SIZE_MAX=1000 # TODO (implement)
+    #- ORDERER_BATCH_TIMEOUT=10s # TODO (implement)
+    #- ORDERER_BATCH_SIZE=10 # TODO (implement)
+    #- ORDERER_BLOCK_HISTORY_SIZE=100 # TODO (implement)
+
   working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
-  command: ./orderer
+  command: orderer
diff --git a/scripts/provision/host.sh b/scripts/provision/host.sh
index 625c7a3ed54..41e3168521b 100755
--- a/scripts/provision/host.sh
+++ b/scripts/provision/host.sh
@@ -26,7 +26,7 @@ pip install -I flask==0.10.1 python-dateutil==2.2 pytz==2014.3 pyyaml==3.10 couc
 # Python grpc package for behave tests
 # Required to update six for grpcio
 pip install --ignore-installed six
-pip install --upgrade 'grpcio==0.13.1'
+pip install --upgrade 'grpcio==1.0.0'
 
 # install ruby and apiaryio
 #apt-get install --yes ruby ruby-dev gcc