diff --git a/.gitea/workflows/Symfony.yml b/.gitea/workflows/Symfony.yml
index 05108b0..8cc3d5d 100644
--- a/.gitea/workflows/Symfony.yml
+++ b/.gitea/workflows/Symfony.yml
@@ -30,6 +30,6 @@ jobs:
           context: "{{defaultContext}}:Symfony"
           push: true
           tags: |
-            git.euph.dev/development_tools/symfony:latest
-            git.euph.dev/development_tools/symfony:${{ gitea.run_number }}
-            
\ No newline at end of file
+            git.euph.dev/development_tools/distrobox/jetbrains/symfony:latest
+            git.euph.dev/development_tools/distrobox/jetbrains/symfony:${{ gitea.run_number }}
+            
diff --git a/Symfony/Dockerfile b/Symfony/Dockerfile
index 921da6d..566022b 100644
--- a/Symfony/Dockerfile
+++ b/Symfony/Dockerfile
@@ -1,21 +1,25 @@
-FROM registry.fedoraproject.org/fedora:latest
+FROM fedora:40
 
-# Add Symfony CLI Source
-RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.rpm.sh' | bash
+# Set environment variables
+ENV BOX_NAME="phpstorm"
 
-RUN dnf install -y \
-    php \
-    composer \
-    php-pdo \
-    php-mysqlnd \
-    symfony-cli \
-    just \
-    jq \
-    fzf \
-    screen \
-    highlight \
+# 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
+        php \
+        composer \
+        php-pdo \
+        php-mysqlnd \
+        symfony-cli \
     && dnf clean all
 
-# Install Volta
-RUN curl https://get.volta.sh | bash
-ENV PATH="/root/.volta/bin:${PATH}"
\ No newline at end of file
+# Link outside tooling
+RUN ln -s /usr/bin/distrobox-host-exec /usr/local/bin/podman
+
+# Command to run on container start
+CMD ["distrobox-enter", "--name", "$BOX_NAME"]