diff --git a/Makefile b/Makefile
index 3ea92069..5e682f80 100644
--- a/Makefile
+++ b/Makefile
@@ -102,13 +102,12 @@ rabbitmq-server-tls:
 	cd compose/tls; git clone https://github.com/michaelklishin/tls-gen tls-gen; cd tls-gen/basic; make
 	mv compose/tls/tls-gen/basic/result/server_*_certificate.pem compose/tls/tls-gen/basic/result/server_certificate.pem
 	mv compose/tls/tls-gen/basic/result/server_*key.pem compose/tls/tls-gen/basic/result/server_key.pem
-	docker run -it --rm --name rabbitmq-stream-go-client-test \
+	docker run -d --name rabbitmq-stream-client-test \
 		-p 5552:5552 -p 5672:5672 -p 5671:5671 -p 5551:5551 -p 15672:15672 \
 		-v  $(shell pwd)/compose/tls/conf/:/etc/rabbitmq/ -v $(shell pwd)/compose/tls/tls-gen/basic/result/:/certs \
 		-e RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbitmq_stream advertised_host localhost" \
 		--pull always \
-		pivotalrabbitmq/rabbitmq-stream 	
-
+		docker.io/rabbitmq:3.13-rc-management
 
 
 
diff --git a/compose/ha_tls/docker-compose.yml b/compose/ha_tls/docker-compose.yml
index e8bfabc6..a1d4e82f 100644
--- a/compose/ha_tls/docker-compose.yml
+++ b/compose/ha_tls/docker-compose.yml
@@ -3,11 +3,11 @@ services:
   rabbit_node0:
     environment:
       - RABBITMQ_ERLANG_COOKIE='secret_cookie'
-      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node0
+      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node0 advertised_port 5562
     networks:
       - back
     hostname: node0
-    image: pivotalrabbitmq/rabbitmq-stream
+    image: docker.io/rabbitmq:3.13-rc-management
     ports:
       - "5561:5551"
       - "5562:5552"
@@ -18,11 +18,11 @@ services:
   rabbit_node1:
     environment:
       - RABBITMQ_ERLANG_COOKIE='secret_cookie'
-      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node1
+      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node1 advertised_port 5572
     networks:
       - back
     hostname: node1
-    image: pivotalrabbitmq/rabbitmq-stream
+    image: docker.io/rabbitmq:3.13-rc-management
     ports:
       - "5571:5551"
       - "5572:5552"
@@ -33,11 +33,11 @@ services:
   rabbit_node2:
     environment:
       - RABBITMQ_ERLANG_COOKIE='secret_cookie'
-      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node2
+      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbitmq_stream advertised_host node2 advertised_port 5582
     networks:
       - back
     hostname: node2
-    image: pivotalrabbitmq/rabbitmq-stream
+    image: docker.io/rabbitmq:3.13-rc-management
     ports:
       - "5581:5551"
       - "5582:5552"
diff --git a/compose/tls/conf/enabled_plugins b/compose/tls/conf/enabled_plugins
index 9d0383d1..f7967ef6 100644
--- a/compose/tls/conf/enabled_plugins
+++ b/compose/tls/conf/enabled_plugins
@@ -1 +1 @@
-[rabbitmq_management, rabbitmq_stream, rabbitmq_stream_management].
\ No newline at end of file
+[rabbitmq_amqp1_0,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_stream,rabbitmq_stream_management].