diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 22a8a1f..fadcc64 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -1,4 +1,4 @@
-name: Build and Push Multi-Arch Docker Images
+name: Build and Push Minecraft Docker Images
 
 on:
   push:
@@ -25,8 +25,8 @@ jobs:
         run: |
           IMAGE_REGISTRY=gitea.fithwum.tech
           IMAGE_ORG=fithwum
-          IMAGE_REPO=base-image
-          IMAGE_NAME=debian
+          IMAGE_REPO=minecraft
+          IMAGE_NAME=minecraft
           
           # Set the tag based on the folder name (vanilla, TESTING, fabric)
           IMAGE_TAG_VANILLA=vanilla
@@ -38,9 +38,9 @@ jobs:
           echo "IMAGE_TAG_FABRIC=${IMAGE_TAG_FABRIC}" >> $GITHUB_ENV
           
           # Set image names for each subfolder Dockerfile
-          IMAGE_VANILLA=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_VANILLA}
-          IMAGE_TESTING=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_TESTING}
-          IMAGE_FABRIC=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG_FABRIC}
+          IMAGE_VANILLA=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_VANILLA}
+          IMAGE_TESTING=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_TESTING}
+          IMAGE_FABRIC=${IMAGE_REGISTRY}/${IMAGE_ORG}/${IMAGE_NAME}:${IMAGE_TAG_FABRIC}
 
           echo "IMAGE_VANILLA=${IMAGE_VANILLA}" >> $GITHUB_ENV
           echo "IMAGE_TESTING=${IMAGE_TESTING}" >> $GITHUB_ENV
@@ -57,16 +57,16 @@ jobs:
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_VANILLA} \
-            ./minecraft/vanilla
+            ./vanilla
 
       - name: Build and Push testing Docker Image
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_TESTING} \
-            ./minecraft/testing
+            ./testing
 
       - name: Build and Push fabric Docker Image
         run: |
           docker buildx build --platform linux/amd64,linux/arm64 \
             --push -t ${IMAGE_FABRIC} \
-            ./minecraft/fabric
+            ./minecraft-fabric
diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile
index f6728f6..8d70d59 100644
--- a/bedrock/Dockerfile
+++ b/bedrock/Dockerfile
@@ -1,5 +1,5 @@
 FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 # Environment Variables
 ENV ACCEPT_EULA=""
diff --git a/fabric/Dockerfile b/fabric/Dockerfile
index 84aeb60..56023dd 100644
--- a/fabric/Dockerfile
+++ b/fabric/Dockerfile
@@ -1,5 +1,5 @@
 FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 # Environment Variables
 ENV ACCEPT_EULA=""
diff --git a/forge/Dockerfile b/forge/Dockerfile
index 94caa1d..4eb66f4 100644
--- a/forge/Dockerfile
+++ b/forge/Dockerfile
@@ -1,5 +1,5 @@
 FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 ENV ACCEPT_EULA="false"
 ENV GAME_PORT=25565
diff --git a/testing/Dockerfile b/testing/Dockerfile
index bd6f36f..23c0016 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -1,5 +1,5 @@
 FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 # Environment Variables
 ENV ACCEPT_EULA=""
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index 3406ce3..e81ebd4 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -1,5 +1,5 @@
 FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 # Environment Variables
 ENV ACCEPT_EULA=""