diff --git a/.github/workflows/images.yml b/.github/workflows/panel.yaml
similarity index 62%
rename from .github/workflows/images.yml
rename to .github/workflows/panel.yaml
index ba5cee7..36e886f 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/panel.yaml
@@ -1,12 +1,13 @@
-name: Build and publish docker images
+name: Panel
+
 on:
   push:
     branches:
       - 'master'
 
 jobs:
-  images:
-    name: Build and push base image
+  build-and-push:
+    name: Build and Push 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -18,18 +19,10 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: build Panel image
+      - name: Build and Push image
         uses: docker/build-push-action@v2
         with:
           push: true
           platforms: linux/amd64,linux/arm64
           context: build/panel
           tags: ghcr.io/pterodactyl/development/panel:latest
-
-      - name: build Wings image
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: build/wings
-          tags: ghcr.io/pterodactyl/development/wings:latest
diff --git a/.github/workflows/wings.yaml b/.github/workflows/wings.yaml
new file mode 100644
index 0000000..80f0e70
--- /dev/null
+++ b/.github/workflows/wings.yaml
@@ -0,0 +1,28 @@
+name: Wings
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build-and-push:
+    name: Build and Push
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Build and Push image
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          context: build/wings
+          tags: ghcr.io/pterodactyl/development/wings:latest
diff --git a/build/wings/Dockerfile b/build/wings/Dockerfile
index 9abba92..43799bb 100644
--- a/build/wings/Dockerfile
+++ b/build/wings/Dockerfile
@@ -31,7 +31,7 @@ RUN apt -y update \
     && tar xvf "go1.18.7.linux-$(dpkg --print-architecture).tar.gz" -C /usr/local \
     && chown -R root:root /usr/local/go \
     && rm -rf go*.gz \
-    && /usr/local/go/bin/go get github.com/go-delve/delve/cmd/dlv \
+    && /usr/local/go/bin/go install github.com/go-delve/delve/cmd/dlv@latest \
     && usermod -aG docker root \
     && echo "export PATH=\$PATH:/usr/local/go/bin" >> /etc/bash.bashrc