diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 0000000..1346976
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,36 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
+{
+	// Update the 'dockerComposeFile' list if you have more compose files or use different names.
+	"dockerComposeFile": ["compose.yml", "compose.override.yml"],
+
+	// The 'service' property is the name of the service for the container that VS Code should
+	// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+	"service": "web",
+
+	// The optional 'workspaceFolder' property is the path VS Code should open by default when
+	// connected. This is typically a file mount in .devcontainer/docker-compose.yml
+	"workspaceFolder": "/app",
+	// "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}"
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Uncomment the next line if you want start specific services in your Docker Compose config.
+	// "runServices": [],
+
+	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+	"shutdownAction": "none"
+
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c28ec60..e32eff8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ["3.0", "3.1", "3.2", "3.3", "3.4"]
+        ruby_version: ["3.0", "3.1", "3.2", "3.3", "3.4", "3.5-rc"]
         distro: [bullseye, bookworm]
         exclude:
           - distro: bookworm
diff --git a/rails-app-mariadb/compose.yml b/rails-app-mariadb/compose.yml
index 9bb3a52..11bbdb2 100644
--- a/rails-app-mariadb/compose.yml
+++ b/rails-app-mariadb/compose.yml
@@ -1,6 +1,6 @@
 services:
   web: &web
-    image: lenchoreyes/jade:rails-app-3.3-mariadb-bookworm
+    image: lenchoreyes/jade:rails-app-3.4-mariadb-bookworm
     tmpfs:
       - /tmp
     stdin_open: true
diff --git a/rails-app-mysql/compose.yml b/rails-app-mysql/compose.yml
index 96b51b4..226700f 100644
--- a/rails-app-mysql/compose.yml
+++ b/rails-app-mysql/compose.yml
@@ -1,6 +1,6 @@
 services:
   web: &web
-    image: lenchoreyes/jade:rails-app-3.3-mysql-bookworm
+    image: lenchoreyes/jade:rails-app-3.4-mysql-bookworm
     tmpfs:
       - /tmp
     stdin_open: true
diff --git a/rails-app-postgres/compose.yml b/rails-app-postgres/compose.yml
index 02af272..efe9eee 100644
--- a/rails-app-postgres/compose.yml
+++ b/rails-app-postgres/compose.yml
@@ -1,6 +1,6 @@
 services:
   web: &web
-    image: lenchoreyes/jade:rails-app-3.0-postgres-bookworm
+    image: lenchoreyes/jade:rails-app-3.4-postgres-bookworm
     tmpfs:
       - /tmp
     stdin_open: true
@@ -24,7 +24,7 @@ services:
       - postgres
 
   postgres:
-    image: postgres:13
+    image: postgres:16
     volumes:
       - postgres:/var/lib/postgresql/data
     environment: