diff --git a/Dockerfile b/Dockerfile
index 17d37be0..7c8f4261 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 FROM ghcr.io/linuxserver/picons-builder as piconsstage
 
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -122,7 +122,7 @@ RUN \
     /tmp/argtable --strip-components=1 && \
   cp /tmp/patches/config.* /tmp/argtable && \
   cd /tmp/argtable && \
-  ./configure \
+  CFLAGS="-include ctype.h -include string.h" ./configure \
     --prefix=/usr && \
   make -j 2 && \
   make check && \
@@ -149,7 +149,7 @@ RUN \
     /picons
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 96866d06..6e1d68ed 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -5,7 +5,7 @@
 FROM ghcr.io/linuxserver/picons-builder as piconsstage
 
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 as buildstage
 ############## build stage ##############
 
 # package versions
@@ -122,7 +122,7 @@ RUN \
     /tmp/argtable --strip-components=1 && \
   cp /tmp/patches/config.* /tmp/argtable && \
   cd /tmp/argtable && \
-  ./configure \
+  CFLAGS="-include ctype.h -include string.h" ./configure \
     --prefix=/usr && \
   make -j 2 && \
   make check && \
@@ -150,7 +150,7 @@ RUN \
 
 
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 76f17124..bd10c102 100644
--- a/README.md
+++ b/README.md
@@ -355,6 +355,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.01.25:** - Rebase to Alpine 3.21.
 * **25.06.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **16.10.23:** - Add mesa-va-gallium package for AMD transcoding.