diff --git a/packages/addons/service/docker/source/bin/docker-config b/packages/addons/service/docker/source/bin/docker-config
index d3775a7388..1b1d133d29 100755
--- a/packages/addons/service/docker/source/bin/docker-config
+++ b/packages/addons/service/docker/source/bin/docker-config
@@ -2,6 +2,7 @@
 
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 ADDON_DIR="/storage/.kodi/addons/service.system.docker"
 ADDON_HOME_DIR="/storage/.kodi/userdata/addon_data/service.system.docker"
@@ -12,6 +13,10 @@ fi
 
 if [ ! -f "$ADDON_HOME_DIR/config/docker.conf" ]; then
   cp $ADDON_DIR/config/docker.conf $ADDON_HOME_DIR/config/docker.conf
+else
+  # previous deprecated options before v23.0.0 need to be updated
+  sed -i -e 's/--storage-opt overlay2.override_kernel_check=1//' \
+         -e 's/--graph=/--data-root=/' $ADDON_HOME_DIR/config/docker.conf
 fi
 
 if [ ! -d "$ADDON_HOME_DIR/docker" ]; then
diff --git a/packages/addons/service/docker/source/config/docker.conf b/packages/addons/service/docker/source/config/docker.conf
index 1153af8d14..7221dbcd87 100644
--- a/packages/addons/service/docker/source/config/docker.conf
+++ b/packages/addons/service/docker/source/config/docker.conf
@@ -1,2 +1,2 @@
 DOCKER_DAEMON_OPTS="--data-root=/storage/.kodi/userdata/addon_data/service.system.docker/docker"
-DOCKER_STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1"
+DOCKER_STORAGE_OPTS="--storage-driver=overlay2"