diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf3299f..f01c617 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ variables:
 
   ADDON_LEGACY_TAGS: "true"
 
-  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:5.0.3"
-  ADDON_AMD64_BASE: "hassioaddons/base-amd64:5.0.3"
-  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:5.0.3"
-  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:5.0.3"
-  ADDON_I386_BASE: "hassioaddons/base-i386:5.0.3"
+  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:6.0.1"
+  ADDON_AMD64_BASE: "hassioaddons/base-amd64:6.0.1"
+  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:6.0.1"
+  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:6.0.1"
+  ADDON_I386_BASE: "hassioaddons/base-i386:6.0.1"
diff --git a/grocy/Dockerfile b/grocy/Dockerfile
index 85a4388..71c5dc6 100755
--- a/grocy/Dockerfile
+++ b/grocy/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:5.0.3
+ARG BUILD_FROM=hassioaddons/base:6.0.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/grocy/build.json b/grocy/build.json
index 2cadbfe..8cac4c6 100755
--- a/grocy/build.json
+++ b/grocy/build.json
@@ -1,11 +1,11 @@
 {
-    "squash": false,
-    "build_from": {
-        "aarch64": "hassioaddons/base-aarch64:5.0.3",
-        "amd64": "hassioaddons/base-amd64:5.0.3",
-        "armhf": "hassioaddons/base-armhf:5.0.3",
-        "armv7": "hassioaddons/base-armv7:5.0.3",
-        "i386": "hassioaddons/base-i386:5.0.3"
-    },
-    "args": {}
+  "squash": false,
+  "build_from": {
+    "aarch64": "hassioaddons/base-aarch64:6.0.1",
+    "amd64": "hassioaddons/base-amd64:6.0.1",
+    "armhf": "hassioaddons/base-armhf:6.0.1",
+    "armv7": "hassioaddons/base-armv7:6.0.1",
+    "i386": "hassioaddons/base-i386:6.0.1"
+  },
+  "args": {}
 }