diff --git a/.github/workflows/build_and_deploy_docs.yml b/.github/workflows/build_and_deploy_docs.yml
index 02469cf0..5021e98a 100644
--- a/.github/workflows/build_and_deploy_docs.yml
+++ b/.github/workflows/build_and_deploy_docs.yml
@@ -9,13 +9,18 @@ on:
 
 jobs:
   main:
+    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ 2.13.4 ]
+        sdk: [ 2.18.7 ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
         with:
           sdk: ${{ matrix.sdk }}
@@ -25,20 +30,22 @@ jobs:
 
       - id: build-docs
         name: Build Docs
-        run: pub global activate dartdoc && dartdoc --show-undocumented-categories
-        if: ${{ matrix.sdk == '2.13.4' }}
-
-      - id: deploy-docs
-        name: Deploy Docs 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.1
-        with:
-          branch: gh-pages
-          folder: doc/api # Where the build step stores the dartdoc output
-        if: ${{ steps.build-docs.outcome == 'success' && github.event_name == 'push' }}
+        run: dart pub get && dart doc .
+        if: ${{ matrix.sdk == '2.18.7' }}
 
+      # Upload the artifact as required by actions/deploy-pages
       - name: Archive Dartdoc Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-pages-artifact@v1.0.7
         with:
           name: dartdoc
           path: doc/api/
         if: ${{ steps.build-docs.outcome == 'success' && steps.deploy-docs.outcome == 'skipped' }}
+
+      - id: deploy-docs
+        name: Deploy Docs 🚀
+        uses: actions/deploy-pages@v1
+        with:
+          artifact-name: dartdoc
+        if: ${{ steps.build-docs.outcome == 'success' && github.event_name == 'push' }}
+
+      
diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml
index e6230fa1..260af3a0 100644
--- a/.github/workflows/dart_ci.yml
+++ b/.github/workflows/dart_ci.yml
@@ -12,11 +12,10 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.sdk == 'dev' }} # Don't fail the workflow if the only errors are in the dev channel
     strategy:
       fail-fast: false
       matrix:
-        sdk: [stable, dev]
+        sdk: [stable]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1
@@ -53,8 +52,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        sdk: [ 2.13.4 ]
+    matrix:
+      sdk: [ 2.13.4 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1
@@ -86,4 +85,4 @@ jobs:
           pub run build_runner test -r -- -P concurrent-tests
           pub run build_runner test -r -- -P non-concurrent-tests
         timeout-minutes: 10
-        if: ${{ always() && steps.install.outcome == 'success' }}
+        if: ${{ always() && steps.install.outcome == 'success' }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 185e3dd5..5718031e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM google/dart:2.13
+#Use the new dart image as per: https://hub.docker.com/r/google/dart
+FROM dart:2.18.4
 
 # Expose env vars for git ssh access
 ARG GIT_SSH_KEY
diff --git a/pubspec.next.yaml b/pubspec.next.yaml
index 1b675c51..12855dbc 100644
--- a/pubspec.next.yaml
+++ b/pubspec.next.yaml
@@ -4,7 +4,7 @@ description: A Dart unit testing library for OverReact components that mimics th
 homepage: https://github.com/Workiva/react_testing_library/
 documentation: https://workiva.github.io/react_testing_library
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.18.4 <3.0.0'
 
 dependencies:
   color: ">=2.1.1 <4.0.0"
@@ -26,7 +26,3 @@ dependency_overrides:
     git:
       url: https://github.com/workiva/react-dart.git
       ref: null-safety-manual
-  test_html_builder:
-    git:
-      url: https://github.com/workiva/test_html_builder.git
-      ref: v3_wip