diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfe1d3e..b385806 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.2.0"
+  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.0"
diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index bc0c7dd..eddb180 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:3.2.0
+ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.0
 ###############################################################################
 # Build container to get custom vscode extensions.
 ###############################################################################
diff --git a/vscode/build.json b/vscode/build.json
index c6de1ea..e3db7be 100644
--- a/vscode/build.json
+++ b/vscode/build.json
@@ -1,6 +1,6 @@
 {
     "build_from": {
-        "amd64": "hassioaddons/ubuntu-base-amd64:3.2.0"
+        "amd64": "hassioaddons/ubuntu-base-amd64:4.0.0"
     },
     "args": {}
 }