diff --git a/.gitea/workflows/Symfony.yml b/.gitea/workflows/Jetbrains.yml
similarity index 62%
rename from .gitea/workflows/Symfony.yml
rename to .gitea/workflows/Jetbrains.yml
index 8cc3d5d..f864ad6 100644
--- a/.gitea/workflows/Symfony.yml
+++ b/.gitea/workflows/Jetbrains.yml
@@ -1,5 +1,5 @@
  
-name: "Build Symfony Devcontainer"
+name: "Build Jetbrains Devcontainers"
 
 on:
   push:
@@ -9,6 +9,9 @@ on:
 jobs:
   build_act:
     runs-on: 'priviliged'
+    strategy:
+      matrix:
+        toolchain: [symfony]
     steps:
       - name: Install Docker
         run: |
@@ -27,9 +30,10 @@ jobs:
         id: build_act_base
         uses: 'https://git.euph.dev/actions/docker-build-push@v5'
         with:
-          context: "{{defaultContext}}:Symfony"
+          context: "{{defaultContext}}:jetbrains/${{ matrix.toolchain }}"
           push: true
+          build-args: JETBRAINS_DEPENDENCIES="fuse fuse-libs libXi libXrender libXtst fontconfig gtk3 tar dbus-libs git just jq fzf"
           tags: |
-            git.euph.dev/development_tools/distrobox/jetbrains/symfony:latest
-            git.euph.dev/development_tools/distrobox/jetbrains/symfony:${{ gitea.run_number }}
+            git.euph.dev/development_tools/distrobox/jetbrains/${{ matrix.toolchain }}:latest
+            git.euph.dev/development_tools/distrobox/jetbrains/${{ matrix.toolchain }}:${{ gitea.run_number }}
             
diff --git a/Symfony/Dockerfile b/jetbrains/symfony/Dockerfile
similarity index 72%
rename from Symfony/Dockerfile
rename to jetbrains/symfony/Dockerfile
index 566022b..da5fde6 100644
--- a/Symfony/Dockerfile
+++ b/jetbrains/symfony/Dockerfile
@@ -1,4 +1,5 @@
 FROM fedora:40
+ARG JETBRAINS_DEPENDENCIES
 
 # Set environment variables
 ENV BOX_NAME="phpstorm"
@@ -6,11 +7,7 @@ ENV BOX_NAME="phpstorm"
 # Install required packages and setup sources
 RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.rpm.sh' | bash \
     && dnf install -y \
-        # General Tools
-        git make just jq nvim fzf \
-        # Jetbrain Tools
-        fuse fuse-libs libXi libXrender libXtst fontconfig gtk3 tar dbus-libs \
-        # Symfony Dependencies
+        $JETBRAINS_DEPENDENCIES \
         php \
         composer \
         php-pdo \