diff --git a/packages/sshnoports/test/end2end_tests/docker-compose.yml b/packages/sshnoports/test/end2end_tests/docker-compose.yml
index 151d9d9e1..efdeceb80 100644
--- a/packages/sshnoports/test/end2end_tests/docker-compose.yml
+++ b/packages/sshnoports/test/end2end_tests/docker-compose.yml
@@ -18,6 +18,8 @@ services:
     volumes:
       - sshnpd-keys:/atsign/.atsign/keys/ # mount keys
       - sshnpd-entrypoint:/atsign/entrypoint.sh # mount entrypoint
+    networks:
+      - sshnpd
     depends_on:
       - image-runtime-trunk
   container-trunk-sshnp:
@@ -26,10 +28,19 @@ services:
     volumes:
       - sshnp-keys:/atsign/.atsign/keys/ # mount keys
       - sshnp-entrypoint:/atsign/entrypoint.sh # mount entrypoint
+    networks:
+      - sshnp
     depends_on:
       - image-runtime-trunk
       - container-trunk-sshnpd
 
+networks:
+  sshnp:
+    driver: bridge
+    name: atsigncompany/sshnp-e2e-network-sshnp
+  sshnpd:
+    driver: bridge
+    name: atsigncompany/sshnp-e2e-network-sshnpd
 
 volumes:
   sshnpd-keys:
diff --git a/packages/sshnoports/test/end2end_tests/image/Dockerfile b/packages/sshnoports/test/end2end_tests/image/Dockerfile
index a54382cc9..762e0a733 100644
--- a/packages/sshnoports/test/end2end_tests/image/Dockerfile
+++ b/packages/sshnoports/test/end2end_tests/image/Dockerfile
@@ -89,32 +89,20 @@ RUN set -eux ; \
   sed -E -i 's|^#?(PasswordAuthentication)\s.*|\1 no|' /etc/ssh/sshd_config ; \
   sed -i 's/#ListenAddress 0.0.0.0/ListenAddress 127.0.0.1/g' /etc/ssh/sshd_config ;
 
-FROM base AS runtime-branch
-
-COPY --chown=${USER}:${USER} --from=build-branch /app/output ${HOMEDIR}/.local/bin
+FROM base AS blank
 
 WORKDIR ${HOMEDIR}
-
 USER ${USER}
-
 ENTRYPOINT sudo service ssh start && sh ${HOMEDIR}/entrypoint.sh
 
-FROM base AS runtime-release
+FROM blank AS runtime-branch
 
-COPY --chown=${USER}:${USER} --from=build-release /app/output ${HOMEDIR}/.local/bin
-
-WORKDIR ${HOMEDIR}
+COPY --chown=${USER}:${USER} --from=build-branch /app/output ${HOMEDIR}/.local/bin
 
-USER ${USER}
+FROM blank AS runtime-release
 
-ENTRYPOINT sudo service ssh start && sh ${HOMEDIR}/entrypoint.sh
+COPY --chown=${USER}:${USER} --from=build-release /app/output ${HOMEDIR}/.local/bin
 
-FROM base AS runtime-local
+FROM blank AS runtime-local
 
 COPY --chown=${USER}:${USER} --from=build-local /app/output ${HOMEDIR}/.local/bin
-
-WORKDIR ${HOMEDIR}
-
-USER ${USER}
-
-ENTRYPOINT sudo service ssh start && sh ${HOMEDIR}/entrypoint.sh
diff --git a/packages/sshnoports/test/end2end_tests/tools/manually-test-sshnp.sh b/packages/sshnoports/test/end2end_tests/tools/manually-test-sshnp.sh
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/sshnoports/test/end2end_tests/tools/manually-test-sshnpd.sh b/packages/sshnoports/test/end2end_tests/tools/manually-test-sshnpd.sh
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/sshnoports/test/end2end_tests/tools/manually-test.sh b/packages/sshnoports/test/end2end_tests/tools/run.sh
similarity index 94%
rename from packages/sshnoports/test/end2end_tests/tools/manually-test.sh
rename to packages/sshnoports/test/end2end_tests/tools/run.sh
index 603f50e95..67e24d4b0 100644
--- a/packages/sshnoports/test/end2end_tests/tools/manually-test.sh
+++ b/packages/sshnoports/test/end2end_tests/tools/run.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# Spin up an interactive container with a specific version of ssh no ports
+
 usage() {
     echo "usage: $0"
     echo "  -h|--help"