diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5938646..694c1eb 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,5 +1,6 @@
 docker:
-  - "Dockerfile/*"
+  - "images/*"
+  - ".github/workflows/docker*"
 
 documentation:
   - "**/*.md"
diff --git a/.github/workflows/docker-build-and-publish.yml b/.github/workflows/docker-build-and-publish.yml
index 991e08d..5549fd8 100644
--- a/.github/workflows/docker-build-and-publish.yml
+++ b/.github/workflows/docker-build-and-publish.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/standard-alpine-amd64 --no-cache -t standard-alpine-amd64:${{ github.sha }}
+        run: docker build . --file images/standard-alpine-amd64/Dockerfile --no-cache -t standard-alpine-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -61,7 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/standard-ubuntu-amd64 --no-cache -t standard-ubuntu-amd64:${{ github.sha }}
+        run: docker build . --file images/standard-ubuntu-amd64/Dockerfile --no-cache -t standard-ubuntu-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -97,7 +97,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/full-alpine-amd64 --no-cache -t full-alpine-amd64:${{ github.sha }}
+        run: docker build . --file images/full-alpine-amd64/Dockerfile --no-cache -t full-alpine-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
@@ -132,7 +132,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Build the Docker image
-        run: docker build . --file Dockerfile/full-ubuntu-amd64 --no-cache -t full-ubuntu-amd64:${{ github.sha }}
+        run: docker build . --file images/full-ubuntu-amd64/Dockerfile --no-cache -t full-ubuntu-amd64:${{ github.sha }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
diff --git a/Dockerfile/full-alpine-amd64 b/images/full-alpine-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/full-alpine-amd64
rename to images/full-alpine-amd64/Dockerfile
diff --git a/Dockerfile/full-ubuntu-amd64 b/images/full-ubuntu-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/full-ubuntu-amd64
rename to images/full-ubuntu-amd64/Dockerfile
diff --git a/Dockerfile/standard-alpine-amd64 b/images/standard-alpine-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/standard-alpine-amd64
rename to images/standard-alpine-amd64/Dockerfile
diff --git a/Dockerfile/standard-ubuntu-amd64 b/images/standard-ubuntu-amd64/Dockerfile
similarity index 100%
rename from Dockerfile/standard-ubuntu-amd64
rename to images/standard-ubuntu-amd64/Dockerfile