diff --git a/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml b/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml
index 31647071f3..18a01af2c1 100644
--- a/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml
+++ b/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml
@@ -30,7 +30,7 @@ spec:
             - name: NATS_STREAMING_IMAGE
               value: nats-streaming:0.22.1
             - name: NATS_METRICS_EXPORTER_IMAGE
-              value: synadia/prometheus-nats-exporter:0.6.2
+              value: natsio/prometheus-nats-exporter:0.8.0
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/manifests/install.yaml b/manifests/install.yaml
index ab9ff7b5c7..ef3db3b8ad 100644
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -302,7 +302,7 @@ spec:
         - name: NATS_STREAMING_IMAGE
           value: nats-streaming:0.22.1
         - name: NATS_METRICS_EXPORTER_IMAGE
-          value: synadia/prometheus-nats-exporter:0.6.2
+          value: natsio/prometheus-nats-exporter:0.8.0
         image: quay.io/argoproj/argo-events:latest
         imagePullPolicy: Always
         livenessProbe:
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
index aa9f1c58a9..99b29aeaee 100644
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -223,7 +223,7 @@ spec:
         - name: NATS_STREAMING_IMAGE
           value: nats-streaming:0.22.1
         - name: NATS_METRICS_EXPORTER_IMAGE
-          value: synadia/prometheus-nats-exporter:0.6.2
+          value: natsio/prometheus-nats-exporter:0.8.0
         image: quay.io/argoproj/argo-events:latest
         imagePullPolicy: Always
         livenessProbe:
diff --git a/third_party/nats-streaming-docker/README.md b/third_party/nats-streaming-docker/README.md
index 0ffb0944d9..f2de4ec703 100644
--- a/third_party/nats-streaming-docker/README.md
+++ b/third_party/nats-streaming-docker/README.md
@@ -5,4 +5,4 @@ This is a partial copy of
 current
 [nats-streaming-server](https://github.com/nats-io/nats-streaming-server)
 version is
-[v0.17.0](https://github.com/nats-io/nats-streaming-server/tree/v0.17.0).
+[v0.22.1](https://github.com/nats-io/nats-streaming-server/tree/v0.22.1).
diff --git a/third_party/nats-streaming-docker/amd64/nats-streaming-server b/third_party/nats-streaming-docker/amd64/nats-streaming-server
index dd0ef073ff..467e9039d1 100755
Binary files a/third_party/nats-streaming-docker/amd64/nats-streaming-server and b/third_party/nats-streaming-docker/amd64/nats-streaming-server differ
diff --git a/third_party/nats-streaming-docker/update.sh b/third_party/nats-streaming-docker/update.sh
index ddb5e714a8..8ec1eccbbb 100755
--- a/third_party/nats-streaming-docker/update.sh
+++ b/third_party/nats-streaming-docker/update.sh
@@ -9,33 +9,12 @@ fi
 
 VERSION=$1
 
-# cd to the current directory so the script can be run from anywhere.
 cd `dirname $0`
 
-echo "Fetching and building nats-streaming-server $VERSION..."
+echo "Downloading nats-streaming-server $VERSION..."
 
-# Create a tmp build directory.
-TEMP=/tmp/nats-streaming.build
-mkdir $TEMP
-
-git clone -b $VERSION https://github.com/nats-io/nats-streaming-server $TEMP
-
-docker build -t nats-streaming-builder $TEMP
-
-# Create a dummy nats streaming builder container so we can run a cp against it.
-ID=$(docker create nats-streaming-builder)
-
-# Update the local binaries.
-docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/linux-amd64/nats-streaming-server amd64/
-#docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/linux-arm6/nats-streaming-server arm32v6/
-#docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/linux-arm7/nats-streaming-server arm32v7/
-#docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/linux-arm64/nats-streaming-server arm64v8/
-#docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/win-amd64/nats-streaming-server.exe windows/nanoserver-1809/
-#docker cp $ID:/go/src/github.com/nats-io/nats-streaming-server/pkg/win-amd64/nats-streaming-server.exe windows/windowsservercore/
-
-# Cleanup.
-rm -fr $TEMP
-docker rm -f $ID
-docker rmi nats-streaming-builder
+wget -O nats-streaming-server.tar.gz "https://github.com/nats-io/nats-streaming-server/releases/download/${VERSION}/nats-streaming-server-${VERSION}-linux-amd64.tar.gz" 
+tar -xf nats-streaming-server.tar.gz
+rm nats-streaming-server.tar.gz
 
 echo "Done."
diff --git a/third_party/prometheus-nats-exporter-docker/README.md b/third_party/prometheus-nats-exporter-docker/README.md
index 571e116738..75e42fea0c 100644
--- a/third_party/prometheus-nats-exporter-docker/README.md
+++ b/third_party/prometheus-nats-exporter-docker/README.md
@@ -3,4 +3,4 @@
 This is a partial copy of
 [prometheus-nats-exporter-docker](https://github.com/nats-io/prometheus-nats-exporter/tree/master/docker),
 current version is
-[v0.6.2](https://github.com/nats-io/prometheus-nats-exporter/releases/tag/v0.6.2).
+[v0.8.0](https://github.com/nats-io/prometheus-nats-exporter/releases/tag/v0.8.0).
diff --git a/third_party/prometheus-nats-exporter-docker/amd64/Dockerfile b/third_party/prometheus-nats-exporter-docker/amd64/Dockerfile
index f38c4394f0..a2e1bf42cf 100644
--- a/third_party/prometheus-nats-exporter-docker/amd64/Dockerfile
+++ b/third_party/prometheus-nats-exporter-docker/amd64/Dockerfile
@@ -1,11 +1,7 @@
 # Golang binary building stage
-FROM golang:1.14
-
-# download the source
-WORKDIR /go/src/github.com/nats-io/prometheus-nats-exporter
-RUN git clone --branch v0.6.2 https://github.com/nats-io/prometheus-nats-exporter.git .
-
-# build
+FROM golang:1.16
+WORKDIR $GOPATH/src/github.com/nats-io/prometheus-nats-exporter
+RUN git clone --branch v0.8.0 https://github.com/nats-io/prometheus-nats-exporter.git .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w"
 
 # Final docker image building stage