diff --git a/7.0-dev/Dockerfile b/7.0-dev/Dockerfile
index 3c262da..c2ead03 100644
--- a/7.0-dev/Dockerfile
+++ b/7.0-dev/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug-2.9.0 \
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0
diff --git a/7.1-dev/Dockerfile b/7.1-dev/Dockerfile
index d20388b..e8509b8 100644
--- a/7.1-dev/Dockerfile
+++ b/7.1-dev/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug \
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0
diff --git a/7.2-dev/Dockerfile b/7.2-dev/Dockerfile
index b1ca56f..946dd5f 100644
--- a/7.2-dev/Dockerfile
+++ b/7.2-dev/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug \
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0
diff --git a/7.3-dev/Dockerfile b/7.3-dev/Dockerfile
index 3bc5bfe..8e67f00 100644
--- a/7.3-dev/Dockerfile
+++ b/7.3-dev/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug \
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0
diff --git a/7.4-dev/Dockerfile b/7.4-dev/Dockerfile
index 2eb067f..1cace0f 100644
--- a/7.4-dev/Dockerfile
+++ b/7.4-dev/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug \
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0
diff --git a/template/Dockerfile b/template/Dockerfile
index d29c35f..33d1831 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -121,16 +121,17 @@ RUN pecl install xdebug{{if (eq (atoi .Env.PHP_MINOR_VERSION) 0)}}-2.9.0{{ end }
   && docker-php-ext-enable xdebug \
   && echo "xdebug.default_enable=0\nxdebug.coverage_enable=0" > $PHP_INI_DIR/conf.d/xdebug.ini
 
-# Blackfire Probe. Note: We do not install Blackfire CLI. You will
-# need that in order to trigger Blackfire tests. The probe just instruments
-# things on the server side.
+# Blackfire Probe & CLI
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
     && mkdir -p /tmp/blackfire \
     && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
     && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
-    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+    && curl -o /usr/local/bin/blackfire https://blackfire.io/api/v1/releases/client/php/linux/amd64/$version \
+    && chmod + x /usr/local/bin/blackfire
+
 
 # Terminus.
 ARG TERMINUS_VERSION=2.2.0