diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a5391369..9b2d3512 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,7 +28,7 @@ jobs:
           envkey_PINECONE_REGION: ${{ secrets.PINECONE_REGION }}
 
       - name: Build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           set: |
             *.cache-from=type=gha
@@ -77,7 +77,7 @@ jobs:
           envkey_PINECONE_REGION: ${{ secrets.PINECONE_REGION }}
 
       - name: Load Image
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v5
         with:
           load: true
           set: |
diff --git a/Dockerfile b/Dockerfile
index 8fd0dee7..b5ab2e69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.2-slim as runtime
+FROM python:3.12.2-slim AS runtime
 
 ENV PYTHONPATH=/app/
 ENV RUNTIME_PACKAGES="git curl make"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 467dc9e6..7e99958a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,27 +1,28 @@
-version: "3.8"
-
-x-base-app-test: &base-app-test
-  image: dynamiq-app:${IMAGE_TAG:-local}
-  build:
-    target: develop
-  volumes:
-    - ./:/app
-
 services:
   dynamiq-app:
-    # Caching target to avoid cache duplication
-    <<: *base-app-test
+    image: dynamiq-app:${IMAGE_TAG:-local}
+    build:
+      target: develop
+    volumes:
+      - ./:/app
 
-  dynamiq-app-test: &app-test
-    <<: *base-app-test
+  dynamiq-app-test:
+    image: dynamiq-app:${IMAGE_TAG:-local}
+    build:
+      target: develop
     entrypoint: ["make", "test"]
     env_file:
       - .env
+    volumes:
+      - ./:/app
 
   dynamiq-app-test-cov:
-    <<: *app-test
+    image: dynamiq-app:${IMAGE_TAG:-local}
+    build:
+      target: develop
     entrypoint: ["make", "test-cov"]
     env_file:
       - .env
     volumes:
+      - ./:/app
       - ./reports:/app/reports:wr
diff --git a/dynamiq/components/evaluators/llm_evaluator.py b/dynamiq/components/evaluators/llm_evaluator.py
index cd68fc5c..8fd91a1b 100644
--- a/dynamiq/components/evaluators/llm_evaluator.py
+++ b/dynamiq/components/evaluators/llm_evaluator.py
@@ -266,7 +266,8 @@ def prepare_template(self) -> str:
         return (
             f"Instructions:\n"
             f"{self.instructions}\n\n"
-            f"Generate the response in JSON format with the following keys:\n"
+            f"Generate the response in JSON format omit extra keys and markdown syntax elements, "
+            f"and include the following keys:\n"
             f"{json.dumps(self.outputs)}\n"
             f"Consider the instructions and the examples below to determine those values.\n\n"
             f"Examples:\n"
diff --git a/pyproject.toml b/pyproject.toml
index f1ea6425..c6dc5566 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "dynamiq"
-version = "0.3.2"
+version = "0.3.3"
 description = "Dynamiq is an orchestration framework for agentic AI and LLM applications"
 authors = ["Dynamiq Team <hello@getdynamiq.ai>"]
 license = "Apache License 2.0"