diff --git a/README.md b/README.md
index f1b0d14430b..117ca50f2c5 100644
--- a/README.md
+++ b/README.md
@@ -602,6 +602,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [Here](https://developer.here.com/)
 - [IBM](https://www.ibm.com/)
 - [JustStar](https://www.juststarinfo.com)
+- [k6.io](https://k6.io/)
 - [Klarna](https://www.klarna.com/)
 - [Kronsoft Development](https://www.kronsoft.ro/home/)
 - [Kubernetes](https://kubernetes.io)
diff --git a/bin/k6-petstore.sh b/bin/k6-petstore.sh
new file mode 100755
index 00000000000..edb724827eb
--- /dev/null
+++ b/bin/k6-petstore.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -g k6 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/client/petstore/k6 $@"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/website/src/dynamic/users.yml b/website/src/dynamic/users.yml
index ddc1bf00648..4b715219800 100644
--- a/website/src/dynamic/users.yml
+++ b/website/src/dynamic/users.yml
@@ -178,6 +178,11 @@
   image: "img/companies/juststar.png"
   infoLink: "https://www.juststarinfo.com/"
   pinned: true
+-
+  caption: k6.io 
+  image: "img/companies/k6.jpg"
+  infoLink: "https://k6.io"
+  pinned: false
 -
   caption: Klarna
   image: "img/companies/klarna.svg"
diff --git a/website/static/img/companies/k6.jpg b/website/static/img/companies/k6.jpg
new file mode 100644
index 00000000000..051b04db5a8
Binary files /dev/null and b/website/static/img/companies/k6.jpg differ