diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 9e71aedac..cad8c6292 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -4,18 +4,20 @@ on: [push]
 jobs:
   Explore-GitHub-Actions:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:latest # You can specify any Docker image that fits your needs
 
     steps:
       - uses: actions/checkout@v3
         name: Check out code
-      - name:  Script Set 1
+      - name: Script Set 1
         run: |
-         echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
-         echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
-         echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-         echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
-         echo "🖥️ The workflow is now ready to test your code on the runner."
-         printenv | sort
+          echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+          echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+          echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+          echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+          echo "🖥️ The workflow is now ready to test your code on the runner."
+          printenv | sort
       - name: Script Set 2 - List files in the repository
         run: |
           ls ${{ github.workspace }} -alt
@@ -23,15 +25,14 @@ jobs:
 
   docker:
     runs-on: ubuntu-latest
+    container:
+      image: docker:latest # Running Docker commands inside Docker container (Docker-in-Docker)
+      options: --privileged # Required for Docker-in-Docker setup
+
     steps:
-      # -
-      #   name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKER_USERNAME }}
@@ -40,7 +41,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v6
         with:
-          # image: barrymatheney/spring-petclinic  
           push: true
           cache-from: type=registry,ref=${{ vars.DOCKER_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
           cache-to: type=inline          
@@ -49,8 +49,3 @@ jobs:
             ${{ vars.DOCKER_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ github.sha }},
             ${{ vars.DOCKER_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ github.run_id }},
             ${{ vars.DOCKER_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ github.ref_name }}
-
-          # tags: ${{ vars.DOCKER_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest
-
-          # tags: barrymatheney/spring-petclinic:${{ github.sha }} 
-          # , ${{ github.run_id }}, ${{ github.ref_name }}
\ No newline at end of file