diff --git a/.github/workflows/coqchk.yml b/.github/workflows/coqchk.yml
index 6c9d934..582dd99 100644
--- a/.github/workflows/coqchk.yml
+++ b/.github/workflows/coqchk.yml
@@ -8,12 +8,12 @@ jobs:
     strategy:
       matrix:
         coq_version:
-          - '8.20'
+          - '9.0.1'
         ocaml_version: ['default']
       fail-fast: true  # don't stop jobs if one fails
     steps:
       - uses: actions/checkout@v3
-      - uses: coq-community/docker-coq-action@v1
+      - uses: rocq-community/docker-coq-action@v1
         with:
           opam_file: 'coq-libtx-storage.opam'
           coq_version: ${{ matrix.coq_version }}
diff --git a/theories/Storage/Classes.v b/theories/Storage/Classes.v
index d4de903..a2eacca 100644
--- a/theories/Storage/Classes.v
+++ b/theories/Storage/Classes.v
@@ -1,4 +1,4 @@
-From Coq Require Import
+From Stdlib Require Import
   List
   Classes.EquivDec
   Classes.SetoidClass.
diff --git a/theories/Storage/Instances/AVL.v b/theories/Storage/Instances/AVL.v
index 0edf8fe..4f89fa9 100644
--- a/theories/Storage/Instances/AVL.v
+++ b/theories/Storage/Instances/AVL.v
@@ -1,4 +1,4 @@
-From Coq Require Import
+From Stdlib Require Import
   FMapAVL
   OrderedType
   Classes.EquivDec.
diff --git a/theories/Storage/Instances/List.v b/theories/Storage/Instances/List.v
index 14ae778..5f2cdfb 100644
--- a/theories/Storage/Instances/List.v
+++ b/theories/Storage/Instances/List.v
@@ -1,4 +1,4 @@
-From Coq Require Import
+From Stdlib Require Import
   List
   Classes.EquivDec.
 
diff --git a/theories/Storage/Properties.v b/theories/Storage/Properties.v
index 8acbd3c..ce30750 100644
--- a/theories/Storage/Properties.v
+++ b/theories/Storage/Properties.v
@@ -1,4 +1,4 @@
-From Coq Require Import
+From Stdlib Require Import
   List
   Classes.EquivDec.
 
diff --git a/theories/Storage/Tactics.v b/theories/Storage/Tactics.v
index a789fbc..e8d06b0 100644
--- a/theories/Storage/Tactics.v
+++ b/theories/Storage/Tactics.v
@@ -1,4 +1,4 @@
-From Coq Require Import
+From Stdlib Require Import
   List
   Classes.EquivDec.