diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91dfd99..7ac6d23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,6 @@ variables:
   ADDON_I386: "false"
   ADDON_LEGACY_TAGS: "true"
 
-  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:2.2.1"
-  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:2.2.1"
-  ADDON_ARMHF_BASE: "hassioaddons/ubuntu-base-armhf:2.2.1"
+  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:2.3.1"
+  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:2.3.1"
+  ADDON_ARMHF_BASE: "hassioaddons/ubuntu-base-armhf:2.3.1"
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 678d657..3619055 100755
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.1
+ARG BUILD_FROM=hassioaddons/ubuntu-base:2.3.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/grafana/build.json b/grafana/build.json
index b5164f8..0b415bc 100644
--- a/grafana/build.json
+++ b/grafana/build.json
@@ -1,9 +1,9 @@
 {
     "build_from": {
-        "aarch64": "hassioaddons/ubuntu-base-aarch64:2.2.1",
-        "amd64": "hassioaddons/ubuntu-base-amd64:2.2.1",
-        "armhf": "hassioaddons/ubuntu-base-armhf:2.2.1",
-        "i386": "hassioaddons/ubuntu-base-i386:2.2.1"
+        "aarch64": "hassioaddons/ubuntu-base-aarch64:2.3.1",
+        "amd64": "hassioaddons/ubuntu-base-amd64:2.3.1",
+        "armhf": "hassioaddons/ubuntu-base-armhf:2.3.1",
+        "i386": "hassioaddons/ubuntu-base-i386:2.3.1"
     },
     "args": {}
 }