diff --git a/.github/workflows/publish-registry.yml b/.github/workflows/publish-registry.yml
index 02d1905d..eb0eb293 100644
--- a/.github/workflows/publish-registry.yml
+++ b/.github/workflows/publish-registry.yml
@@ -7,7 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        spark_version: [ 3.1.3, 3.2.1, 3.3.0 ]
+        include:
+          - spark_version: 3.1.3
+            hadoop_version: 3.2
+          - spark_version: 3.2.2
+            hadoop_version: 3.2
+          - spark_version: 3.3.0
+            hadoop_version: 3
     steps:
       - uses: docker/setup-buildx-action@v1
       - uses: docker/login-action@v1
@@ -20,4 +26,5 @@ jobs:
           push: true
           build-args: |
             SPARK_VERSION=${{ matrix.spark_version }}
+            HADOOP_VERSION=${{ matrix.hadoop_version }}
           tags: ghcr.io/exacaster/lighter:${{ github.event.release.tag_name }}-spark${{ matrix.spark_version }}
diff --git a/Dockerfile b/Dockerfile
index 5373a279..0c26e911 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,13 @@ RUN ./gradlew build -PSPARK_VERSION=${SPARK_VERSION}
 FROM node:lts-alpine3.14 as frontend
 
 ARG SPARK_VERSION=3.3.0
+ARG HADOOP_VERSION=3
 
 ENV REACT_APP_API_BASE_URL='/lighter'
 
 WORKDIR /home/app/
 COPY frontend/ ./frontend/
-RUN wget "https://downloads.apache.org/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz" -O - | tar -xz
+RUN wget "https://downloads.apache.org/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz" -O - | tar -xz
 
 WORKDIR /home/app/frontend/
 RUN yarn install && yarn build
diff --git a/README.md b/README.md
index 579b7c2d..f7e3954c 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ docker build -t lighter .
 
 ### Spark versions
 
-Lighter will always try to support the latest patch version for all officially recommended [Apache Spark](https://spark.apache.org/) releases i.e.: 3.1.3, 3.2.1 and 3.3.0.
+Lighter will always try to support the latest patch version for all officially recommended [Apache Spark](https://spark.apache.org/) releases i.e.: 3.1.3, 3.2.2 and 3.3.0.
 
 ### Contributing