diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc369a924ec..1ec16c77b01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12"
 
 .use-x86_build-base:
   extends:
@@ -256,7 +256,7 @@ x86_test-vk:
 x86_build_old:
   extends: x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-02"
+    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-12"
     FDO_DISTRIBUTION_VERSION: stretch-slim
 
 .use-x86_build_old:
@@ -272,7 +272,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-01"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-06-12"
 
 .use-arm_build:
   variables:
diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 58dd0e1bdd9..6facab31e73 100644
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -22,7 +22,6 @@ apt-get -y install \
 	fastboot \
 	flex \
 	g++ \
-	gettext \
 	git \
 	lavacli \
 	libdrm-dev:armhf \
diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index 2350aca8843..c904f34ebab 100644
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -30,7 +30,6 @@ apt-get install -y --no-remove \
         g++ \
         g++-mingw-w64-x86-64 \
         gcc \
-        gettext \
         libclang-9-dev \
         libclc-dev \
         libelf-dev \
diff --git a/.gitlab-ci/container/x86_build_old.sh b/.gitlab-ci/container/x86_build_old.sh
index 4f9c83b05f4..3343fbb2449 100644
--- a/.gitlab-ci/container/x86_build_old.sh
+++ b/.gitlab-ci/container/x86_build_old.sh
@@ -30,7 +30,6 @@ apt-get install -y --no-remove \
       flex \
       g++ \
       gcc \
-      gettext \
       git \
       libclang-3.9-dev \
       libclang-4.0-dev \