diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 6e65890..dd7e420 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:latest
-LABEL maintainer "fithwum"
+LABEL maintainer="fithwum"
 
 # URL's for files
 ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/refs/heads/main/alpine/files/Install_Script.sh
diff --git a/basic/Dockerfile b/basic/Dockerfile
index a427564..5014ac1 100644
--- a/basic/Dockerfile
+++ b/basic/Dockerfile
@@ -1,5 +1,5 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+FROM fithwum/base-image:debian-bullseye
+LABEL maintainer="fithwum"
 
 # URL's for files
 ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/refs/heads/main/basic/files/Install_Script.sh
diff --git a/build_TS.sh b/build_TS.sh
index 2484bde..13d9c42 100755
--- a/build_TS.sh
+++ b/build_TS.sh
@@ -5,4 +5,9 @@
 docker build --pull --rm -f "alpine/Dockerfile" -t gitea.fithwum.tech/fithwum/teamspeak-server:alpine "alpine"
 docker build --pull --rm -f "debian/Dockerfile" -t gitea.fithwum.tech/fithwum/teamspeak-server:debian "debian"
 docker build --pull --rm -f "basic/Dockerfile" -t gitea.fithwum.tech/fithwum/teamspeak-server:basic "basic"
-docker push -a gitea.fithwum.tech/fithwum/teamspeak-server
\ No newline at end of file
+docker push -a gitea.fithwum.tech/fithwum/teamspeak-server
+
+docker build --pull --rm -f "alpine/Dockerfile" -t fithwum/teamspeak-server:alpine "alpine"
+docker build --pull --rm -f "debian/Dockerfile" -t fithwum/teamspeak-server:debian "debian"
+docker build --pull --rm -f "basic/Dockerfile" -t fithwum/teamspeak-server:basic "basic"
+docker push -a fithwum/teamspeak-server
\ No newline at end of file
diff --git a/debian/Dockerfile b/debian/Dockerfile
index e36478a..e09831e 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -1,5 +1,5 @@
-FROM gitea.fithwum.tech/fithwum/base-image:debian-bullseye
-LABEL maintainer "fithwum"
+FROM fithwum/base-image:debian-bullseye
+LABEL maintainer="fithwum"
 
 # URL's for files
 ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/refs/heads/main/debian/files/Install_Script.sh