diff --git a/Readme.md b/Readme.md
index ebc9369..ffd25bc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -48,7 +48,7 @@ We recommend to use a multi-stage approach to extend the docker images that we p
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
 
 # Switch to the root user
 USER root
@@ -62,7 +62,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.9.3
+FROM ghcr.io/keitaroinc/ckan:2.9.4
 
 # Add the custom extensions to the plugins list
 ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme
@@ -92,9 +92,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit
 ## Build
 To build a CKAN image run:
 ```sh 
-docker build --tag ghcr.io/keitaroinc/ckan:2.9.3 images/ckan/2.9
+docker build --tag ghcr.io/keitaroinc/ckan:2.9.4 images/ckan/2.9
 ``` 
-The –-tag ghcr.io/keitaroinc/ckan:2.9.3 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.3 and 'images/ckan/2.9'  at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
+The –-tag ghcr.io/keitaroinc/ckan:2.9.4 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.4 and 'images/ckan/2.9'  at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
 
 ## Upload to DockerHub
 >*It's recommended to upload built images to DockerHub* 
diff --git a/compose/.env b/compose/.env
index 446d552..57ae85f 100644
--- a/compose/.env
+++ b/compose/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.9.3
+CKAN_VERSION=2.9.4
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/compose/solr/solrconfig-2.7.11.xml b/compose/solr/solrconfig-2.7.11.xml
deleted file mode 120000
index 0f440c8..0000000
--- a/compose/solr/solrconfig-2.7.11.xml
+++ /dev/null
@@ -1 +0,0 @@
-solrconfig-2.8.8.xml
\ No newline at end of file
diff --git a/compose/solr/solrconfig-2.7.12.xml b/compose/solr/solrconfig-2.7.12.xml
new file mode 120000
index 0000000..6269124
--- /dev/null
+++ b/compose/solr/solrconfig-2.7.12.xml
@@ -0,0 +1 @@
+solrconfig-2.8.9.xml
\ No newline at end of file
diff --git a/compose/solr/solrconfig-2.8.8.xml b/compose/solr/solrconfig-2.8.9.xml
similarity index 100%
rename from compose/solr/solrconfig-2.8.8.xml
rename to compose/solr/solrconfig-2.8.9.xml
diff --git a/compose/solr/solrconfig-2.9.3.xml b/compose/solr/solrconfig-2.9.4.xml
similarity index 100%
rename from compose/solr/solrconfig-2.9.3.xml
rename to compose/solr/solrconfig-2.9.4.xml
diff --git a/examples/harvest/.env b/examples/harvest/.env
index 446d552..57ae85f 100644
--- a/examples/harvest/.env
+++ b/examples/harvest/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.9.3
+CKAN_VERSION=2.9.4
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile
index 9dc972c..e708d6a 100644
--- a/examples/harvest/Dockerfile
+++ b/examples/harvest/Dockerfile
@@ -1,7 +1,7 @@
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
 
 # Locations and tags, please use specific tags or revisions
 ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest
@@ -30,7 +30,7 @@ USER ckan
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.9.3
+FROM ghcr.io/keitaroinc/ckan:2.9.4
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 
diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env
index a6a2833..57ae85f 100644
--- a/examples/s3filestore/.env
+++ b/examples/s3filestore/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.8.8
+CKAN_VERSION=2.9.4
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile
index 8585521..0d55cee 100644
--- a/examples/s3filestore/Dockerfile
+++ b/examples/s3filestore/Dockerfile
@@ -1,7 +1,7 @@
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
 
 # Locations and tags, please use specific tags or revisions
 ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore
@@ -20,7 +20,7 @@ USER ckan
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.9.3
+FROM ghcr.io/keitaroinc/ckan:2.9.4
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 
diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile
index 5a39a7d..c9b1817 100644
--- a/images/ckan/2.7/Dockerfile
+++ b/images/ckan/2.7/Dockerfile
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.13.5 as ckanbuild
+FROM alpine:3.14.2 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.7.11
+ENV IMAGE_TAG=2.7.12
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.7.11
+ENV GIT_BRANCH=ckan-2.7.12
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -64,7 +64,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM alpine:3.13.5 as extbuild
+FROM alpine:3.14.2 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -96,7 +96,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM alpine:3.13.5
+FROM alpine:3.14.2
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
diff --git a/images/ckan/2.7/Dockerfile.focal b/images/ckan/2.7/Dockerfile.focal
index a5fa0a1..bc5c9e2 100644
--- a/images/ckan/2.7/Dockerfile.focal
+++ b/images/ckan/2.7/Dockerfile.focal
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210416 as ckanbuild
+FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.7.11-focal
+ENV IMAGE_TAG=2.7.12-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.7.11
+ENV GIT_BRANCH=ckan-2.7.12
 
 # Set timezone
 ENV TZ=UTC
@@ -89,7 +89,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM ubuntu:focal-20210416 as extbuild
+FROM ubuntu:focal-20210827 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -123,7 +123,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210827
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile
index 6fb652d..354e8d2 100644
--- a/images/ckan/2.8/Dockerfile
+++ b/images/ckan/2.8/Dockerfile
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.13.5 as ckanbuild
+FROM alpine:3.14.2 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.8.8
+ENV IMAGE_TAG=2.8.9
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.8.8
+ENV GIT_BRANCH=ckan-2.8.9
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -60,7 +60,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM alpine:3.13.5 as extbuild
+FROM alpine:3.14.2 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -92,7 +92,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM alpine:3.13.5
+FROM alpine:3.14.2
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal
index 52dbac3..199f28b 100644
--- a/images/ckan/2.8/Dockerfile.focal
+++ b/images/ckan/2.8/Dockerfile.focal
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210416 as ckanbuild
+FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.8.8-focal
+ENV IMAGE_TAG=2.8.9-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.8.8
+ENV GIT_BRANCH=ckan-2.8.9
 
 # Set timezone
 ENV TZ=UTC
@@ -81,7 +81,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM ubuntu:focal-20210416 as extbuild
+FROM ubuntu:focal-20210827 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -115,7 +115,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210827
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile
index 70e7cd1..2d71771 100644
--- a/images/ckan/2.9/Dockerfile
+++ b/images/ckan/2.9/Dockerfile
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.13.5 as ckanbuild
+FROM alpine:3.14.2 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.9.3
+ENV IMAGE_TAG=2.9.4
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.9.3
+ENV GIT_BRANCH=ckan-2.9.4
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -17,10 +17,13 @@ ENV PIP_SRC=${SRC_DIR}
 WORKDIR ${SRC_DIR}
 
 # Packages to build CKAN requirements and plugins
-RUN apk add --no-cache \
+# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
+RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
+        python3=3.8.10-r0 \
+        python3-dev=3.8.10-r0 && \
+    apk add --no-cache \
         git \
         curl \
-        python3 \
         postgresql-dev \
         linux-headers \
         gcc \
@@ -33,7 +36,6 @@ RUN apk add --no-cache \
         musl-dev \
         pcre-dev \
         pcre \
-        python3-dev \
         libffi-dev \
         libxml2-dev \
         libxslt-dev
@@ -66,7 +68,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM alpine:3.13.5 as extbuild
+FROM alpine:3.14.2 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -79,11 +81,13 @@ ENV DEFAULT_EXTENSIONS envvars
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
 ENV ENVVARS_GIT_BRANCH=0.0.1
 
-RUN apk add --no-cache \
+# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
+RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
+        python3=3.8.10-r0 \
+        python3-dev=3.8.10-r0 && \
+    apk add --no-cache \
         git \
-        curl \
-        python3 \
-        python3-dev
+        curl 
 
 # Link python to python3
 RUN ln -s /usr/bin/python3 /usr/bin/python
@@ -101,7 +105,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM alpine:3.13.5
+FROM alpine:3.14.2
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
@@ -115,12 +119,14 @@ ENV CKAN_SITE_URL=http://localhost:5000
 ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
 
 # Install necessary packages to run CKAN
-RUN apk add --no-cache git \
+# Make sure we install python 3.8, cause CKAN is not compatible with 3.9
+RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
+        python3=3.8.10-r0 && \
+    apk add --no-cache git \
         bash \
         gettext \
         curl \
         postgresql-client \
-        python3 \
         libmagic \
         pcre \
         libxslt \
diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal
index 15efe51..f38dd17 100644
--- a/images/ckan/2.9/Dockerfile.focal
+++ b/images/ckan/2.9/Dockerfile.focal
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210416 as ckanbuild
+FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.9.3-focal
+ENV IMAGE_TAG=2.9.4-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.9.3
+ENV GIT_BRANCH=ckan-2.9.4
 
 # Set timezone
 ENV TZ=UTC
@@ -87,7 +87,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==21.1.2 greenlet==1.1.0
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM ubuntu:focal-20210416 as extbuild
+FROM ubuntu:focal-20210827 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -124,7 +124,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM ubuntu:focal-20210416
+FROM ubuntu:focal-20210827
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
diff --git a/images/datapusher/Dockerfile b/images/datapusher/Dockerfile
index fcb51b8..352bf95 100644
--- a/images/datapusher/Dockerfile
+++ b/images/datapusher/Dockerfile
@@ -1,7 +1,7 @@
 #############
 ### Build ###
 #############
-FROM alpine:3.13.5 as build
+FROM alpine:3.14.2 as build
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=0.0.17
@@ -56,7 +56,7 @@ RUN pip wheel --wheel-dir=/wheels uwsgi==2.0.19.1 gevent==20.6.2 greenlet==0.4.1
 ############
 ### MAIN ###
 ############
-FROM alpine:3.13.5
+FROM alpine:3.14.2
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan