diff --git a/jaeger-crossdock/docker-compose.yml b/jaeger-crossdock/docker-compose.yml
index 6259ec581..edaa51859 100644
--- a/jaeger-crossdock/docker-compose.yml
+++ b/jaeger-crossdock/docker-compose.yml
@@ -13,9 +13,9 @@ services:
             - nodejs
         environment:
             - WAIT_FOR=test_driver,go,java-udp,java-http,java-https,python,nodejs,jaeger-collector-https-proxy
-            - WAIT_FOR_TIMEOUT=60s
+            - WAIT_FOR_TIMEOUT=180s
 
-            - CALL_TIMEOUT=60s
+            - CALL_TIMEOUT=180s
 
             - AXIS_CLIENT=go
             - AXIS_S1NAME=go,java-udp,python,nodejs
@@ -76,18 +76,13 @@ services:
             - jaeger-collector
 
     jaeger-collector-https-proxy:
-        image: nginx:alpine
+        build: https-proxy
         ports:
-            - "8080:8080"
-            - "14443:14443"
-        volumes:
-            - ./https-proxy/build/proxy.conf:/etc/nginx/conf.d/proxy.conf
-            - ./https-proxy/build/proxy.crt:/etc/nginx/proxy.crt
-            - ./https-proxy/build/proxy.key:/etc/nginx/proxy.key
+            - "8080"
+            - "14443"
         restart: on-failure
         depends_on:
             - jaeger-collector
-        command: ["sh", "-c", "while ! { wget --spider -S http://jaeger-collector:14269; }; do echo waiting...; sleep 10; done; nginx -g 'daemon off;'"]
 
     test_driver:
         image: jaegertracing/test-driver
diff --git a/jaeger-crossdock/https-proxy/Dockerfile b/jaeger-crossdock/https-proxy/Dockerfile
new file mode 100644
index 000000000..fbe2ae2bc
--- /dev/null
+++ b/jaeger-crossdock/https-proxy/Dockerfile
@@ -0,0 +1,8 @@
+FROM nginx:alpine
+
+ADD build/proxy.conf /etc/nginx/conf.d/proxy.conf
+ADD build/proxy.crt /etc/nginx/proxy.crt
+ADD build/proxy.key /etc/nginx/proxy.key
+
+EXPOSE 8080 14443
+CMD ["sh", "-c", "while ! { wget --spider -S http://jaeger-collector:14269; }; do echo waiting...; sleep 1; done; nginx -g 'daemon off;'"]
diff --git a/jaeger-crossdock/rules.mk b/jaeger-crossdock/rules.mk
index db319f7cc..a9c261ac7 100644
--- a/jaeger-crossdock/rules.mk
+++ b/jaeger-crossdock/rules.mk
@@ -9,12 +9,14 @@ crossdock: gradle-compile crossdock-proxy-secret-gen crossdock-download-jaeger
 	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) kill java-udp java-http java-https
 	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) rm -f java-udp java-http java-https
 	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) build java-udp java-http java-https
-	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock || true
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) logs jaeger-collector-https-proxy && false
 
 .PHONY: crossdock-fresh
-crossdock-fresh: gradle-compile crossdock-download-jaeger
+crossdock-fresh: gradle-compile crossdock-proxy-secret-gen crossdock-download-jaeger
 	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) down --rmi all
-	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock || true
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) logs jaeger-collector-https-proxy && false
 
 gradle-compile:
 	./gradlew :jaeger-crossdock:shadowJar