diff --git a/Readme.md b/Readme.md
index 3c2fddb..7c5887d 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.4 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.5 as extbuild
 
 # Switch to the root user
 USER root
@@ -64,7 +64,7 @@ RUN pip wheel --wheel-dir=/wheels git+https://github.com/acmecorp/ckanext-acme@0
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.9.4
+FROM ghcr.io/keitaroinc/ckan:2.9.5
 
 # Add the custom extensions to the plugins list
 ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher acme
@@ -94,9 +94,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.4 images/ckan/2.9
+docker build --tag ghcr.io/keitaroinc/ckan:2.9.5 images/ckan/2.9
 ``` 
-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.
+The –-tag ghcr.io/keitaroinc/ckan:2.9.5 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.5 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 57ae85f..8eb7389 100644
--- a/compose/.env
+++ b/compose/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.9.4
+CKAN_VERSION=2.9.5
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/compose/solr/solrconfig-2.7.12.xml b/compose/solr/solrconfig-2.7.12.xml
index 6269124..6e325cc 120000
--- a/compose/solr/solrconfig-2.7.12.xml
+++ b/compose/solr/solrconfig-2.7.12.xml
@@ -1 +1 @@
-solrconfig-2.8.9.xml
\ No newline at end of file
+solrconfig-2.8.10.xml
\ No newline at end of file
diff --git a/compose/solr/solrconfig-2.8.9.xml b/compose/solr/solrconfig-2.8.10.xml
similarity index 100%
rename from compose/solr/solrconfig-2.8.9.xml
rename to compose/solr/solrconfig-2.8.10.xml
diff --git a/compose/solr/solrconfig-2.9.4.xml b/compose/solr/solrconfig-2.9.5.xml
similarity index 100%
rename from compose/solr/solrconfig-2.9.4.xml
rename to compose/solr/solrconfig-2.9.5.xml
diff --git a/examples/harvest/.env b/examples/harvest/.env
index 57ae85f..8eb7389 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.4
+CKAN_VERSION=2.9.5
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/examples/harvest/Dockerfile b/examples/harvest/Dockerfile
index edc747a..0975804 100644
--- a/examples/harvest/Dockerfile
+++ b/examples/harvest/Dockerfile
@@ -1,7 +1,7 @@
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.5 as extbuild
 
 # Locations and tags, please use specific tags or revisions
 ENV HARVEST_GIT_URL=https://github.com/ckan/ckanext-harvest
@@ -32,7 +32,7 @@ USER ckan
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.9.4
+FROM ghcr.io/keitaroinc/ckan:2.9.5
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 
diff --git a/examples/s3filestore/.env b/examples/s3filestore/.env
index 57ae85f..8eb7389 100644
--- a/examples/s3filestore/.env
+++ b/examples/s3filestore/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.9.4
+CKAN_VERSION=2.9.5
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile
index 0d55cee..c8e6a7e 100644
--- a/examples/s3filestore/Dockerfile
+++ b/examples/s3filestore/Dockerfile
@@ -1,7 +1,7 @@
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.9.4 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.5 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.4
+FROM ghcr.io/keitaroinc/ckan:2.9.5
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 
diff --git a/images/ckan/2.8/Dockerfile b/images/ckan/2.8/Dockerfile
index 354e8d2..fc47399 100644
--- a/images/ckan/2.8/Dockerfile
+++ b/images/ckan/2.8/Dockerfile
@@ -4,11 +4,11 @@
 FROM alpine:3.14.2 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.8.9
+ENV IMAGE_TAG=2.8.10
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.8.9
+ENV GIT_BRANCH=ckan-2.8.10
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
diff --git a/images/ckan/2.8/Dockerfile.focal b/images/ckan/2.8/Dockerfile.focal
index 199f28b..6ff0a95 100644
--- a/images/ckan/2.8/Dockerfile.focal
+++ b/images/ckan/2.8/Dockerfile.focal
@@ -4,11 +4,11 @@
 FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.8.9-focal
+ENV IMAGE_TAG=2.8.10-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.8.9
+ENV GIT_BRANCH=ckan-2.8.10
 
 # Set timezone
 ENV TZ=UTC
diff --git a/images/ckan/2.9/Dockerfile b/images/ckan/2.9/Dockerfile
index 2d71771..d20a965 100644
--- a/images/ckan/2.9/Dockerfile
+++ b/images/ckan/2.9/Dockerfile
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.14.2 as ckanbuild
+FROM alpine:3.13.7 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.9.4
+ENV IMAGE_TAG=2.9.5
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.9.4
+ENV GIT_BRANCH=ckan-2.9.5
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -17,11 +17,9 @@ ENV PIP_SRC=${SRC_DIR}
 WORKDIR ${SRC_DIR}
 
 # Packages to build CKAN requirements and plugins
-# 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 \
+RUN apk add --no-cache \
+        python3 \
+        python3-dev \
         git \
         curl \
         postgresql-dev \
@@ -68,7 +66,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.14.2 as extbuild
+FROM alpine:3.13.7 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -81,11 +79,9 @@ ENV DEFAULT_EXTENSIONS envvars
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
 ENV ENVVARS_GIT_BRANCH=0.0.1
 
-# 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 \
+RUN apk add --no-cache \
+        python3 \
+        python3-dev \
         git \
         curl 
 
@@ -105,7 +101,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM alpine:3.14.2
+FROM alpine:3.13.7
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 LABEL org.opencontainers.image.source https://github.com/keitaroinc/docker-ckan
@@ -119,10 +115,8 @@ 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
-# 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 \
+RUN apk add --no-cache \
+        python3 \
         bash \
         gettext \
         curl \
diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal
index f38dd17..c8edbcb 100644
--- a/images/ckan/2.9/Dockerfile.focal
+++ b/images/ckan/2.9/Dockerfile.focal
@@ -4,11 +4,11 @@
 FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.9.4-focal
+ENV IMAGE_TAG=2.9.5-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.9.4
+ENV GIT_BRANCH=ckan-2.9.5
 
 # Set timezone
 ENV TZ=UTC
@@ -118,6 +118,9 @@ RUN mkdir -p ${SRC_DIR}
 RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
     python ${SRC_DIR}/get-pip.py
 
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
 # Fetch and build the default CKAN extensions
 RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#egg=ckanext-envvars
 
@@ -180,6 +183,9 @@ RUN apt-get update && \
 RUN curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
     python ${SRC_DIR}/get-pip.py
 
+# Downgrade setuptools so that CKAN requirements can be built
+RUN pip install setuptools==44.1.0
+
 # Get artifacts from build stages
 COPY --from=ckanbuild /wheels /srv/app/wheels
 COPY --from=extbuild /wheels /srv/app/ext_wheels