diff --git a/images/gotls13-t2/Dockerfile b/images/gotls13-t2/Dockerfile
new file mode 100644
index 0000000..53495f8
--- /dev/null
+++ b/images/gotls13-t2/Dockerfile
@@ -0,0 +1,8 @@
+FROM buildpack-deps
+
+EXPOSE 443
+
+ADD certs/privkey.pem /
+ADD certs/fullchain.pem /
+ADD bin/server /
+CMD [ "/server", "-b", "0.0.0.0:443", "-cert", "/privkey.pem:/fullchain.pem" ]
diff --git a/images/gotls13-t2/Makefile b/images/gotls13-t2/Makefile
new file mode 100644
index 0000000..89d4506
--- /dev/null
+++ b/images/gotls13-t2/Makefile
@@ -0,0 +1,16 @@
+NAME=gotls13-p2
+PORT=50603
+build:
+	mkdir -p certs
+	cp ../../cert/fullchain.pem certs/
+	cp ../../cert/privkey.pem certs/
+	docker build -t ${NAME} .
+run:
+	docker run --detach --restart always --name ${NAME} -p ${PORT}:443 ${NAME}
+
+restart:
+	docker stop ${NAME}
+	docker rm ${NAME}
+	docker run --detach --restart always --name ${NAME} -p ${PORT}:443 ${NAME}
+
+
diff --git a/images/tst-gotls13/bin/server b/images/gotls13-t2/bin/server
similarity index 53%
rename from images/tst-gotls13/bin/server
rename to images/gotls13-t2/bin/server
index d34fa6b..e1d7df7 100755
Binary files a/images/tst-gotls13/bin/server and b/images/gotls13-t2/bin/server differ
diff --git a/images/tst-gotls13/Dockerfile b/images/tst-gotls13/Dockerfile
deleted file mode 100644
index 303f5f5..0000000
--- a/images/tst-gotls13/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM buildpack-deps
-
-EXPOSE 443
-
-#ADD cert/privkey.pem /
-#ADD cert/fullchain.pem /
-ADD bin/server /
-CMD [ "/server", "-b", "0.0.0.0:443", "-enable_sidh" ]
diff --git a/images/tst-gotls13/Makefile b/images/tst-gotls13/Makefile
deleted file mode 100644
index a60f252..0000000
--- a/images/tst-gotls13/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-build:
-	docker build -t pq-t1 .
-run:
-	docker run --detach --restart always --name pq-t1 -p 50510:443 pq-t1
-
-restart:
-	docker restart pq-t1