diff --git a/Dockerfile b/Dockerfile
index ef38df2..05ce853 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,54 +10,55 @@ RUN apt-get update \
     ca-certificates \
     python-pygments \
     imagemagick \
+    procps \
   && rm -rf /var/lib/apt/lists/*
 
 # install the PHP extensions we need
 RUN set -ex; \
-	\
-	if command -v a2enmod; then \
-		a2enmod rewrite; \
-	fi; \
-	\
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-gnutls-dev \
+    \
+    if command -v a2enmod; then \
+        a2enmod rewrite; \
+    fi; \
+    \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        libcurl4-gnutls-dev \
     libjpeg62-turbo-dev \
-		libpng-dev \
+        libpng-dev \
     libfreetype6-dev \
-	; \
-	\
+    ; \
+    \
   docker-php-ext-configure gd \
-		--with-jpeg-dir=/usr \
-		--with-png-dir=/usr \
+        --with-jpeg-dir=/usr \
+        --with-png-dir=/usr \
     --with-freetype-dir=/usr \
   ; \
   \
-	docker-php-ext-install -j "$(nproc)" \
+    docker-php-ext-install -j "$(nproc)" \
     gd \
     opcache \
-		mbstring \
-		iconv \
-		mysqli \
-		curl \
-		pcntl \
-	; \
+    mbstring \
+    iconv \
+    mysqli \
+    curl \
+    pcntl \
+    ; \
   \
   # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	apt-mark manual $savedAptMark; \
-	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
-		| sort -u \
-		| xargs -r dpkg-query -S \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -rt apt-mark manual; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	rm -rf /var/lib/apt/lists/*
+    apt-mark auto '.*' > /dev/null; \
+    apt-mark manual $savedAptMark; \
+    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+        | awk '/=>/ { print $3 }' \
+        | sort -u \
+        | xargs -r dpkg-query -S \
+        | cut -d: -f1 \
+        | sort -u \
+        | xargs -rt apt-mark manual; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    rm -rf /var/lib/apt/lists/*
 
 RUN pecl channel-update pecl.php.net \
   && pecl install apcu \
@@ -66,34 +67,32 @@ RUN pecl channel-update pecl.php.net \
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
 RUN { \
-  		echo 'opcache.memory_consumption=128'; \
-  		echo 'opcache.interned_strings_buffer=8'; \
-  		echo 'opcache.max_accelerated_files=4000'; \
-  		echo 'opcache.revalidate_freq=60'; \
-  		echo 'opcache.fast_shutdown=1'; \
-  		echo 'opcache.enable_cli=1'; \
-      echo 'opcache.validate_timestamps=0'; \
+        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.fast_shutdown=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
 # Set the default timezone.
 RUN { \
-  		echo 'date.timezone="UTC"'; \
+        echo 'date.timezone="UTC"'; \
     } > /usr/local/etc/php/conf.d/timezone.ini
 
 # File Uploads
 RUN { \
-  		echo 'post_max_size=32M'; \
-      echo 'upload_max_filesize=32M'; \
+        echo 'post_max_size=32M'; \
+        echo 'upload_max_filesize=32M'; \
     } > /usr/local/etc/php/conf.d/uploads.ini
 
 ENV APACHE_DOCUMENT_ROOT /var/www/phabricator/webroot
 
 RUN { \
-  		echo '<VirtualHost *:80>'; \
-  		echo '  DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \
-  		echo '  RewriteEngine on'; \
-  		echo '  RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \
-  		echo '</VirtualHost>'; \
+        echo '<VirtualHost *:80>'; \
+        echo '  DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \
+        echo '  RewriteEngine on'; \
+        echo '  RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \
+        echo '</VirtualHost>'; \
     } > /etc/apache2/sites-available/000-default.conf
 
 # Repository Folder.
diff --git a/Dockerfile.daemon b/Dockerfile.daemon
index ef9fbe0..075e5d6 100644
--- a/Dockerfile.daemon
+++ b/Dockerfile.daemon
@@ -10,15 +10,16 @@ RUN apt-get update \
     ca-certificates \
     python-pygments \
     imagemagick \
+    procps \
   && rm -rf /var/lib/apt/lists/*
 
 # install the PHP extensions we need
 RUN set -ex; \
-	savedAptMark="$(apt-mark showmanual)"; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		libcurl4-gnutls-dev \
+    savedAptMark="$(apt-mark showmanual)"; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+    libcurl4-gnutls-dev \
     libjpeg62-turbo-dev \
     libpng-dev \
     libfreetype6-dev \
@@ -30,29 +31,29 @@ RUN set -ex; \
     --with-freetype-dir=/usr \
   ; \
   \
-	docker-php-ext-install -j "$(nproc)" \
+    docker-php-ext-install -j "$(nproc)" \
     gd \
     opcache \
-		mbstring \
-		iconv \
-		mysqli \
-		curl \
-		pcntl \
-	; \
-	\
+    mbstring \
+    iconv \
+    mysqli \
+    curl \
+    pcntl \
+    ; \
+    \
   # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-	apt-mark auto '.*' > /dev/null; \
-	apt-mark manual $savedAptMark; \
-	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
-		| sort -u \
-		| xargs -r dpkg-query -S \
-		| cut -d: -f1 \
-		| sort -u \
-		| xargs -rt apt-mark manual; \
-	\
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-	rm -rf /var/lib/apt/lists/*
+    apt-mark auto '.*' > /dev/null; \
+    apt-mark manual $savedAptMark; \
+    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+        | awk '/=>/ { print $3 }' \
+        | sort -u \
+        | xargs -r dpkg-query -S \
+        | cut -d: -f1 \
+        | sort -u \
+        | xargs -rt apt-mark manual; \
+    \
+    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+    rm -rf /var/lib/apt/lists/*
 
 RUN pecl channel-update pecl.php.net \
   && pecl install apcu \
@@ -61,24 +62,22 @@ RUN pecl channel-update pecl.php.net \
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php
 RUN { \
-  		echo 'opcache.memory_consumption=128'; \
-  		echo 'opcache.interned_strings_buffer=8'; \
-  		echo 'opcache.max_accelerated_files=4000'; \
-  		echo 'opcache.revalidate_freq=60'; \
-  		echo 'opcache.fast_shutdown=1'; \
-  		echo 'opcache.enable_cli=1'; \
-      echo 'opcache.validate_timestamps=0'; \
+        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.fast_shutdown=1'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
 # Set the default timezone.
 RUN { \
-  		echo 'date.timezone="UTC"'; \
+        echo 'date.timezone="UTC"'; \
     } > /usr/local/etc/php/conf.d/timezone.ini
 
 # File Uploads
 RUN { \
-  		echo 'post_max_size=32M'; \
-      echo 'upload_max_filesize=32M'; \
+        echo 'post_max_size=32M'; \
+        echo 'upload_max_filesize=32M'; \
     } > /usr/local/etc/php/conf.d/uploads.ini
 
 # Repository Folder.