diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f8270920b..0afb04383 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-lite
           tags: ghcr.io/${{ github.repository }}/viadot-lite:${{ github.event.inputs.tag }}
@@ -50,7 +50,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-aws
           tags: ghcr.io/${{ github.repository }}/viadot-aws:${{ github.event.inputs.tag }}
@@ -60,7 +60,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           target: viadot-azure
           tags: ghcr.io/${{ github.repository }}/viadot-azure:${{ github.event.inputs.tag }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c0351a093..c5ba6c350 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -53,11 +53,11 @@ RUN chmod +rwx /usr/lib/ssl/openssl.cnf && \
 
 # ODBC -- make sure to pin driver version as it's reflected in odbcinst.ini
 RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-    curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
+    curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list && \
     apt update -q && \
     apt install -q libsqliteodbc && \
-    ACCEPT_EULA=Y apt install -q -y msodbcsql17=17.10.1.1-1 && \
-    ACCEPT_EULA=Y apt install -q -y mssql-tools=17.10.1.1-1 && \
+    ACCEPT_EULA=Y apt install -q -y msodbcsql18=18.4.1.1-1 && \
+    ACCEPT_EULA=Y apt install -q -y mssql-tools18=18.4.1.1-1 && \
     echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc
 
 COPY docker/odbcinst.ini /etc