diff --git a/pact_broker/config/puma.rb b/pact_broker/config/puma.rb
index a6648feb..22eb6b6c 100644
--- a/pact_broker/config/puma.rb
+++ b/pact_broker/config/puma.rb
@@ -1,7 +1,6 @@
 require_relative "../docker_configuration"
 
-bind "tcp://0.0.0.0:#{PactBroker.docker_configuration.port}"
-bind "tcp://[::]:#{PactBroker.docker_configuration.port}"
+port PactBroker.docker_configuration.port
 
 if PactBroker.docker_configuration.puma_persistent_timeout
   persistent_timeout PactBroker.docker_configuration.puma_persistent_timeout
diff --git a/script/test.sh b/script/test.sh
index ab8db3f4..b5a9d907 100755
--- a/script/test.sh
+++ b/script/test.sh
@@ -5,7 +5,7 @@ set -e
 docker_compose_files=$(find . -name "docker-compose-test*.yml")
 
 for file in $docker_compose_files; do
-  cat $file | sed -e "s~image: pactfoundation/pact-broker:.*~image: pactfoundation/pact-broker:${TAG}~g" > dc-tmp
+  cat $file | sed -e "s/pactfoundation\/pact-broker:latest.*/pactfoundation\/pact-broker:${TAG}\"/g" > dc-tmp
   mv dc-tmp $file
 done