diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 439291e..562b974 100755
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,9 @@
 		"dockerfile": "../docker/Dockerfile",
 		"target":     "python-mrd-devcontainer",
 		"context":    "../",
-		"cacheFrom":  "docker.io/kspacekelvin/fire-python-devcon"
+		"cacheFrom":  [
+			"docker.io/kspacekelvin/fire-python-devcon",
+			"docker.io/kspacekelvin/fire-python:buildcache"]
 	},
 
 	// To enable your local GPUs in container if they are on enabled by default
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d183ff8..f9ddd95 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -62,6 +62,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: docker/Dockerfile
+          cache-from: type=registry,ref=kspacekelvin/fire-python:buildcache
+          cache-to: type=registry,ref=kspacekelvin/fire-python:buildcache,mode=max
           push: true
           tags: |
             kspacekelvin/fire-python:latest