diff --git a/Dockerfile b/Dockerfile
index e3ca3fc..1136445 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,3 +56,13 @@ RUN chmod +x /app/test_start_extension.sh
 
 # Start script
 CMD ["/app/test_start_extension.sh"]
+
+# Verify stage - automated testing with exit code
+FROM runtime AS verify
+
+# Copy verification script
+COPY scripts/test_verify.sh /app/test_verify.sh
+RUN chmod +x /app/test_verify.sh
+
+# Run verification and exit with proper exit code
+CMD ["/app/test_verify.sh"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..95463d3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+.PHONY: verify clean help
+
+# Default target - run verification
+verify:
+	@echo "Building and verifying Rentgen extension..."
+	docker compose up --force-recreate --build --abort-on-container-exit --exit-code-from rentgen_verify
+	@echo "✓ Verification completed successfully!"
+
+# Clean up Docker resources
+clean:
+	docker compose down --rmi local --volumes --remove-orphans
+
+# Help target
+help:
+	@echo "Rentgen Extension - Makefile"
+	@echo ""
+	@echo "Available targets:"
+	@echo "  make verify  - Build and verify extension (exits with error if verification fails)"
+	@echo "  make clean   - Clean up Docker resources"
+	@echo "  make help    - Show this help message"
diff --git a/compose.yml b/compose.yml
index 8d007bf..8709bfb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,3 +8,9 @@ services:
             target: runtime
         stdin_open: true
         tty: true
+
+    rentgen_verify:
+        build:
+            context: .
+            target: verify
+        restart: "no"