diff --git a/docker-compose.yaml b/docker-compose.yaml
index b68d02e..0564950 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,8 +5,7 @@ services:
 
   serve:
     container_name: isabelline-serve
-    image: jekyll/jekyll:3.8
-    # command: bash -c "bundle update && bundle exec jekyll serve --host 0.0.0.0 --future --draft --force_polling --livereload"
+    image: jekyll/jekyll:4
     command: jekyll serve --host 0.0.0.0 --future --draft --force_polling --livereload
     environment:
       JEKYLL_ENV: local
@@ -21,7 +20,7 @@ services:
 
   gem-push:
     container_name: jekyll-gem-push
-    image: jekyll/jekyll:3.8
+    image: jekyll/jekyll:4.0
     command: >
       bash -c "gem build -v jekyll-theme-isabelline.gemspec \
         && GEM_VER=`ruby -e '\
@@ -39,7 +38,7 @@ services:
 
   jekyll:
     container_name: jekyll
-    image: jekyll/jekyll:3.8
+    image: jekyll/jekyll:4.0
     entrypoint: jekyll
     environment:      
       JEKYLL_ENV: local
@@ -49,7 +48,7 @@ services:
 
   gem:
     container_name: jekyll-gem
-    image: jekyll/jekyll:3.8
+    image: jekyll/jekyll:4.0
     entrypoint: gem
     volumes:
       - .bundle:/usr/local/bundle
@@ -57,9 +56,10 @@ services:
 
   bundle:
     container_name: bundle
-    image: jekyll/jekyll:3.8
+    image: jekyll/jekyll:4.0
     entrypoint: bundle
     volumes:
-      - .bundle:/usr/local/bundle
+      # - ./.bundle:/home/jekyll/.bundle
+      - ./.bundle:/usr/local/bundle
       - .:/srv/jekyll
       - ./.gem:/root/.gem