diff --git a/jenkins-agents/jenkins-agent-zap/Dockerfile b/jenkins-agents/jenkins-agent-zap/Dockerfile
index 7ce6ee9fe..370057f0c 100644
--- a/jenkins-agents/jenkins-agent-zap/Dockerfile
+++ b/jenkins-agents/jenkins-agent-zap/Dockerfile
@@ -1,8 +1,7 @@
 FROM quay.io/centos/centos:centos7
-LABEL maintainer="Deven Phillips <deven.phillips@redhat.com>"
 
 ARG ZAPROXY_VERSION="2.9.0"
-ARG WEBSWING_VERSION="2.5.10"
+ARG WEBSWING_VERSION="22.2"
 
 RUN yum install -y epel-release && \
     yum clean all && \
@@ -14,7 +13,8 @@ RUN yum install -y epel-release && \
     xorg-x11-server-Xvfb openbox xterm \
     net-tools python-pip \
     firefox nss_wrapper java-1.8.0-openjdk-headless \
-    java-1.8.0-openjdk-devel nss_wrapper && \
+    java-1.8.0-openjdk-devel nss_wrapper \
+    unzip && \
     yum clean all && \
     curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py && chmod 755 get-pip.py && ./get-pip.py && \
     pip install --upgrade pip && \
@@ -37,8 +37,11 @@ COPY .xinitrc /var/lib/jenkins/
 
 WORKDIR /zap
 RUN curl -sL https://github.com/zaproxy/zaproxy/releases/download/v${ZAPROXY_VERSION}/ZAP_${ZAPROXY_VERSION}_Linux.tar.gz | tar zx --strip-components=1 && \
-    curl -sL https://bitbucket.org/meszarv/webswing/get/${WEBSWING_VERSION}.tar.gz | tar zx --strip-components=1 -C webswing && \
-    rm -rf webswing/demo && \
+    curl -sL -o /tmp/webswing.zip https://dev.webswing.org/files/public/webswing-examples-eval-${WEBSWING_VERSION}-distribution.zip && \
+    UNZIP_DISABLE_ZIPBOMB_DETECTION=TRUE unzip /tmp/webswing.zip && \
+    rm /tmp/webswing.zip && \
+    mv webswing-* webswing && \
+    rm -rf webswing/{demo,apps/} && \
     touch AcceptedLicense && \
     git clone --depth 1 --branch v${ZAPROXY_VERSION} https://github.com/zaproxy/zaproxy /tmp/zaproxy && \
     rsync -av /tmp/zaproxy/docker/{policies,scripts,zap*} /zap/ && \