diff --git a/.github/workflows/build_base_images.yml b/.github/workflows/build_base_images.yml
new file mode 100644
index 000000000..24ef68224
--- /dev/null
+++ b/.github/workflows/build_base_images.yml
@@ -0,0 +1,17 @@
+name: Build base images
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - uses: action/checkout@v2
+      - run: scripts/build_and_push_base_images.sh
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8654f0cc8..f96dd5012 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -173,14 +173,15 @@ jobs:
     strategy:
       matrix:
         os:
-          # - amazonlinux_2
+          - amazonlinux_2
           - debian_10
           - ubuntu_18.04
           - ubuntu_20.04
-          # - redhat_7
-          # - redhat_8
-          # - centos_7
-          # - centos_8
+          - centos_7
+          - centos_8
+          - fedora_33
+          - fedora_34
+          - fedora_35
         include:
           - arch: amd64
             # - arch: arm64
diff --git a/pkg/Dockerfile.base.deb b/pkg/Dockerfile.base.deb
index 84e32c840..4e16437e9 100644
--- a/pkg/Dockerfile.base.deb
+++ b/pkg/Dockerfile.base.deb
@@ -35,6 +35,7 @@ ENV LC_ALL en_US.UTF-8
 
 RUN git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf
 ENV PATH="/root/.asdf/bin:/root/.asdf/shims:${PATH}"
+RUN echo 'PATH="/root/.asdf/bin:/root/.asdf/shims:${PATH}"' >> /etc/environment
 COPY .tool-versions .tool-versions
 RUN asdf plugin-add nodejs
 RUN asdf plugin-add erlang
diff --git a/pkg/Dockerfile.base.rpm b/pkg/Dockerfile.base.rpm
index 376e248a7..bdc1eb4b0 100644
--- a/pkg/Dockerfile.base.rpm
+++ b/pkg/Dockerfile.base.rpm
@@ -15,17 +15,23 @@ RUN yum install -y \
     ncurses-devel \
     curl \
     git \
-    glibc-common \
-    glibc-locale-source \
-    glibc-langpack-en \
     findutils \
     unzip \
+    glibc-all-langpacks \
     rpmdevtools \
     rpmlint
 ENV SHELL /bin/zsh
-RUN localedef -i en_US -f UTF-8 en_US.UTF-8
+
+# Restore missing locales from base image
+RUN yum reinstall glibc-common -y && \
+    # localedef -i en_US -f UTF-8 en_US.UTF-8 && \
+    echo "LANG=en_US.UTF-8" > /etc/locale.conf
+ENV LANG en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
 RUN git clone --depth 1 https://github.com/asdf-vm/asdf.git $HOME/.asdf
 ENV PATH="/root/.asdf/bin:/root/.asdf/shims:${PATH}"
+RUN echo 'PATH="/root/.asdf/bin:/root/.asdf/shims:${PATH}"' >> /etc/environment
 COPY .tool-versions .tool-versions
 RUN asdf plugin-add nodejs
 RUN asdf plugin-add erlang