diff --git a/gvm/Dockerfile b/gvm/Dockerfile
index 0129519..73c1e4a 100644
--- a/gvm/Dockerfile
+++ b/gvm/Dockerfile
@@ -5,7 +5,7 @@ LABEL io.hass.name="GVM Scanner"
 LABEL io.hass.description="un a GVM (OpenVAS) scanner as a Home Assistant add-on."
 LABEL io.hass.arch="amd64|aarch64"
 LABEL io.hass.type="addon"
-LABEL io.hass.version="0.0.3-beta"
+LABEL io.hass.version="0.0.4-beta"
 
 # Set timezone
 ENV TZ=Europe/Rome
diff --git a/gvm/config.json b/gvm/config.json
index a9757d9..57cfd0c 100644
--- a/gvm/config.json
+++ b/gvm/config.json
@@ -1,6 +1,6 @@
 {
     "name": "GVM Scanner",
-    "version": "0.0.3-beta",
+    "version": "0.0.4-beta",
     "slug": "gvm",
     "description": "Run a GVM (OpenVAS) scanner as a Home Assistant add-on.",
     "startup": "services",
diff --git a/gvm/run.sh b/gvm/run.sh
index 7f2d747..3d0504f 100644
--- a/gvm/run.sh
+++ b/gvm/run.sh
@@ -7,7 +7,6 @@ log() {
     echo "[GVM ADD-ON] $(date +"%Y-%m-%d %H:%M:%S") - $*"
 }
 
-# Path to options provided by Home Assistant
 CONFIG_PATH="/data/options.json"
 
 if [ ! -f "$CONFIG_PATH" ]; then
@@ -15,7 +14,6 @@ if [ ! -f "$CONFIG_PATH" ]; then
     exit 1
 fi
 
-# Read variables from options.json
 USERNAME=$(jq -r '.username' "$CONFIG_PATH")
 PASSWORD=$(jq -r '.password' "$CONFIG_PATH")
 TZ=$(jq -r '.TZ // empty' "$CONFIG_PATH")
@@ -23,13 +21,11 @@ DB_PASSWORD=$(jq -r '.DB_PASSWORD // empty' "$CONFIG_PATH")
 HTTPS=$(jq -r '.HTTPS // "false"' "$CONFIG_PATH")
 SSHD=$(jq -r '.SSHD // "true"' "$CONFIG_PATH")
 
-# Validate
 if [ -z "$USERNAME" ] || [ -z "$PASSWORD" ]; then
     log "ERROR: username and/or password not set in options.json"
     exit 1
 fi
 
-# Export variables for GVM
 export USERNAME
 export PASSWORD
 export DB_PASSWORD
@@ -38,20 +34,18 @@ export HTTPS
 export SSHD
 
 log "INFO: Starting GVM (OpenVAS) add-on as user '$USERNAME'"
+log "INFO: Setting timezone to $TZ"
 
-# Set timezone if available
 if [ -n "$TZ" ]; then
-    log "INFO: Setting timezone to $TZ"
     ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime
     echo "$TZ" > /etc/timezone
 fi
 
-# Initialize data directory
 DATA_DIR="/data"
 if [ ! -d "$DATA_DIR" ]; then
     log "INFO: Creating data directory at $DATA_DIR"
     mkdir -p "$DATA_DIR"
 fi
 
-log "INFO: Launching GVM service..."
-exec gvm-start | tee -a "$DATA_DIR/gvm.log"
+log "INFO: Handing over control to /start.sh (default GVM init script)"
+exec /start.sh