diff --git a/.github/workflows/docker-dev.yaml b/.github/workflows/docker-dev.yaml
new file mode 100644
index 000000000..6030c3b30
--- /dev/null
+++ b/.github/workflows/docker-dev.yaml
@@ -0,0 +1,64 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - dev
+  release:
+    types:
+      - published
+
+permissions:
+  packages: write
+
+jobs:
+  push:
+    name: Push
+    runs-on: ubuntu-20.04
+    if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Docker metadata
+        id: docker_meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/pyrohost/pyrodactyl
+          flavor: |
+            latest=false
+          tags: |
+            type=ref,event=branch
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        if: "github.event_name != 'pull_request'"
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update version
+        if: "github.event_name == 'release' && github.event.action == 'published'"
+        env:
+          REF: ${{ github.event.release.tag_name }}
+        run: |
+          sed -i "s/    'version' => 'canary',/    'version' => '${REF:1}',/" config/app.php
+
+      - name: Build and Push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/resources/scripts/routers/DashboardRouter.tsx b/resources/scripts/routers/DashboardRouter.tsx
index 7975290eb..ad1209b0c 100644
--- a/resources/scripts/routers/DashboardRouter.tsx
+++ b/resources/scripts/routers/DashboardRouter.tsx
@@ -161,10 +161,6 @@ export default () => {
                         <HugeIconsHome fill='currentColor' />
                         <p>Servers</p>
                     </NavLink>
-                    <NavLink to={'/account'} end className='flex flex-row items-center' ref={NavigationSettings}>
-                        <HugeIconsDashboardSettings fill='currentColor' />
-                        <p>Settings</p>
-                    </NavLink>
                     <NavLink to={'/account/api'} end className='flex flex-row items-center' ref={NavigationApi}>
                         <HugeIconsApi fill='currentColor' />
                         <p>Api Keys</p>
@@ -173,6 +169,11 @@ export default () => {
                         <HugeIconsSsh fill='currentColor' />
                         <p>SSH Keys</p>
                     </NavLink>
+                    <NavLink to={'/account'} end className='flex flex-row items-center' ref={NavigationSettings}>
+                        <HugeIconsDashboardSettings fill='currentColor' />
+                        <p>Settings</p>
+                    </NavLink>
+
                 </ul>
                 
             </MainSidebar>