diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7eaca80..bdbec74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,9 @@ variables:
   ADDON_SLUG: "vscode"
   ADDON_TARGET: "vscode"
 
-  ADDON_LEGACY_TAGS: "true"
-
   ADDON_ARMHF: "false"
   ADDON_ARMV7: "false"
   ADDON_I386: "false"
 
-  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.0.1"
-  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.1"
+  ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.1.0"
+  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.1.0"
diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index 71ddf34..cd5677d 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.1
+ARG BUILD_FROM=hassioaddons/ubuntu-base:5.1.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/vscode/build.json b/vscode/build.json
index 6b948e3..72629b3 100644
--- a/vscode/build.json
+++ b/vscode/build.json
@@ -1,7 +1,7 @@
 {
   "build_from": {
-    "aarch64": "hassioaddons/ubuntu-base-aarch64:5.0.1",
-    "amd64": "hassioaddons/ubuntu-base-amd64:5.0.1"
+    "aarch64": "hassioaddons/ubuntu-base-aarch64:5.1.0",
+    "amd64": "hassioaddons/ubuntu-base-amd64:5.1.0"
   },
   "args": {}
 }