diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4d6c03a53..fe0349d8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -75,6 +75,8 @@ jobs:
 
       - name: "Set up QEMU"
         uses: docker/setup-qemu-action@v1.1.0
+        with:
+          platforms: all
 
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v1
@@ -91,7 +93,7 @@ jobs:
           context: ./docker
           file: docker/Dockerfile
           push: true 
-          platforms: linux/amd64
+          platforms: linux/amd64, linux/arm64
           tags: |
             webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
             webgoat/goatandwolf:latest
diff --git a/.github/workflows/welcome.yml b/.github/workflows/welcome.yml
index ee0cc88a3..9ad343f08 100644
--- a/.github/workflows/welcome.yml
+++ b/.github/workflows/welcome.yml
@@ -1,6 +1,9 @@
 name: Welcome
 
-on: [pull_request, issues]
+on:
+  issues:
+    types:
+      - opened
 
 jobs:
   greeting:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4b1c0eaba..31b0e9686 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:15.0.2-slim
+FROM openjdk:16-slim
 
-ARG webgoat_version=8.2.0-SNAPSHOT
+ARG webgoat_version=8.2.1-SNAPSHOT
 ENV webgoat_version_env=${webgoat_version}
 
 RUN apt-get update
diff --git a/docker/pom.xml b/docker/pom.xml
index 989ab28d3..0a245d64a 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 7680f8d1e..6231aea47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.owasp.webgoat</groupId>
     <artifactId>webgoat-parent</artifactId>
     <packaging>pom</packaging>
-    <version>8.2.0</version>
+    <version>8.2.1-SNAPSHOT</version>
 
     <name>WebGoat Parent Pom</name>
     <description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index ca6e3e57e..ea83551ce 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/webgoat-integration-tests/pom.xml b/webgoat-integration-tests/pom.xml
index e96e4b67f..abd0f8e10 100644
--- a/webgoat-integration-tests/pom.xml
+++ b/webgoat-integration-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/auth-bypass/pom.xml b/webgoat-lessons/auth-bypass/pom.xml
index 60a5889a3..6cefc9d83 100644
--- a/webgoat-lessons/auth-bypass/pom.xml
+++ b/webgoat-lessons/auth-bypass/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/bypass-restrictions/pom.xml b/webgoat-lessons/bypass-restrictions/pom.xml
index 389fdad1a..4ed518cf6 100755
--- a/webgoat-lessons/bypass-restrictions/pom.xml
+++ b/webgoat-lessons/bypass-restrictions/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
diff --git a/webgoat-lessons/challenge/pom.xml b/webgoat-lessons/challenge/pom.xml
index 8b6ef97b0..52c5ff7d9 100644
--- a/webgoat-lessons/challenge/pom.xml
+++ b/webgoat-lessons/challenge/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 
diff --git a/webgoat-lessons/chrome-dev-tools/pom.xml b/webgoat-lessons/chrome-dev-tools/pom.xml
index 1a18a7f84..4ced9f0ee 100644
--- a/webgoat-lessons/chrome-dev-tools/pom.xml
+++ b/webgoat-lessons/chrome-dev-tools/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/cia/pom.xml b/webgoat-lessons/cia/pom.xml
index f369dc021..8362fb105 100644
--- a/webgoat-lessons/cia/pom.xml
+++ b/webgoat-lessons/cia/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/client-side-filtering/pom.xml b/webgoat-lessons/client-side-filtering/pom.xml
index f53e5566c..e92517422 100644
--- a/webgoat-lessons/client-side-filtering/pom.xml
+++ b/webgoat-lessons/client-side-filtering/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/cross-site-scripting/pom.xml b/webgoat-lessons/cross-site-scripting/pom.xml
index d1ddeedf2..668cbc22a 100644
--- a/webgoat-lessons/cross-site-scripting/pom.xml
+++ b/webgoat-lessons/cross-site-scripting/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/webgoat-lessons/crypto/pom.xml b/webgoat-lessons/crypto/pom.xml
index db4d7144b..0b5b99d70 100644
--- a/webgoat-lessons/crypto/pom.xml
+++ b/webgoat-lessons/crypto/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/csrf/pom.xml b/webgoat-lessons/csrf/pom.xml
index e0e27d6f0..940662434 100644
--- a/webgoat-lessons/csrf/pom.xml
+++ b/webgoat-lessons/csrf/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/html-tampering/pom.xml b/webgoat-lessons/html-tampering/pom.xml
index 4fe3c1aa8..702e6665a 100755
--- a/webgoat-lessons/html-tampering/pom.xml
+++ b/webgoat-lessons/html-tampering/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/http-basics/pom.xml b/webgoat-lessons/http-basics/pom.xml
index d6d5024fe..8af8630ab 100644
--- a/webgoat-lessons/http-basics/pom.xml
+++ b/webgoat-lessons/http-basics/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/http-proxies/pom.xml b/webgoat-lessons/http-proxies/pom.xml
index de9b0e787..bfefc4372 100644
--- a/webgoat-lessons/http-proxies/pom.xml
+++ b/webgoat-lessons/http-proxies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/idor/pom.xml b/webgoat-lessons/idor/pom.xml
index cbfbcd8b8..3e9feb2fe 100644
--- a/webgoat-lessons/idor/pom.xml
+++ b/webgoat-lessons/idor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/insecure-deserialization/pom.xml b/webgoat-lessons/insecure-deserialization/pom.xml
index 5485db034..598f857f5 100755
--- a/webgoat-lessons/insecure-deserialization/pom.xml
+++ b/webgoat-lessons/insecure-deserialization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/insecure-login/pom.xml b/webgoat-lessons/insecure-login/pom.xml
index 85654b96c..4104c69ac 100755
--- a/webgoat-lessons/insecure-login/pom.xml
+++ b/webgoat-lessons/insecure-login/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/jwt/pom.xml b/webgoat-lessons/jwt/pom.xml
index 26f4fca7b..005f80c74 100644
--- a/webgoat-lessons/jwt/pom.xml
+++ b/webgoat-lessons/jwt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/missing-function-ac/pom.xml b/webgoat-lessons/missing-function-ac/pom.xml
index 4fc8c9d81..2d6a3129e 100644
--- a/webgoat-lessons/missing-function-ac/pom.xml
+++ b/webgoat-lessons/missing-function-ac/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/password-reset/pom.xml b/webgoat-lessons/password-reset/pom.xml
index 699a1b203..29191c201 100644
--- a/webgoat-lessons/password-reset/pom.xml
+++ b/webgoat-lessons/password-reset/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/path-traversal/pom.xml b/webgoat-lessons/path-traversal/pom.xml
index 6d065e265..d84453dca 100644
--- a/webgoat-lessons/path-traversal/pom.xml
+++ b/webgoat-lessons/path-traversal/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/pom.xml b/webgoat-lessons/pom.xml
index 3776e415c..42be3473c 100644
--- a/webgoat-lessons/pom.xml
+++ b/webgoat-lessons/pom.xml
@@ -5,12 +5,12 @@
     <groupId>org.owasp.webgoat.lesson</groupId>
     <artifactId>webgoat-lessons-parent</artifactId>
     <packaging>pom</packaging>
-    <version>8.2.0</version>
+    <version>8.2.1-SNAPSHOT</version>
 
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/webgoat-lessons/secure-passwords/pom.xml b/webgoat-lessons/secure-passwords/pom.xml
index be35d7553..000066d75 100644
--- a/webgoat-lessons/secure-passwords/pom.xml
+++ b/webgoat-lessons/secure-passwords/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/sql-injection/pom.xml b/webgoat-lessons/sql-injection/pom.xml
index 68dd53690..0ac51bb8b 100644
--- a/webgoat-lessons/sql-injection/pom.xml
+++ b/webgoat-lessons/sql-injection/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/ssrf/pom.xml b/webgoat-lessons/ssrf/pom.xml
index 297931018..25ae98759 100755
--- a/webgoat-lessons/ssrf/pom.xml
+++ b/webgoat-lessons/ssrf/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-lessons/vulnerable-components/pom.xml b/webgoat-lessons/vulnerable-components/pom.xml
index a2a5365df..f16525506 100644
--- a/webgoat-lessons/vulnerable-components/pom.xml
+++ b/webgoat-lessons/vulnerable-components/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>
diff --git a/webgoat-lessons/webgoat-introduction/pom.xml b/webgoat-lessons/webgoat-introduction/pom.xml
index 53fd4edf6..164776c01 100644
--- a/webgoat-lessons/webgoat-introduction/pom.xml
+++ b/webgoat-lessons/webgoat-introduction/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/webgoat-lesson-template/pom.xml b/webgoat-lessons/webgoat-lesson-template/pom.xml
index a6940ce55..98282bd37 100644
--- a/webgoat-lessons/webgoat-lesson-template/pom.xml
+++ b/webgoat-lessons/webgoat-lesson-template/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
 </project>
diff --git a/webgoat-lessons/webwolf-introduction/pom.xml b/webgoat-lessons/webwolf-introduction/pom.xml
index 953672f51..7a4d58616 100644
--- a/webgoat-lessons/webwolf-introduction/pom.xml
+++ b/webgoat-lessons/webwolf-introduction/pom.xml
@@ -6,6 +6,6 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 </project>
\ No newline at end of file
diff --git a/webgoat-lessons/xxe/pom.xml b/webgoat-lessons/xxe/pom.xml
index 8f316274d..758b560f1 100644
--- a/webgoat-lessons/xxe/pom.xml
+++ b/webgoat-lessons/xxe/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat.lesson</groupId>
         <artifactId>webgoat-lessons-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/webgoat-server/pom.xml b/webgoat-server/pom.xml
index 69aebaa44..dce260880 100644
--- a/webgoat-server/pom.xml
+++ b/webgoat-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/webwolf/pom.xml b/webwolf/pom.xml
index b65e87c45..fcfe4f92f 100644
--- a/webwolf/pom.xml
+++ b/webwolf/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
+        <version>8.2.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>