diff --git a/.github/workflows/master_merge.yml b/.github/workflows/master_merge.yml
index 9f9fb2a..37aaf2d 100644
--- a/.github/workflows/master_merge.yml
+++ b/.github/workflows/master_merge.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches: master
 
-env:
-  DOCKER_BUILDKIT: 1
 
 jobs:
   build-ckan-2-9:
diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
index c34a7f6..4619032 100644
--- a/.github/workflows/pr_checks.yml
+++ b/.github/workflows/pr_checks.yml
@@ -4,8 +4,6 @@ on:
   pull_request:
     branches: master
 
-env:
-  DOCKER_BUILDKIT: 1
 
 jobs:
   build-ckan-2-9:
@@ -26,20 +24,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-2-9
 
-      # - name: Get docker tag for Alpine image
-      #   id: alpine
-      #   run: |
-      #     echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile)"
+      - name: Get docker tag for Alpine image
+        id: alpine
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/Dockerfile)"
 
-      # - name: Build CKAN 2.9 alpine
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     context: ./images/ckan/2.9
-      #     file: ./images/ckan/2.9/Dockerfile
-      #     push: false
-      #     tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-      #     cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-9
-      #     cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-9
+      - name: Build CKAN 2.9 alpine
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/ckan/2.9
+          file: ./images/ckan/2.9/Dockerfile
+          push: false
+          tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-9
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-9
 
       - name: Get docker tag for Ubuntu image
         id: ubuntu
@@ -58,129 +56,129 @@ jobs:
           build-args: |
            --progress=plain
 
-  # build-ckan-2-8:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
+  build-ckan-2-8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
 
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-  #     - name: Cache Docker layers
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: |
-  #           /tmp/.buildx-cache-alpine-2-8
-  #           /tmp/.buildx-cache-ubuntu-2-8
-  #         key: ${{ runner.os }}-buildx-2-8-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-buildx-2-8
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: |
+            /tmp/.buildx-cache-alpine-2-8
+            /tmp/.buildx-cache-ubuntu-2-8
+          key: ${{ runner.os }}-buildx-2-8-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-2-8
 
-  #     - name: Get docker tag for Alpine image
-  #       id: alpine
-  #       run: |
-  #         echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)"
+      - name: Get docker tag for Alpine image
+        id: alpine
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile)"
 
-  #     - name: Build CKAN 2.8 alpine
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: ./images/ckan/2.8
-  #         file: ./images/ckan/2.8/Dockerfile
-  #         push: false
-  #         tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-  #         cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-8
-  #         cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-8
+      - name: Build CKAN 2.8 alpine
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/ckan/2.8
+          file: ./images/ckan/2.8/Dockerfile
+          push: false
+          tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-8
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-8
 
-  #     - name: Get docker tag for Ubuntu image
-  #       id: ubuntu
-  #       run: |
-  #         echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)"
+      - name: Get docker tag for Ubuntu image
+        id: ubuntu
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.8/Dockerfile.focal)"
 
-  #     - name: Build CKAN 2.8 ubuntu
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: ./images/ckan/2.8
-  #         file: ./images/ckan/2.8/Dockerfile.focal
-  #         push: false
-  #         tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }}
-  #         cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-8
-  #         cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-8
+      - name: Build CKAN 2.8 ubuntu
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/ckan/2.8
+          file: ./images/ckan/2.8/Dockerfile.focal
+          push: false
+          tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-8
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-8
 
-  # build-ckan-2-7:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
+  build-ckan-2-7:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
 
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-  #     - name: Cache Docker layers
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: |
-  #           /tmp/.buildx-cache-alpine-2-7
-  #           /tmp/.buildx-cache-ubuntu-2-7
-  #         key: ${{ runner.os }}-buildx-2-7-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-buildx-2-7
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: |
+            /tmp/.buildx-cache-alpine-2-7
+            /tmp/.buildx-cache-ubuntu-2-7
+          key: ${{ runner.os }}-buildx-2-7-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-2-7
 
-  #     - name: Get docker tag for Alpine image
-  #       id: alpine
-  #       run: |
-  #         echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)"
+      - name: Get docker tag for Alpine image
+        id: alpine
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile)"
 
-  #     - name: Build CKAN 2.7 alpine
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: ./images/ckan/2.7
-  #         file: ./images/ckan/2.7/Dockerfile
-  #         push: false
-  #         tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-  #         cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-7
-  #         cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-7
+      - name: Build CKAN 2.7 alpine
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/ckan/2.7
+          file: ./images/ckan/2.7/Dockerfile
+          push: false
+          tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-7
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-7
 
-  #     - name: Get docker tag for Ubuntu image
-  #       id: ubuntu
-  #       run: |
-  #         echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)"
+      - name: Get docker tag for Ubuntu image
+        id: ubuntu
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.7/Dockerfile.focal)"
 
-  #     - name: Build CKAN 2.7 ubuntu
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: ./images/ckan/2.7
-  #         file: ./images/ckan/2.7/Dockerfile.focal
-  #         push: false
-  #         tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }}
-  #         cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-7
-  #         cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-7
+      - name: Build CKAN 2.7 ubuntu
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/ckan/2.7
+          file: ./images/ckan/2.7/Dockerfile.focal
+          push: false
+          tags: keitaro/ckan:${{ steps.ubuntu.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-ubuntu-2-7
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-ubuntu-2-7
 
-  # build-ckan-datapusher:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
+  build-ckan-datapusher:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
 
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
-  #     - name: Cache Docker layers
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: /tmp/.buildx-cache-datapusher
-  #         key: ${{ runner.os }}-buildx-datapusher-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-buildx-datapusher
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache-datapusher
+          key: ${{ runner.os }}-buildx-datapusher-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-datapusher
 
-  #     - name: Get docker tag for datapusher image
-  #       id: datapusher
-  #       run: |
-  #         echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/datapusher/Dockerfile)"
+      - name: Get docker tag for datapusher image
+        id: datapusher
+        run: |
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/datapusher/Dockerfile)"
 
-  #     - name: Build CKAN datapusher
-  #       uses: docker/build-push-action@v2
-  #       with:
-  #         context: ./images/datapusher
-  #         file: ./images/datapusher/Dockerfile
-  #         push: false
-  #         tags: keitaro/ckandatapusher:${{ steps.datapusher.outputs.IMAGE_TAG }}
-  #         cache-from: type=local,src=/tmp/.buildx-cache-datapusher
-  #         cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-datapusher
+      - name: Build CKAN datapusher
+        uses: docker/build-push-action@v2
+        with:
+          context: ./images/datapusher
+          file: ./images/datapusher/Dockerfile
+          push: false
+          tags: keitaro/ckandatapusher:${{ steps.datapusher.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-datapusher
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-datapusher