diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml
index 5a5b2a3ef2ae..35593078edf1 100644
--- a/.github/workflows/build_and_test_workflow.yml
+++ b/.github/workflows/build_and_test_workflow.yml
@@ -182,7 +182,7 @@ jobs:
         working-directory: ./artifacts
     strategy: 
       matrix:
-        version: [ osd-2.0.0, osd-2.1.0 ]
+        version: [ osd-2.0.0, osd-2.1.0, osd-2.2.0 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/bwctest.sh b/bwctest.sh
index fce7173a4b19..61b8ca244e06 100755
--- a/bwctest.sh
+++ b/bwctest.sh
@@ -13,7 +13,7 @@
 
 set -e
 
-DEFAULT_VERSIONS="osd-2.0.0,osd-2.1.0"
+DEFAULT_VERSIONS="osd-2.0.0,osd-2.1.0,osd-2.2.0"
 
 function usage() {
     echo ""
diff --git a/cypress/test-data/with-security/osd-2.2.0.tar.gz b/cypress/test-data/with-security/osd-2.2.0.tar.gz
new file mode 100644
index 000000000000..2f2c98f1e3da
Binary files /dev/null and b/cypress/test-data/with-security/osd-2.2.0.tar.gz differ
diff --git a/cypress/test-data/without-security/osd-2.2.0.tar.gz b/cypress/test-data/without-security/osd-2.2.0.tar.gz
new file mode 100644
index 000000000000..d229d6b7ed26
Binary files /dev/null and b/cypress/test-data/without-security/osd-2.2.0.tar.gz differ