diff --git a/.github/workflows/end2end_tests.yaml b/.github/workflows/end2end_tests.yaml
index a85b32ced..88531182a 100644
--- a/.github/workflows/end2end_tests.yaml
+++ b/.github/workflows/end2end_tests.yaml
@@ -556,12 +556,33 @@ jobs:
           cat sshnp/entrypoint.sh
           cat sshnpd/entrypoint.sh
 
+      - name: Build docker-compose.yaml
+        working-directory: tests/end2end_tests/tests
+        run: |
+          cat docker-compose-base.yaml > docker-compose.yaml
+          cat service-container-sshnp.yaml >> docker-compose.yaml
+          cat '    image: atsigncompany/sshnp-e2e-runtime:local' >> docker-compose.yaml
+          cat '    depends_on:' >> docker-compose.yaml
+          cat '      - image-runtime-local:' >> docker-compose.yaml
+          cat '      - container-sshnpd:' >> docker-compose.yaml
+          cat service-container-sshnpd.yaml >> docker-compose.yaml
+          cat '    image: atsigncompany/sshnp-e2e-runtime:local' >> docker-compose.yaml
+          cat '    depends_on:' >> docker-compose.yaml
+          cat '      - image-runtime-local:' >> docker-compose.yaml
+
+      - name: docker-compose.yaml
+        if: always()
+        working-directory: tests/end2end_tests/tests
+        run: |
+          cat docker-compose.yaml
+
       - name: Build
-        working-directory: tests/end2end_tests/tests/alternate_port_test
-        run: docker compose build
+        working-directory: tests/end2end_tests/tests
+        run: |
+          docker compose build
 
       - name: Test
-        working-directory: tests/end2end_tests/tests/alternate_port_test
+        working-directory: tests/end2end_tests/tests
         run: |
           ${{ env.DOCKER_COMPOSE_UP_CMD }}
 
diff --git a/tests/end2end_tests/tests/alternate_port_test/docker-compose.yaml b/tests/end2end_tests/tests/alternate_port_test/docker-compose.yaml
deleted file mode 100644
index 44938b0d2..000000000
--- a/tests/end2end_tests/tests/alternate_port_test/docker-compose.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: '3'
-networks:
-  sshnp:
-    driver: bridge
-    name: atsigncompany/sshnp-e2e-network-sshnp
-  sshnpd:
-    driver: bridge
-    name: atsigncompany/sshnp-e2e-network-sshnpd
-services:
-  image-runtime-local:
-    build:
-      context: ../../../../ # root of the repository
-      dockerfile: ./tests/end2end_tests/image/Dockerfile
-      target: runtime-local
-    image: atsigncompany/sshnp-e2e-runtime:local
-    deploy:
-      mode: replicated
-      replicas: 0
-  container-sshnp:
-    container_name: sshnp
-    volumes:
-      - ../../contexts/sshnp:/mount
-    networks:
-      - sshnp
-    image: atsigncompany/sshnp-e2e-runtime:local
-    depends_on:
-      - image-runtime-local
-      - container-sshnpd
-  container-sshnpd:
-    container_name: sshnpd
-    volumes:
-      - ../../contexts/sshnpd:/mount
-    networks:
-      - sshnpd
-    image: atsigncompany/sshnp-e2e-runtime:local
-    depends_on:
-      - image-runtime-local
-    healthcheck:
-      test: grep -Eq "monitor started for @" /atsign/all.txt
-      start_period: 10s # Wait 10 seconds before checking
-      interval: 5s # Check every 5 seconds
-      timeout: 1s # If a check takes longer than a second, consider it a failed check
-      retries: 180 # Retry the check 180 times (180 * 5s = 15 mins)