diff --git a/6-i386/Dockerfile b/6-i386/Dockerfile
index 5169ebb789aa8d35531e4be04541a0d86c66cd55..31aa59e165e8776759a2050697f978b3dda4a6cc 100644
--- a/6-i386/Dockerfile
+++ b/6-i386/Dockerfile
@@ -34,6 +34,9 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+# TODO: Remove this once the build deps for boost have been cleaned up...
+RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build
+
 RUN groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
diff --git a/6/Dockerfile b/6/Dockerfile
index e76661baf03cf4bbfaf26494b522ef5028e3ec22..656a24531b658a43da92e1c75c3e441388ecdd15 100644
--- a/6/Dockerfile
+++ b/6/Dockerfile
@@ -30,6 +30,9 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+# TODO: Remove this once the build deps for boost have been cleaned up...
+RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build
+
 RUN groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
diff --git a/7/Dockerfile b/7/Dockerfile
index 2d6caa39978c8f4bf4f5d28405d4c145e9346296..c1c25dcffeb324426242dbcb653b67c85a578b51 100644
--- a/7/Dockerfile
+++ b/7/Dockerfile
@@ -29,6 +29,9 @@ RUN yum install -y centos-release-scl centos-release-scl-rh scl-utils-build \
 RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
  https://packages.icinga.com/epel/ICINGA-release.repo
 
+# TODO: Remove this once the build deps for boost have been cleaned up...
+RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build
+
 RUN groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \