diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml
index e9040bb..8d27f96 100644
--- a/.github/workflows/games.yml
+++ b/.github/workflows/games.yml
@@ -1,13 +1,15 @@
+name: build games
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
-      - tt_master
+      - master
     paths:
-      - tt_games/**
-
+      - games/**
 jobs:
   push:
-    name: "games:${{ matrix.tag }}"
+    name: "games:${{ matrix.game }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -28,9 +30,9 @@ jobs:
           password: ${{ secrets.REGISTRY_TOKEN }}
       - uses: docker/build-push-action@v2
         with:
-          context: ./games
+          context: ./games/${{ matrix.game }}
           file: ./games/${{ matrix.game }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pterodactyl/games:${{ matrix.tag }}
+            ghcr.io/pterodactyl/games:${{ matrix.game }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 270f8d1..4891141 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -1,10 +1,12 @@
+name: build go
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
       - master
     paths:
-      - tt_go/**
-
+      - go/**
 jobs:
   push:
     name: "yolks:go_${{ matrix.tag }}"
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index d33396b..e42e3d8 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -1,13 +1,15 @@
+name: build installers
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
-      - tt_master
+      - master
     paths:
       - installers/**
-
 jobs:
   push:
-    name: "yolk_installers:{{ matrix.tag }}"
+    name: "installers:{{ matrix.tag }}"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -33,4 +35,4 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ghcr.io/pterodactyl/yolk_installers:${{ matrix.tag }}
+            ghcr.io/pterodactyl/installers:${{ matrix.tag }}
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 125664c..f03f895 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -1,10 +1,12 @@
+name: build java
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
       - master
     paths:
-      - tt_java/**
-
+      - java/**
 jobs:
   push:
     name: "yolks:java_${{ matrix.tag }}"
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 4802252..e7c1822 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -1,10 +1,12 @@
+name: build nodejs
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
       - master
     paths:
-      - tt_nodejs/*
-
+      - nodejs/*
 jobs:
   push:
     name: "yolks:nodejs_${{ matrix.tag }}"
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index bab9b21..5d8fdce 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -1,10 +1,12 @@
+name: build python
 on:
+  schedule:
+    - cron: "0 0 * * 1"
   push:
     branches:
       - master
     paths:
-      - tt_python/**
-
+      - python/**
 jobs:
   push:
     name: "yolks:python_${{ matrix.tag }}"
diff --git a/.github/workflows/yolks.yml b/.github/workflows/yolks.yml
deleted file mode 100644
index 044d3da..0000000
--- a/.github/workflows/yolks.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - games
-      - installers
-
-jobs:
-  changes:
-    runs-on: ubuntu-latest
-    outputs:
-      images: ${{ steps.filter.outputs.changes }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          base: HEAD
-          filters: |
-            alpine: alpine
-            go_1.14: go/1.14
-            go_1.15: go/1.15
-            go_1.16: go/1.16
-            python_3.7: python/3.7
-            python_3.8: python/3.8
-            python_3.9: python/3.9
-            nodejs_12: nodejs/12
-            nodejs_13: nodejs/13
-            nodejs_14: nodejs/14
-            nodejs_15: nodejs/15
-            java_7: java/7
-            java_8: java/8
-            java_9: java/9
-            java_11: java/11
-            java_14: java/14
-            java_16: java/16
-
-  push:
-    needs: changes
-    # name: "yolks:python_${{ matrix.tag }}"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        image: ${{ fromJSON(needs.changes.outputs.images) }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          echo "${{ matrix.image }}"
-#      - uses: docker/setup-buildx-action@v1
-#        with:
-#          version: "v0.5.1"
-#          buildkitd-flags: --debug
-#      - uses: docker/login-action@v1
-#        with:
-#          registry: ghcr.io
-#          username: ${{ github.repository_owner }}
-#          password: ${{ secrets.REGISTRY_TOKEN }}
-#      - uses: docker/build-push-action@v2
-#        with:
-#          context: ./python
-#          file: ./python/${{ matrix.tag }}/Dockerfile
-#          platforms: linux/amd64
-#          push: true
-#          tags: |
-#            ghcr.io/pterodactyl/yolks:python_${{ matrix.tag }}