diff --git a/transport-interop/impl/go/v0.36/Makefile b/transport-interop/impl/go/v0.36/Makefile
new file mode 100644
index 0000000..5bfdfcd
--- /dev/null
+++ b/transport-interop/impl/go/v0.36/Makefile
@@ -0,0 +1,31 @@
+image_name := go-v0.36
+version := 0.36.0
+
+all: image.json
+
+image.json: verify-checksum go-libp2p-${version}
+	cd go-libp2p-${version} && IMAGE_NAME=${image_name} ../../../../dockerBuildWrapper.sh -f test-plans/PingDockerfile .
+	docker image inspect ${image_name} -f "{{.Id}}" | \
+		xargs -I {} echo "{\"imageID\": \"{}\"}" > $@
+
+go-libp2p-${version}: go-libp2p-${version}.zip
+	unzip -o go-libp2p-${version}.zip
+
+go-libp2p-${version}.zip:
+	wget -O $@ "https://github.com/libp2p/go-libp2p/archive/v${version}.zip"
+
+# Run `make version.lock` to generate this lock file. This file should be commited.
+# This locks the exact contents of the specified version. This lets us use the
+# human readable name while still making sure the contents don't change.
+version.lock: go-libp2p-${version}.zip
+	shasum -a 256 go-libp2p-${version}.zip > $@
+
+verify-checksum: go-libp2p-${version}.zip
+	shasum -a 256 -c version.lock
+
+.PHONY: clean all verify-checksum
+
+clean:
+	rm image.json
+	rm go-libp2p-*.zip
+	rm -rf go-libp2p-*
diff --git a/transport-interop/impl/go/v0.36/version.lock b/transport-interop/impl/go/v0.36/version.lock
new file mode 100644
index 0000000..0747cce
--- /dev/null
+++ b/transport-interop/impl/go/v0.36/version.lock
@@ -0,0 +1 @@
+09828c27b44af441d49617146f196638879a19570e1ba06cb7bf63df0a34bbef  go-libp2p-0.36.0.zip
diff --git a/transport-interop/versionsInput.json b/transport-interop/versionsInput.json
index ea69c61..df7adc7 100644
--- a/transport-interop/versionsInput.json
+++ b/transport-interop/versionsInput.json
@@ -239,5 +239,22 @@
     "muxers": [
       "yamux"
     ]
+  },
+  {
+    "id": "go-v0.36",
+    "transports": [
+      "tcp",
+      "ws",
+      "quic-v1",
+      "webtransport",
+      "webrtc-direct"
+    ],
+    "secureChannels": [
+      "tls",
+      "noise"
+    ],
+    "muxers": [
+      "yamux"
+    ]
   }
 ]