diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index d741e40..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09cf8fc..0180587 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,18 @@
 variables:
-  IMAGE_NAME: thallian/airsonic
+  CONTAINER_NAME: thallian/airsonic
 
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-    - docker build -t $IMAGE_NAME:latest .
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
-    - docker push $IMAGE_NAME:latest
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
+    - >-
+      /kaniko/executor
+      --context "$CI_PROJECT_DIR"
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"
diff --git a/Dockerfile b/Dockerfile
index ac8919f..e42dab8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM alpine:3.14 AS builder
+FROM alpine:3.15 AS builder
 
-ENV VERSION=11.0.0-SNAPSHOT.20211214174334
+ENV VERSION=11.0.0-SNAPSHOT.20220213174344
 RUN apk add --no-cache \
-    openjdk11-jdk \
+    openjdk17-jdk \
     maven \
     git
 
@@ -24,10 +24,8 @@ RUN apk add --no-cache \
     ffmpeg \
     flac \
     opus \
-    lame
-
-RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    openjdk17-jre-headless
+    lame \
+	openjdk17-jre-headless
 
 RUN addgroup -g 2222 airsonic
 RUN adduser -h "$AIRSONIC_DIR" -S -D -u 2222 -G airsonic airsonic
diff --git a/rootfs/etc/fix-attrs.d/01-airsonic data b/rootfs/etc/fix-attrs.d/01-airsonic data
deleted file mode 100644
index 9b89e79..0000000
--- a/rootfs/etc/fix-attrs.d/01-airsonic data	
+++ /dev/null
@@ -1,10 +0,0 @@
-/home/airsonic/data/db true airsonic 0644 0755
-/home/airsonic/data/lastfmcache true airsonic 0644 0755
-/home/airsonic/data/lucene2 true airsonic 0644 0755
-/home/airsonic/data/thumbs true airsonic 0644 0755
-/home/airsonic/data/transcode false airsonic 0644 0755
-/home/airsonic/playlists true airsonic 0640 0755
-/home/airsonic/podcasts true airsonic 0640 0755
-/home/airsonic/airsonic.log false airsonic 0640 0755
-/home/airsonic/airsonic.properties false airsonic 0640 0755
-/home/airsonic/rollback.sql false airsonic 0640 0755
diff --git a/rootfs/etc/services.d/airsonic/run b/rootfs/etc/s6-overlay/s6-rc.d/airsonic/run
similarity index 100%
rename from rootfs/etc/services.d/airsonic/run
rename to rootfs/etc/s6-overlay/s6-rc.d/airsonic/run
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/airsonic/type b/rootfs/etc/s6-overlay/s6-rc.d/airsonic/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/rootfs/etc/s6-overlay/s6-rc.d/airsonic/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/airsonic b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/airsonic
new file mode 100644
index 0000000..e69de29