diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000000000..42621a137
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,3 @@
+FROM ghcr.io/input-output-hk/devx-devcontainer:x86_64-linux.ghc96-iog
+COPY .. /workspaces/cardano-base
+RUN bash -ic "post-create-command"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 89fdf0805..38048d130 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,8 @@
 {
-   "image":"ghcr.io/input-output-hk/devx-devcontainer:ghc962-iog",
+   "dockerFile":"/Users/yvan/GitHub/devx/Dockerfile",
+   "postCreateCommand": "post-create-command",
+   // TODO: rather than postCreateCommand we should be able to precompute things with:
+   // "dockerFile":"./Dockerfile",
    "customizations":{
       "vscode":{
          "extensions":[
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 0157fe92a..d8b3f1d3b 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -148,3 +148,9 @@ jobs:
     #  uses: mxschmitt/action-tmate@v3
     #  with:
     #     limit-access-to-actor: true
+
+    - name: Cache HLS artifacts (used to speed up GitHub Codespaces bootstrapping)
+      if: runner.os == 'Linux' && (matrix.ghc == '8.10.7' || matrix.ghc == '9.6.2')
+      uses: input-output-hk/actions/cache@latest
+      with:
+        ghc_version: ${{ matrix.ghc }}