diff --git a/bedrock/Dockerfile b/bedrock/Dockerfile
index 8d70d59..abdf380 100644
--- a/bedrock/Dockerfile
+++ b/bedrock/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
+FROM fithwum/base-image:debian-bullseye
 LABEL maintainer="fithwum"
 
 # Environment Variables
diff --git a/build_minecraft.sh b/build_minecraft.sh
index 8f72f08..eb2fd46 100755
--- a/build_minecraft.sh
+++ b/build_minecraft.sh
@@ -3,7 +3,11 @@
 # All rights reserved
 
 docker build --pull --rm -f "testing/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:testing "vanilla"
-docker build --pull --rm -f "vanilla/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:latest "vanilla"
-docker build --pull --rm -f "fabric/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft-fabric:latest "fabric"
+docker build --pull --rm -f "vanilla/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:vanilla "vanilla"
+docker build --pull --rm -f "fabric/Dockerfile" -t gitea.fithwum.tech/fithwum/minecraft:fabric "fabric"
 docker push -a gitea.fithwum.tech/fithwum/minecraft
-docker push -a gitea.fithwum.tech/fithwum/minecraft-fabric
+
+docker build --pull --rm -f "testing/Dockerfile" -t fithwum/minecraft:testing "vanilla"
+docker build --pull --rm -f "vanilla/Dockerfile" -t fithwum/minecraft:vanilla "vanilla"
+docker build --pull --rm -f "fabric/Dockerfile" -t fithwum/minecraft:fabric "fabric"
+docker push -a fithwum/minecraft
\ No newline at end of file
diff --git a/fabric/Dockerfile b/fabric/Dockerfile
index b583952..3a3afac 100644
--- a/fabric/Dockerfile
+++ b/fabric/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bookworm
+FROM fithwum/base-image:debian-bookworm
 LABEL maintainer="fithwum"
 
 # Environment Variables
diff --git a/forge/Dockerfile b/forge/Dockerfile
index 6c67d56..b7029a7 100644
--- a/forge/Dockerfile
+++ b/forge/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
+FROM fithwum/base-image:debian-bullseye
 LABEL maintainer="fithwum"
 
 ENV ACCEPT_EULA="false"
diff --git a/testing/Dockerfile b/testing/Dockerfile
index 652466c..eda94f0 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bookworm
+FROM fithwum/base-image:debian-bookworm
 LABEL maintainer="fithwum"
 
 # Environment Variables
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index 28d9121..a7e49a7 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bookworm
+FROM fithwum/base-image:debian-bookworm
 LABEL maintainer="fithwum"
 
 # Environment Variables