diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b52c34c..c0f017f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -120,7 +120,9 @@ jobs:
             APP_ROOT=${{ env.json_root }}
             APP_UID=${{ env.IMAGE_UID }}
             APP_GID=${{ env.IMAGE_GID }}
-            NO_CACHE=$(date +%s)
+            APP_VERSION_PREFIX=${{ env.IMAGE_SEMVER_PREFIX }}
+            APP_VERSION_SUFFIX=${{ env.IMAGE_SEMVER_SUFFIX }}
+            APP_NO_CACHE=$(date +%s)
           tags: |
             ${{ env.IMAGE }}:${{ env.IMAGE_SEMVER_PREFIX }}grype${{ env.IMAGE_SEMVER_SUFFIX }}
 
@@ -167,7 +169,9 @@ jobs:
             APP_ROOT=${{ env.json_root }}
             APP_UID=${{ env.IMAGE_UID }}
             APP_GID=${{ env.IMAGE_GID }}
-            NO_CACHE=$(date +%s)
+            APP_VERSION_PREFIX=${{ env.IMAGE_SEMVER_PREFIX }}
+            APP_VERSION_SUFFIX=${{ env.IMAGE_SEMVER_SUFFIX }}
+            APP_NO_CACHE=$(date +%s)
           tags: |
             ${{ env.IMAGE_TAGS }}
 
diff --git a/arch.dockerfile b/arch.dockerfile
index 97d7bab..11cab23 100644
--- a/arch.dockerfile
+++ b/arch.dockerfile
@@ -1,7 +1,9 @@
 ARG APP_VERSION=stable
+ARG APP_VERSION_PREFIX=""
+ARG APP_VERSION_SUFFIX=""
 
 # :: Header
-  FROM 11notes/kms:${APP_VERSION}
+  FROM 11notes/kms:${APP_VERSION_PREFIX}${APP_VERSION}${APP_VERSION_SUFFIX}
 
   # :: arguments
     ARG TARGETARCH
@@ -48,14 +50,10 @@ ARG APP_VERSION=stable
     COPY ./rootfs /
     RUN set -ex; \
       chmod +x -R /usr/local/bin; \
-      chown -R 1000:1000 \
+      chown -R ${APP_UID}:${APP_GID}} \
         ${APP_ROOT} \
         /opt/py-kms;
 
-  # :: support unraid
-    RUN set -ex; \
-      eleven unraid
-
 # :: Monitor
   HEALTHCHECK --interval=5s --timeout=2s CMD curl -X GET -kILs --fail http://localhost:${PORT}/livez || exit 1