diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5ecfd2239d..97109128cc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -53,7 +53,7 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-contexts: tinygo-llvm-build=docker-image://tinygo/llvm-16
+          build-contexts: tinygo-llvm-build=docker-image://tinygo/llvm-17
           cache-from: type=gha
           cache-to: type=gha,mode=max
       - name: Trigger Drivers repo build on Github Actions
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
index ff9f3952b2..3cf77b6c58 100644
--- a/.github/workflows/llvm.yml
+++ b/.github/workflows/llvm.yml
@@ -35,8 +35,8 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            tinygo/llvm-16
-            ghcr.io/${{ github.repository_owner }}/llvm-16
+            tinygo/llvm-17
+            ghcr.io/${{ github.repository_owner }}/llvm-17
           tags: |
             type=sha,format=long
             type=raw,value=latest
diff --git a/Dockerfile b/Dockerfile
index ad3b586d83..44d262ef7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM golang:1.21 AS tinygo-llvm
 RUN apt-get update && \
     apt-get install -y apt-utils make cmake clang-15 ninja-build
 
-COPY ./Makefile /tinygo/Makefile
+COPY ./GNUmakefile /tinygo/GNUmakefile
 
 RUN cd /tinygo/ && \
     make llvm-source