diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml
index 57052ba17f..78a3154ec1 100644
--- a/.github/workflows/test-docker-build.yml
+++ b/.github/workflows/test-docker-build.yml
@@ -1,61 +1,59 @@
-# name: Test Docker images (on PR)
+name: Test Docker images (on PR)
 
-# on:
-#   pull_request:
-#     paths:
-#       # Run only when DockerFile files are modified
-#       - "docker/**"
-
-# jobs:
-#   get_changed_files:
-#     name: "Build all modified docker images"
-#     runs-on: ubuntu-latest
-#     outputs:
-#       matrix: ${{ steps.set-matrix.outputs.matrix }}
-#     steps:
-#       - name: Check out code
-#         uses: actions/checkout@v3
-#       - name: Get changed files
-#         id: changed-files
-#         uses: tj-actions/changed-files@3f54ebb830831fc121d3263c1857cfbdc310cdb9 #v42
-#         with:
-#           files: docker/**
-#           json: "true"
-#       - name: Run step if only the files listed above change
-#         if: steps.changed-files.outputs.any_changed == 'true'
-#         id: set-matrix
-#         run: |
-#           for file in ${{ steps.changed-files.outputs.all_changed_files}}; do
-#             echo "$file was changed"
-#           done 
-#           echo "matrix=${{ steps.changed-files.outputs.all_changed_files}}" >> $GITHUB_OUTPUT
-#   build_modified_files:
-#     needs: get_changed_files
-#     name: Build Docker images on modified files
-#     runs-on: ubuntu-latest
-#     if: ${{ needs.get_changed_files.outputs.matrix }} != ''
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         docker-file: ${{ fromJson(needs.get_changed_files.outputs.matrix) }}
-#     steps:
-#       - name: Cleanup disk
-#         run: |
-#           sudo ls -l /usr/local/lib/
-#           sudo ls -l /usr/share/
-#           sudo du -sh /usr/local/lib/
-#           sudo du -sh /usr/share/
-#           sudo rm -rf /usr/local/lib/android
-#           sudo rm -rf /usr/share/dotnet
-#           sudo du -sh /usr/local/lib/
-#           sudo du -sh /usr/share/
-#       - name: Set up Docker Buildx
-#         uses: docker/setup-buildx-action@v1
-#       - name: Check out code
-#         uses: actions/checkout@v3
-#       - name: Build Docker image
-#         uses: docker/build-push-action@v4
-#         with:
-#           file: ${{ matrix.docker-file }}
-#           context: .
-#           push: False
+on:
+  pull_request:
+    paths:
+      # Run only when DockerFile files are modified
+      - "docker/**"
+jobs:
+  get_changed_files:
+    name: "Build all modified docker images"
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@1c8e6069583811afb28f97afeaf8e7da80c6be5c #v42
+        with:
+          files: docker/**
+          json: "true"
+      - name: Run step if only the files listed above change
+        if: steps.changed-files.outputs.any_changed == 'true'
+        id: set-matrix
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
+        run: |
+          echo "matrix=${{ steps.changed-files.outputs.all_changed_files}}" >> $GITHUB_OUTPUT
+  build_modified_files:
+    needs: get_changed_files
+    name: Build Docker images on modified files
+    runs-on: ubuntu-latest
+    if: ${{ needs.get_changed_files.outputs.matrix }} != ''
+    strategy:
+      fail-fast: false
+      matrix:
+        docker-file: ${{ fromJson(needs.get_changed_files.outputs.matrix) }}
+    steps:
+      - name: Cleanup disk
+        run: |
+          sudo ls -l /usr/local/lib/
+          sudo ls -l /usr/share/
+          sudo du -sh /usr/local/lib/
+          sudo du -sh /usr/share/
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/share/dotnet
+          sudo du -sh /usr/local/lib/
+          sudo du -sh /usr/share/
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Check out code
+        uses: actions/checkout@v3
+      - name: Build Docker image
+        uses: docker/build-push-action@v4
+        with:
+          file: ${{ matrix.docker-file }}
+          context: .
+          push: False