diff --git a/.github/workflows/docker-bats.yaml b/.github/workflows/docker-bats.yaml
index e8373cfd..c91109aa 100644
--- a/.github/workflows/docker-bats.yaml
+++ b/.github/workflows/docker-bats.yaml
@@ -17,12 +17,12 @@ jobs:
         run: |
           mv tests/.env.docker.default tests/.env.docker
           mv tests/.secrets.default tests/.secrets
-          docker build --build-arg="GO_LIBRARY=go1.21.7.linux-amd64.tar.gz" \
+          docker build --build-arg="GO_LIBRARY=go1.23.1.linux-amd64.tar.gz" \
             --build-arg="AWS_CLI=awscli-exe-linux-x86_64.zip" --build-arg="MC_FOLDER=linux-amd64" \
-            --progress=plain -f Dockerfile_test_bats -t bats_test .
+            --progress=plain -f tests/Dockerfile_test_bats -t bats_test .
 
       - name: Set up Docker Compose
         run: sudo apt-get install -y docker-compose
 
       - name: Run Docker Container
-        run: docker-compose -f docker-compose-bats.yml up --exit-code-from posix_backend posix_backend
+        run: docker-compose -f tests/docker-compose-bats.yml up --exit-code-from posix_backend posix_backend
diff --git a/Dockerfile b/Dockerfile
index 9c8e06fa..00a486f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,4 +32,4 @@ RUN mkdir -p $SETUP_DIR
 
 COPY --from=0 /app/cmd/versitygw/versitygw /app/versitygw
 
-ENTRYPOINT [ "/app/versitygw" ]
\ No newline at end of file
+ENTRYPOINT [ "/app/versitygw" ]
diff --git a/docker-compose-metrics.yml b/extra/dashboard/docker-compose-metrics.yml
similarity index 100%
rename from docker-compose-metrics.yml
rename to extra/dashboard/docker-compose-metrics.yml
diff --git a/Dockerfile.dev b/tests/Dockerfile.dev
similarity index 100%
rename from Dockerfile.dev
rename to tests/Dockerfile.dev
diff --git a/Dockerfile_test_bats b/tests/Dockerfile_test_bats
similarity index 98%
rename from Dockerfile_test_bats
rename to tests/Dockerfile_test_bats
index 48c42761..2352cf04 100644
--- a/Dockerfile_test_bats
+++ b/tests/Dockerfile_test_bats
@@ -3,7 +3,7 @@ FROM ubuntu:latest
 ARG DEBIAN_FRONTEND=noninteractive
 ARG SECRETS_FILE=tests/.secrets
 ARG CONFIG_FILE=tests/.env.docker
-ARG GO_LIBRARY=go1.21.7.linux-arm64.tar.gz
+ARG GO_LIBRARY=go1.23.1.linux-arm64.tar.gz
 ARG AWS_CLI=awscli-exe-linux-aarch64.zip
 ARG MC_FOLDER=linux-arm64
 
diff --git a/docker-compose-bats.yml b/tests/docker-compose-bats.yml
similarity index 100%
rename from docker-compose-bats.yml
rename to tests/docker-compose-bats.yml
diff --git a/docker-compose.yml b/tests/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to tests/docker-compose.yml