diff --git a/.github/workflows/build-and-publish-docker-image.yaml b/.github/workflows/build-and-publish-docker-image.yaml
new file mode 100644
index 0000000..99e02d4
--- /dev/null
+++ b/.github/workflows/build-and-publish-docker-image.yaml
@@ -0,0 +1,60 @@
+name: Build and publish docker image
+on:
+  workflow_dispatch:  
+  push:
+    branches:
+     - main
+     - use_head_commit
+    tags:
+      # any tag names starting with 'v'
+      - 'v*'
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      # Gives the action the ability to mint the OIDC token necessary to request a Sigstore signing certificate
+      id-token: write
+      # Permission necessary to persist the attestation
+      attestations: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set-up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64
+      - name: Log in to the Github Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
\ No newline at end of file
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
new file mode 100644
index 0000000..c0a577a
--- /dev/null
+++ b/.github/workflows/hadolint.yml
@@ -0,0 +1,15 @@
+name: Hadolint - Dockerfile linting
+on:
+  workflow_dispatch:  
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - "Dockerfile"
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          verbose: true
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..77a9be4
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,14 @@
+ # list of rules: https://github.com/hadolint/hadolint/wiki
+ignored:
+  - DL3008 # Pin versions in apt-get install - https://github.com/hadolint/hadolint/wiki/DL3008
+  # - DL3018 # Pin versions in apk add - https://github.com/hadolint/hadolint/wiki/DL3018
+  # - DL3028 # Pin version in gem install - https://github.com/hadolint/hadolint/wiki/DL3028
+
+trustedRegistries:
+  - docker.io
+  - "*.gcr.io"
+  - "*.ecr.eu-west-1.amazonaws.com"
+
+override:
+  warning:
+    - DL3028 # Pin version in gem install - https://github.com/hadolint/hadolint/wiki/DL3028
\ No newline at end of file
diff --git a/.ruby-version b/.ruby-version
index 2aa5131..7921bd0 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.4.7
+3.4.8
diff --git a/Dockerfile b/Dockerfile
index b7afdea..77dc9bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,25 @@
-FROM ruby:3.4.7
-
-LABEL maintainer="Devex <info@apptweak.com>"
+ARG RUBY_VERSION=3.4
+FROM ruby:${RUBY_VERSION}
+
+ARG BUNDLER_VERSION="2.6.7"
+ARG NODE_VERSION=14
+ARG BUILD_DATE=
+ARG CVS_REF=
+
+LABEL maintainer="DevEx Team <squad_devex@apptweak.com>"
+LABEL org.opencontainers.image.source https://github.com/apptweak/pronto-ruby
+LABEL org.opencontainers.image.title="AppTweak Pronto Ruby Runner"
+LABEL org.opencontainers.image.description="GitHub Action for running Pronto code review automation for Ruby projects"
 LABEL org.opencontainers.image.source="https://github.com/apptweak/pronto-ruby"
-
-ARG BUNDLER_VERSION="2.7.2"
+LABEL org.opencontainers.image.url="https://github.com/apptweak/pronto-ruby"
+LABEL org.opencontainers.image.vendor="AppTweak"
+LABEL org.opencontainers.image.version=${CVS_REF}
+LABEL org.opencontainers.image.created=${BUILD_DATE}
 
 RUN apt-get update && apt-get install -y curl
 
 RUN apt-get update && \
   apt-get install --no-install-recommends -y \
-  ruby-dev \
   build-essential \
   cmake \
   git \
@@ -20,6 +30,10 @@ RUN apt-get update && \
   libz-dev \
   && rm -rf /var/lib/apt/lists/*
 
+# Make sure to use bash with pipefail in case something
+# fails while being piped to another command in the docker-build
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN gem install bundler --version "${BUNDLER_VERSION}"
 
 WORKDIR /runner