diff --git a/devops/aws-codebuild/buildspec.cd.yml b/devops/aws-codebuild/buildspec.cd.yml
index b0f8ed22d..bce251635 100644
--- a/devops/aws-codebuild/buildspec.cd.yml
+++ b/devops/aws-codebuild/buildspec.cd.yml
@@ -28,6 +28,8 @@ phases:
       - printenv
       - export PROJECT_DIR="$PWD"
       - |
+        apt-get update
+        apt-get install -y software-properties-common ca-certificates
         set -ex
         for goal in $MAKE_GOALS; do
             echo "Making '$goal'"
diff --git a/devops/aws-codebuild/buildspec.ci.yml b/devops/aws-codebuild/buildspec.ci.yml
index 5d987c182..9b7516640 100644
--- a/devops/aws-codebuild/buildspec.ci.yml
+++ b/devops/aws-codebuild/buildspec.ci.yml
@@ -30,6 +30,8 @@ phases:
       - printenv
       - export PROJECT_DIR="$PWD"
       - |
+        apt-get update
+        apt-get install -y software-properties-common ca-certificates
         set -ex
         for goal in $MAKE_GOALS; do
             echo "Making '$goal'"
diff --git a/devops/ext/docker/base/xenial/Dockerfile.0.8.0 b/devops/ext/docker/base/xenial/Dockerfile.0.8.0
index a37e53de1..5323197c9 100644
--- a/devops/ext/docker/base/xenial/Dockerfile.0.8.0
+++ b/devops/ext/docker/base/xenial/Dockerfile.0.8.0
@@ -3,36 +3,37 @@ FROM ubuntu:xenial
 
 # generally useful packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        ca-certificates \
-        apt-transport-https \
-        curl \
-        wget \
-        vim \
-        git \
-        procps \
-        autoconf \
-        automake \
-        g++ \
-        gcc \
-        make \
-        pkg-config \
-        zip \
-        unzip \
+    ca-certificates \
+    software-properties-common \
+    apt-transport-https \
+    curl \
+    wget \
+    vim \
+    git \
+    procps \
+    autoconf \
+    automake \
+    g++ \
+    gcc \
+    make \
+    pkg-config \
+    zip \
+    unzip \
     && rm -rf /var/lib/apt/lists/*
 
 
 # install fpm
 ENV FPM_VERSION=1.9.3
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        ruby \
-        ruby-dev \
-        rubygems \
-        build-essential \
-        autoconf \
-        libtool \
-        rpm \
+RUN apt-add-repository ppa:brightbox/ruby-ng \
+    && apt-get update && apt-get install -y --no-install-recommends \
+    ruby2.4 \
+    ruby2.4-dev \
+    build-essential \
+    autoconf \
+    libtool \
+    rpm \
     && gem install rake \
-    && gem install --no-ri --no-rdoc fpm -v $FPM_VERSION \
+    && gem install --no-document fpm -v $FPM_VERSION \
     && rm -rf /var/lib/apt/lists/*