diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05f61df..6d0094d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,4 +13,4 @@ variables:
   ADDON_ARMV7: "false"
   ADDON_I386: "false"
 
-  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.0.0"
+  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.0"
diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index a2723d0..060edac 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:3.0.0
+ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.0
 ###############################################################################
 # Build container to get custom vscode extensions.
 ###############################################################################
diff --git a/vscode/build.json b/vscode/build.json
index 1a64553..54e2fdb 100644
--- a/vscode/build.json
+++ b/vscode/build.json
@@ -1,6 +1,6 @@
 {
     "build_from": {
-        "amd64": "hassioaddons/ubuntu-base-amd64:3.0.0"
+        "amd64": "hassioaddons/ubuntu-base-amd64:3.1.0"
     },
     "args": {}
 }