diff --git a/TTT/Dockerfile b/TTT/Dockerfile
index a120c8a..c4d6364 100644
--- a/TTT/Dockerfile
+++ b/TTT/Dockerfile
@@ -2,7 +2,7 @@ FROM jusito/docker-ttt:gmod_debian
 	
 ENV SERVER_GAMEMODE="terrortown"
 
-COPY "server.cfg.default" "/home/server.cfg.default"
+COPY "TTT/server.cfg.default" "/home/server.cfg.default"
 
 USER "$USER_ID:$GROUP_ID"
 
diff --git a/gmod/Dockerfile b/gmod/Dockerfile
index 8b53e27..3c737a4 100644
--- a/gmod/Dockerfile
+++ b/gmod/Dockerfile
@@ -72,7 +72,7 @@ ENV CSS_PATH="/home/steam/addons/css" \
 	USE_MY_REPLACER_CONFIG=false
 	
 
-COPY ["prepareServer.sh", "initConfig.sh", "forceWorkshopDownload.sh", "installAndMountAddons.sh", "common.cfg", "/home/"]
+COPY ["gmod/prepareServer.sh", "gmod/initConfig.sh", "gmod/forceWorkshopDownload.sh", "gmod/installAndMountAddons.sh", "gmod/common.cfg", "/home/"]
 
 RUN chown "$DOCKER_USER:$DOCKER_USER" /home/prepareServer.sh && \
 	chown "$DOCKER_USER:$DOCKER_USER" /home/initConfig.sh && \
diff --git a/lgsm/Dockerfile b/lgsm/Dockerfile
index cc9b6d7..14ae8ba 100644
--- a/lgsm/Dockerfile
+++ b/lgsm/Dockerfile
@@ -34,7 +34,7 @@ ENTRYPOINT ["./home/entrypoint.sh"]
 
 #WORKDIR "$STEAM_PATH"
 	
-COPY ["entrypoint.sh", "initCron.sh", "createAlias.sh", "/home/"]
+COPY ["lgsm/entrypoint.sh", "lgsm/initCron.sh", "lgsm/createAlias.sh", "/home/"]
 
 # procps needed for ps command
 # iproute2 needed because of "-slim"
diff --git a/lgsm/hooks/pre_push b/lgsm/hooks/pre_push
index 871d5b3..0e22468 100644
--- a/lgsm/hooks/pre_push
+++ b/lgsm/hooks/pre_push
@@ -5,7 +5,7 @@
 #set -o nounset 
 
 #docker build -t "$DOCKER_REPO:lgsm_debian" "lgsm/"
-cd ..
-docker build -t "$DOCKER_REPO:gmod_debian" "gmod/"
-docker build -t "$DOCKER_REPO:gmod_ttt_debian" "TTT/"
-docker build -t "$DOCKER_REPO:latest" "TTT/"
+docker build -f gmod/Dockerfile -t "$DOCKER_REPO:gmod_debian" "gmod/"
+docker build -f TTT/Dockerfile -t "$DOCKER_REPO:gmod_ttt_debian" "TTT/"
+docker tag "$DOCKER_REPO:gmod_ttt_debian" "$DOCKER_REPO:latest"
+docker push "$DOCKER_REPO:latest"
diff --git a/test/testBuild.sh b/test/testBuild.sh
index 0604928..212076c 100644
--- a/test/testBuild.sh
+++ b/test/testBuild.sh
@@ -13,10 +13,10 @@ set -o pipefail
 echo "[testBuild][INFO]build"
 
 docker rmi "jusito/docker-ttt:lgsm_debian" || true
-docker build -t "jusito/docker-ttt:lgsm_debian" "./lgsm/"
+docker build -f lgsm/Dockerfile -t "jusito/docker-ttt:lgsm_debian" "."
 
 docker rmi "jusito/docker-ttt:gmod_debian" || true
-docker build -t "jusito/docker-ttt:gmod_debian" "./gmod/"
+docker build -f gmod/Dockerfile -t "jusito/docker-ttt:gmod_debian" "."
 
 docker rmi "jusito/docker-ttt:gmod_ttt_debian" || true
-docker build -t "jusito/docker-ttt:gmod_ttt_debian" "./TTT/"
\ No newline at end of file
+docker build -f TTT/Dockerfile -t "jusito/docker-ttt:gmod_ttt_debian" "."
\ No newline at end of file
diff --git a/test/testCaseQuick.sh b/test/testCaseQuick.sh
index 64b2082..eba1041 100644
--- a/test/testCaseQuick.sh
+++ b/test/testCaseQuick.sh
@@ -12,7 +12,7 @@ set -o pipefail
 
 #bash test/testStyle.sh
 
-bash testBuild.sh
+bash test/testBuild.sh
 
 
 echo "[testRun][INFO]running"