diff --git a/images/ckan/2.7/Dockerfile b/images/ckan/2.7/Dockerfile
index c9b1817..3c6d041 100644
--- a/images/ckan/2.7/Dockerfile
+++ b/images/ckan/2.7/Dockerfile
@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.14.2 as ckanbuild
+FROM alpine:3.15.0 as ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.7.12
@@ -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.14.2 as extbuild
+FROM alpine:3.15.0 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.14.2
+FROM alpine:3.15.0
 
 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 bc5c9e2..4d695eb 100644
--- a/images/ckan/2.7/Dockerfile.focal
+++ b/images/ckan/2.7/Dockerfile.focal
@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210827 as ckanbuild
+FROM ubuntu:focal-20220105 as ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.7.12-focal
@@ -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-20210827 as extbuild
+FROM ubuntu:focal-20220105 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-20210827
+FROM ubuntu:focal-20220105
 
 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 fc47399..4847609 100644
--- a/images/ckan/2.8/Dockerfile
+++ b/images/ckan/2.8/Dockerfile
@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.14.2 as ckanbuild
+FROM alpine:3.15.0 as ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.8.10
@@ -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.14.2 as extbuild
+FROM alpine:3.15.0 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.14.2
+FROM alpine:3.15.0
 
 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 6ff0a95..c2302f7 100644
--- a/images/ckan/2.8/Dockerfile.focal
+++ b/images/ckan/2.8/Dockerfile.focal
@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210827 as ckanbuild
+FROM ubuntu:focal-20220105 as ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.8.10-focal
@@ -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-20210827 as extbuild
+FROM ubuntu:focal-20220105 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-20210827
+FROM ubuntu:focal-20220105
 
 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 d20a965..f746371 100644
--- a/images/ckan/2.9/Dockerfile
+++ b/images/ckan/2.9/Dockerfile
@@ -1,6 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
+
 FROM alpine:3.13.7 as ckanbuild
 
 # Used by Github Actions to tag the image with
@@ -79,6 +80,7 @@ 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 \
         python3 \
         python3-dev \
@@ -115,8 +117,10 @@ 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 \
         python3 \
+        git \
         bash \
         gettext \
         curl \
diff --git a/images/ckan/2.9/Dockerfile.focal b/images/ckan/2.9/Dockerfile.focal
index c8edbcb..a6da9f7 100644
--- a/images/ckan/2.9/Dockerfile.focal
+++ b/images/ckan/2.9/Dockerfile.focal
@@ -1,7 +1,7 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM ubuntu:focal-20210827 as ckanbuild
+FROM ubuntu:focal-20220105 as ckanbuild
 
 # Used by Github Actions to tag the image with
 ENV IMAGE_TAG=2.9.5-focal
@@ -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-20210827 as extbuild
+FROM ubuntu:focal-20220105 as extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -127,7 +127,7 @@ RUN pip wheel --wheel-dir=/wheels git+${ENVVARS_GIT_URL}@${ENVVARS_GIT_BRANCH}#e
 ############
 ### MAIN ###
 ############
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20220105
 
 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/patches/03_patch_requirements_in.patch b/images/ckan/2.9/patches/03_patch_requirements_in.patch
new file mode 100644
index 0000000..28bd1c6
--- /dev/null
+++ b/images/ckan/2.9/patches/03_patch_requirements_in.patch
@@ -0,0 +1,11 @@
+--- ckan/requirements.in	2022-01-19 01:33:36.736080826 +0100
++++ ckan/requirements.in	2022-01-19 01:35:54.517310487 +0100
+@@ -13,7 +13,7 @@
+ flask-multistatic==1.0
+ Jinja2==2.10.1
+ PyJWT==1.7.1
+-Markdown==2.6.7
++Markdown==3.3.3
+ passlib==1.6.5
+ polib==1.0.7
+ psycopg2==2.8.2
diff --git a/images/ckan/2.9/patches/04_patch_requirements_txt.patch b/images/ckan/2.9/patches/04_patch_requirements_txt.patch
new file mode 100644
index 0000000..63113c8
--- /dev/null
+++ b/images/ckan/2.9/patches/04_patch_requirements_txt.patch
@@ -0,0 +1,11 @@
+--- ckan/requirements.txt	2022-01-19 01:33:36.736080826 +0100
++++ ckan/requirements.txt	2022-01-19 01:37:35.882216912 +0100
+@@ -23,7 +23,7 @@
+ jinja2==2.10.1            # via -r requirements.in, flask, flask-babel
+ lxml==4.6.3               # via feedgen
+ mako==1.1.5               # via alembic
+-markdown==2.6.7           # via -r requirements.in
++markdown==3.3.3           # via -r requirements.in
+ markupsafe==1.1.1         # via jinja2, mako
+ nose==1.3.7               # via pyutilib
+ passlib==1.6.5            # via -r requirements.in