diff --git a/.github/workflows/ftl-build.yml b/.github/workflows/ftl-build.yml
index 83bb323..92f1804 100644
--- a/.github/workflows/ftl-build.yml
+++ b/.github/workflows/ftl-build.yml
@@ -36,6 +36,11 @@ jobs:
           - platform: linux/arm64/v8
           - platform: linux/riscv64
     steps:
+      - 
+        name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          detached: true
       -
         name: Prepare name for digest up/download
         run: |
diff --git a/ftl-build/Dockerfile b/ftl-build/Dockerfile
index e8ac9c7..fb64c8b 100644
--- a/ftl-build/Dockerfile
+++ b/ftl-build/Dockerfile
@@ -123,12 +123,13 @@ RUN sed -i '/buffer_with_truncation /d' /bats-core/libexec/bats-core/bats-format
 
 # Test compile FTL's development branch, the result is removed from the final container
 # Run the full test suite to ensure that the container is still capable of running the tests
-RUN git clone https://github.com/pi-hole/FTL.git --branch "${GIT_BRANCH}" \
-    && cd FTL \
-    && bash build.sh "-DSTATIC=${STATIC}" \
+WORKDIR /opt/FTL-build
+
+RUN git clone https://github.com/pi-hole/FTL.git --branch "${GIT_BRANCH}" .
+
+RUN bash build.sh "-DSTATIC=${STATIC}" \
     && readelf -A ./pihole-FTL \
-    && readelf -l ./pihole-FTL \
-    && bash test/arch_test.sh \
-    && bash test/run.sh \
-    && cd .. \
-    && rm -r FTL
+    && readelf -l ./pihole-FTL
+
+RUN bash test/arch_test.sh \
+    && bash test/run.sh 
\ No newline at end of file