diff --git a/src/p2p/peer_comm_server.cpp b/src/p2p/peer_comm_server.cpp
index ea24b85f..1fe61564 100644
--- a/src/p2p/peer_comm_server.cpp
+++ b/src/p2p/peer_comm_server.cpp
@@ -18,7 +18,7 @@ namespace p2p
     peer_comm_server::peer_comm_server(const uint16_t port, const uint64_t (&metric_thresholds)[5], const uint64_t max_msg_size,
                                        const uint64_t max_in_connections, const uint64_t max_in_connections_per_host,
                                        const std::vector<peer_properties> &req_known_remotes)
-        : comm::comm_server<peer_comm_session>("Peer", port, metric_thresholds, max_msg_size, max_in_connections, max_in_connections_per_host, true, true),
+        : comm::comm_server<peer_comm_session>("Peer", port, metric_thresholds, max_msg_size, max_in_connections, max_in_connections_per_host, true, false),
           req_known_remotes(req_known_remotes) // Copy over known peers into internal collection.
     {
     }
@@ -171,7 +171,7 @@ namespace p2p
             const uint16_t port = peer.ip_port.port;
             LOG_DEBUG << "Trying to connect " << host << ":" << std::to_string(port);
 
-            std::variant<hpws::client, hpws::error> client_result = hpws::client::connect(conf::ctx.hpws_exe_path, max_msg_size, host, port, "/", {}, util::fork_detach, true, conf::cfg.contract.id, [&]() -> bool
+            std::variant<hpws::client, hpws::error> client_result = hpws::client::connect(conf::ctx.hpws_exe_path, max_msg_size, host, port, "/", {}, util::fork_detach, true, visa_required ? conf::cfg.contract.id : "", [&]() -> bool
                                                                                           { return is_shutting_down; });
 
             if (std::holds_alternative<hpws::error>(client_result))
diff --git a/test/bin/hpws b/test/bin/hpws
index aa5e24d5..9aca1fdb 100755
Binary files a/test/bin/hpws and b/test/bin/hpws differ
diff --git a/test/docker/Dockerfile.ubt.20.04-njs b/test/docker/Dockerfile.ubt.20.04-njs
index 3ca8ebef..d03b3e65 100644
--- a/test/docker/Dockerfile.ubt.20.04-njs
+++ b/test/docker/Dockerfile.ubt.20.04-njs
@@ -1,6 +1,6 @@
 # HotPocket (Ubuntu 20.04) + NodeJs
 
-FROM evernode/hotpocket:%ver%-ubt.20.04
+FROM evernode/hotpocket:test-ubt.20.04
 
 # Copy the node binary from build context to the container image.
 COPY node /usr/bin/
\ No newline at end of file
diff --git a/test/docker/build.sh b/test/docker/build.sh
index 6dfaa004..f8c112a0 100755
--- a/test/docker/build.sh
+++ b/test/docker/build.sh
@@ -17,7 +17,7 @@ imgversion=$(echo "${hpversion% }")
 # imgversion="latest"
 
 # Ubuntu base image
-docker build -t "$img:$imgversion-ubt.20.04" -t "$img:latest-ubt.20.04" -f ./$basefile $tmp/
+docker build -t "$img:test-ubt.20.04" -f ./$basefile $tmp/
 rm -r $tmp/*
 
 # NodeJs image
@@ -27,6 +27,6 @@ tar -xvJf $tmp/nodejs.tar.xz --strip-components=2 -C $tmp/ node-v20.4.0-linux-x6
 rm $tmp/nodejs.tar.xz
 cp ./$njsfile $tmp/
 sed -i "s/%ver%/$imgversion/g" $tmp/$njsfile
-docker build -t "$img:$imgversion-ubt.20.04-njs.20" -t "$img:latest-ubt.20.04-njs.20" -f $tmp/$njsfile $tmp
+docker build -t "$img:test-ubt.20.04-njs.20" -f $tmp/$njsfile $tmp
 
 rm -r $tmp
\ No newline at end of file
diff --git a/test/docker/push.sh b/test/docker/push.sh
index 1cefd176..c631c8f7 100755
--- a/test/docker/push.sh
+++ b/test/docker/push.sh
@@ -3,4 +3,5 @@
 
 img=evernode/hotpocket
 
-docker image push --all-tags $img
\ No newline at end of file
+docker image push "$img:test-ubt.20.04"
+docker image push "$img:test-ubt.20.04-njs.20"
\ No newline at end of file