diff --git a/.github/workflows/v2.yml b/.github/workflows/v2.yml
index 1354cba7..4f22d004 100644
--- a/.github/workflows/v2.yml
+++ b/.github/workflows/v2.yml
@@ -111,7 +111,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          dockerfile: ./Dockerfile-ffmpeg
+          dockerfile: ./dockerfile/DebianJavaFfmpeg
           build-args:
             MODULE_NAME=processer
           push: true
@@ -159,7 +159,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          dockerfile: ./Dockerfile
+          dockerfile: ./dockerfile/DebianJava
           build-args:
             MODULE_NAME=converter
           push: true
@@ -207,7 +207,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          dockerfile: ./Dockerfile-ffmpeg
+          dockerfile: ./dockerfile/DebianJavaFfmpeg
           build-args:
             MODULE_NAME=coordinator
           push: true
@@ -251,6 +251,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./apps/pyMetadata
+          dockerfile: ./dockerfile/Python
           push: true
           tags: |
             bskjon/mediaprocessing-pymetadata:v2
diff --git a/Dockerfile b/dockerfiles/DebianJava
similarity index 100%
rename from Dockerfile
rename to dockerfiles/DebianJava
diff --git a/Dockerfile-ffmpeg b/dockerfiles/DebianJavaFfmpeg
similarity index 100%
rename from Dockerfile-ffmpeg
rename to dockerfiles/DebianJavaFfmpeg
diff --git a/apps/pyMetadata/Dockerfile b/dockerfiles/Python
similarity index 100%
rename from apps/pyMetadata/Dockerfile
rename to dockerfiles/Python