diff --git a/images/pq-connect-amd64-gcc/Dockerfile b/images/pq-connect-amd64-gcc/Dockerfile
new file mode 100644
index 0000000..bed2c55
--- /dev/null
+++ b/images/pq-connect-amd64-gcc/Dockerfile
@@ -0,0 +1,8 @@
+FROM buildpack-deps
+
+EXPOSE 443
+
+ADD bin/bssl /bin
+ADD bin/bssl_client /
+ADD req.txt /
+CMD [ "/bssl_client" ]
diff --git a/images/pq-connect-amd64-gcc/Makefile b/images/pq-connect-amd64-gcc/Makefile
new file mode 100644
index 0000000..49503ba
--- /dev/null
+++ b/images/pq-connect-amd64-gcc/Makefile
@@ -0,0 +1,8 @@
+NAME=pq-gcc-amd64-client
+build:
+	docker build -t ${NAME} .
+run:
+	docker run --detach --restart always --name ${NAME} ${NAME}
+
+restart:
+	docker restart ${NAME}
diff --git a/images/pq-connect-amd64-gcc/bin/bssl b/images/pq-connect-amd64-gcc/bin/bssl
new file mode 100755
index 0000000..4c96a9c
Binary files /dev/null and b/images/pq-connect-amd64-gcc/bin/bssl differ
diff --git a/images/pq-connect-amd64-gcc/bin/bssl_client b/images/pq-connect-amd64-gcc/bin/bssl_client
new file mode 100755
index 0000000..5fd83f3
--- /dev/null
+++ b/images/pq-connect-amd64-gcc/bin/bssl_client
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+COUNT=0
+while [ 1 ]; do
+	bssl client -curves CECPQ2 -connect www.cloudflare.com -server-name www.cloudflare.com < /req.txt
+	bssl client -curves X25519-SIDHp503 -connect www.cloudflare.com -server-name www.cloudflare.com < /req.txt
+	bssl client -curves P-521 -connect www.cloudflare.com -server-name www.cloudflare.com < /req.txt
+	COUNT=$((COUNT + 1))
+	if [ $COUNT -eq 1000 ]; then
+		COUNT=0
+		echo "SLEEPING"
+		sleep 1
+	fi
+done
+
diff --git a/images/pq-connect-amd64-gcc/req.txt b/images/pq-connect-amd64-gcc/req.txt
new file mode 100644
index 0000000..e77484a
--- /dev/null
+++ b/images/pq-connect-amd64-gcc/req.txt
@@ -0,0 +1,4 @@
+GET / HTTP/1.0
+Host: www.cloudflare.com
+
+
diff --git a/images/pq-gcc/Dockerfile b/images/pq-gcc/Dockerfile
index 562f59b..432fd07 100644
--- a/images/pq-gcc/Dockerfile
+++ b/images/pq-gcc/Dockerfile
@@ -3,4 +3,7 @@ FROM buildpack-deps
 EXPOSE 443
 
 ADD bin/bssl /
-CMD [ "./bssl", "server", "-curves", "X25519:P-256:X25519-SIDHp503", "-accept", "443", "-loop", "-www" ]
+CMD mkdir certs
+ADD certs/privkey.pem certs/
+ADD certs/fullchain.pem certs/
+CMD [ "./bssl", "server", "-curves", "CECPQ2:X25519-SIDHp503:X25519:P-256:P-384:P-224:P-521", "-accept", "443", "-loop", "-www", "-cert", "certs/fullchain.pem", "-key", "certs/privkey.pem" ]
diff --git a/images/pq-gcc/Makefile b/images/pq-gcc/Makefile
index a1c95ac..e08f3f2 100644
--- a/images/pq-gcc/Makefile
+++ b/images/pq-gcc/Makefile
@@ -1,6 +1,9 @@
 NAME=pq-gcc-amd64
 PORT=50601
 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}
diff --git a/images/pq-gcc/bin/bssl b/images/pq-gcc/bin/bssl
index 033bad1..4c96a9c 100755
Binary files a/images/pq-gcc/bin/bssl and b/images/pq-gcc/bin/bssl differ
diff --git a/images/pq/bin/caddy b/images/pq/bin/caddy
index 0a5cab6..106aea1 100755
Binary files a/images/pq/bin/caddy and b/images/pq/bin/caddy differ