diff --git a/.github/workflows/UpdateOnBaseImageChange.yml b/.github/workflows/UpdateOnBaseImageChange.yml
deleted file mode 100644
index 48c2d86..0000000
--- a/.github/workflows/UpdateOnBaseImageChange.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Regular base image update check
-on:
-  schedule:
-    - cron: "0 */6 * * *"
-    
-env:
-  IMAGE_BASE: lsiobase/alpine.python3
-  IMAGE: rix1337/docker-budgeteer
-
-jobs:
-  check-base-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker Image Update Checker
-        id: baseupdatecheck
-        uses: lucacome/docker-image-update-checker@v1.2.1
-        with:
-          base-image: ${{ env.IMAGE_BASE }}
-          image: ${{ env.IMAGE }}
-      - name: Trigger Docker Image build
-        run: |
-          curl -XPOST -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github.v3+json" -H "Content-Type: application/json" https://api.github.com/repos/rix1337/BudgeTeer/actions/workflows/BuildImage.yml/dispatches --data '{"ref": "main"}'
-        if: steps.baseupdatecheck.outputs.needs-updating == 'true'
diff --git a/budgeteer/providers/version.py b/budgeteer/providers/version.py
index 9b2dc25..7564bdc 100644
--- a/budgeteer/providers/version.py
+++ b/budgeteer/providers/version.py
@@ -9,7 +9,7 @@
 
 
 def get_version():
-    return "0.1.7"
+    return "0.1.8"
 
 
 def create_version_file():
diff --git a/budgeteer/web_interface/vuejs_frontend/package.json b/budgeteer/web_interface/vuejs_frontend/package.json
index ffa2b53..6bf4362 100644
--- a/budgeteer/web_interface/vuejs_frontend/package.json
+++ b/budgeteer/web_interface/vuejs_frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budgeteer-web",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5670d01..77cab64 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM alpine:latest
 MAINTAINER rix1337
 
 # Define package name
 ARG PACKAGE_NAME=budgeteer
 
 # build tools
-RUN apk add --no-cache build-base jq python3-dev py3-pip
+RUN apk add --no-cache curl build-base jq python3-dev py3-pip
 
 # Optionally set desired version for the build
 ARG VS="false"
@@ -20,12 +20,11 @@ RUN mkdir -p ~/.config/pip && echo -e "[global]\nbreak-system-packages = true" >
 RUN if [[ ${VS} == "false" ]] ; then echo "Grabbing latest version from pypi.org" && VERSION=$(curl -Ls https://pypi.org/pypi/${PACKAGE_NAME}/json | jq -r .info.version) ; else echo "Using version from workflow_dispatch input" && VERSION=$VS ; fi  && \
   echo $VERSION && \
   pip3 install ${PACKAGE_NAME}=="$VERSION" --no-cache-dir && \
-    apk del build-base jq
-  
-# add local files
-COPY root/ /
+    apk del curl build-base jq
 
 # volumes and ports
 VOLUME /config
 EXPOSE 8080
 ENV PYTHONUNBUFFERED=1
+
+ENTRYPOINT ["sh", "-c", "budgeteer --docker --log-level=$LOGLEVEL"]
diff --git a/docker/root/donate.txt b/docker/root/donate.txt
deleted file mode 100644
index 19890cb..0000000
--- a/docker/root/donate.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/sponsors/rix1337
diff --git a/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
deleted file mode 100644
index 5e66fa1..0000000
--- a/docker/root/etc/s6-overlay/s6-rc.d/init-adduser/branding
+++ /dev/null
@@ -1,3 +0,0 @@
-───────────────────────────────────────
-  BudgeTeer
-───────────────────────────────────────
diff --git a/docker/root/etc/services.d/budgeteer/run b/docker/root/etc/services.d/budgeteer/run
deleted file mode 100644
index 9790604..0000000
--- a/docker/root/etc/services.d/budgeteer/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
- exec budgeteer --docker --log-level=$LOGLEVEL