diff --git a/Dockerfile b/Dockerfile
index 41f0dd4..14f793f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
+ARG BUILD_BASE_IMAGE=alpine:3.23 #Fallback alpine:3.23
+FROM ${BUILD_BASE_IMAGE}
 
 ARG BUILD_DATE
 ARG BUILD_APP_VERSION
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 41f0dd4..14f793f 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,5 @@
-FROM git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
+ARG BUILD_BASE_IMAGE=alpine:3.23 #Fallback alpine:3.23
+FROM ${BUILD_BASE_IMAGE}
 
 ARG BUILD_DATE
 ARG BUILD_APP_VERSION
diff --git a/buildargs.env b/buildargs.env
index b0939ce..a1870b7 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -1,9 +1,9 @@
 ## BUILD STAGE
 BUILD_TAG=1.4.82
-BUILD_BASE_IMAGE=alpine:3.23
+BUILD_BASE_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
 BUILD_MAINTAINER=pi-farm
 BUILD_APP_VERSION=v${BUILD_TAG}
-BUILD_APP_NAME=basimage-alpine-lighttpd
+BUILD_APP_NAME=baseimage-alpine-lighttpd
 BUILD_APP_USER=pi
 BUILD_APP_UID=1000
 BUILD_APP_GID=1000