diff --git a/.github/workflows/master_merge.yml b/.github/workflows/master_merge.yml
index 0a56f4b..5d5d03e 100644
--- a/.github/workflows/master_merge.yml
+++ b/.github/workflows/master_merge.yml
@@ -279,13 +279,13 @@ jobs:
       - name: Get docker tag for psql-init image
         id: psql-init
         run: |
-          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/ckan/2.9/psql-init/Dockerfile)"
+          echo "::set-output name=IMAGE_TAG::$(awk -F '=' '/IMAGE_TAG/{print $2}' ./images/psql-init/Dockerfile)"
 
       - name: Build and push psql-init
         uses: docker/build-push-action@v2
         with:
-          context: ./images/ckan/2.9/psql-init
-          file: ./images/ckan/2.9/psql-init/Dockerfile
+          context: ./images/psql-init
+          file: ./images/psql-init/Dockerfile
           push: true
           tags: |
             keitaro/psql-init:${{ steps.psql-init.outputs.IMAGE_TAG }}
diff --git a/images/ckan/2.9/psql-init/Dockerfile b/images/psql-init/Dockerfile
similarity index 100%
rename from images/ckan/2.9/psql-init/Dockerfile
rename to images/psql-init/Dockerfile
diff --git a/images/ckan/2.9/psql-init/psql-init/psql-init.py b/images/psql-init/psql-init/psql-init.py
similarity index 100%
rename from images/ckan/2.9/psql-init/psql-init/psql-init.py
rename to images/psql-init/psql-init/psql-init.py
diff --git a/images/ckan/2.9/psql-init/psql-init/set_permissions.sql b/images/psql-init/psql-init/set_permissions.sql
similarity index 100%
rename from images/ckan/2.9/psql-init/psql-init/set_permissions.sql
rename to images/psql-init/psql-init/set_permissions.sql
diff --git a/images/ckan/2.9/psql-init/requirements.txt b/images/psql-init/requirements.txt
similarity index 100%
rename from images/ckan/2.9/psql-init/requirements.txt
rename to images/psql-init/requirements.txt