diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0636ae7d6..a7b83c6b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 defaults: &defaults
   working_directory: ~/repo
   docker:
-  - image: circleci/node:15.14
+  - image: cimg/node:16.20.2
 
 jobs:
   build:
diff --git a/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap b/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap
index 76a53d59d..ae1570ccd 100644
--- a/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap
+++ b/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap
@@ -2,22 +2,22 @@
 
 exports[`DruxtField boolean - form 1`] = `
 "<div data=\\"true\\">
-  <div data=\\"true\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"true\\"><label><strong data=\\"true\\">Status:</strong><br>
-      <div><input data=\\"true\\" type=\\"checkbox\\"></div></label></div>
+  <div data=\\"true\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"true\\"><label><strong>Status:</strong><br>
+      <div><input type=\\"checkbox\\"></div></label></div>
 </div>"
 `;
 
 exports[`DruxtField datetime - form 1`] = `
 "<div data=\\"2021-10-25T00:48:44+00:00\\">
-  <div data=\\"2021-10-25T00:48:44+00:00\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"2021-10-25T00:48:44+00:00\\"><label><strong data=\\"2021-10-25T00:48:44+00:00\\">Created:</strong><br>
-      <div><input data=\\"2021-10-25T00:48:44+00:00\\" type=\\"datetime-local\\"></div></label></div>
+  <div data=\\"2021-10-25T00:48:44+00:00\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"2021-10-25T00:48:44+00:00\\"><label><strong>Created:</strong><br>
+      <div><input type=\\"datetime-local\\"></div></label></div>
 </div>"
 `;
 
 exports[`DruxtField fallback - form 1`] = `
 "<div data=\\"[object Object]\\">
-  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><label><strong data=\\"[object Object]\\">Path:</strong><br>
-      <div><textarea data=\\"[object Object]\\"></textarea></div></label></div>
+  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><label><strong>Path:</strong><br>
+      <div><textarea></textarea></div></label></div>
 </div>"
 `;
 
@@ -43,13 +43,13 @@ exports[`DruxtField image - view 1`] = `
 
 exports[`DruxtField link - view 1`] = `
 "<div data=\\"[object Object]\\">
-  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><a data=\\"[object Object]\\" href=\\"https://druxtjs.org\\" target=\\"_blank\\">DruxtJS</a></div>
+  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><a href=\\"https://druxtjs.org\\" target=\\"_blank\\">DruxtJS</a></div>
 </div>"
 `;
 
 exports[`DruxtField text - form 1`] = `
 "<div data=\\"About Umami\\">
-  <div data=\\"About Umami\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"About Umami\\"><label><strong data=\\"About Umami\\">Title:</strong><br>
-      <div><input data=\\"About Umami\\"></div></label></div>
+  <div data=\\"About Umami\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"About Umami\\"><label><strong>Title:</strong><br>
+      <div><input></div></label></div>
 </div>"
 `;
diff --git a/yarn.lock b/yarn.lock
index f28dd604a..da3304fe1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11246,7 +11246,7 @@ __metadata:
   dependencies:
     deepmerge: ^4.3.1
     drupal-jsonapi-params: ^2.2.0
-    druxt: ^0.22.0
+    druxt: ^0.24.0
     druxt-blocks: ^0.17.1
     vue: ^2.7.14
     vuex: ^3.6.2
@@ -11258,11 +11258,30 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"druxt-router@^0.29.1, druxt-router@workspace:packages/router":
+"druxt-router@npm:^0.29.1":
+  version: 0.29.1
+  resolution: "druxt-router@npm:0.29.1"
+  dependencies:
+    druxt: ^0.22.0
+    url-parse: ^1.5.10
+    vue: ^2.7.14
+    vuex: ^3.6.2
+  peerDependencies:
+    drupal-jsonapi-params: "*"
+  dependenciesMeta:
+    vue:
+      optional: true
+    vuex:
+      optional: true
+  checksum: 1cb8e7f2fab230921b408a665deebe71636ade4f0df777c608b2e1bf8c3302c4adba5a025f160cc9abc0b68be7c3a11a63cf80ac628137a5dec469ac668fd4f4
+  languageName: node
+  linkType: hard
+
+"druxt-router@workspace:packages/router":
   version: 0.0.0-use.local
   resolution: "druxt-router@workspace:packages/router"
   dependencies:
-    druxt: ^0.22.0
+    druxt: ^0.24.0
     url-parse: ^1.5.10
     vue: ^2.7.14
     vue-router: ^3.6.5
@@ -11385,7 +11404,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"druxt@^0.22.0, druxt@workspace:packages/druxt":
+"druxt@^0.24.0, druxt@workspace:packages/druxt":
   version: 0.0.0-use.local
   resolution: "druxt@workspace:packages/druxt"
   dependencies:
@@ -11417,6 +11436,38 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"druxt@npm:^0.22.0":
+  version: 0.22.0
+  resolution: "druxt@npm:0.22.0"
+  dependencies:
+    "@nuxtjs/axios": ^5.13.6
+    "@nuxtjs/proxy": ^2.1.0
+    "@vue/devtools-api": ^6.5.0
+    chalk: ^4.1.2
+    core-js: ^3.31.0
+    deepmerge: ^4.3.1
+    drupal-jsonapi-params: ^2.2.0
+    express-rate-limit: ^6.7.0
+    launch-editor: ^2.6.0
+    md5: ^2.3.0
+    querystring: ^0.2.1
+    scule: ^0.3.2
+    vue: ^2.7.14
+    vuex: ^3.6.2
+  peerDependencies:
+    axios: "*"
+    consola: "*"
+  dependenciesMeta:
+    core-js:
+      optional: true
+    vue:
+      optional: true
+    vuex:
+      optional: true
+  checksum: ca6f8ccdede5f21555490c6ed616576ccd0d665579a31f19f8ac2a6824acbc8d697c948275ec8fe7ad6dcaac678f9e0882da1cf8f72463bf2d2919a46f02c247
+  languageName: node
+  linkType: hard
+
 "dtrace-provider@npm:~0.8":
   version: 0.8.8
   resolution: "dtrace-provider@npm:0.8.8"