diff --git a/VERSION.history b/VERSION.history
index 9231afd..a72097e 100644
--- a/VERSION.history
+++ b/VERSION.history
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 | **3.23** | 14.02.2026 00:47 | reorder workflow ✅ |
 | **v3.23** | 13.02.2026 23:40 | fix push to Dockerhub ✅ |
 | **v3.23** | 13.02.2026 17:57 | .gitea/workflows/build-and-push.yaml aktualisiert ✅ |
@@ -15,3 +16,6 @@
 | **v3.23** | 12.02.2026 17:42 | changed APP_VERSION to BUILD_TAG ✅ |
 | **v3.23** | 12.02.2026 17:27 | VERSIONS.history gelöscht ✅ |
 | **v3.23** | 12.02.2026 17:05 | add ARG APP_USER to Dockerfiles ✅ |
+=======
+
+>>>>>>> 319b2d5 (alpine 3.22)
diff --git a/buildargs.env b/buildargs.env
index e867786..4437326 100644
--- a/buildargs.env
+++ b/buildargs.env
@@ -1,4 +1,4 @@
-BUILD_TAG=3.23
+BUILD_TAG=3.22
 BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
 # Examples for BASE_IMAGE
 # alpine:${BUILD_TAG}