diff --git a/services/broker/.circleci/config.yml b/services/broker/.circleci/config.yml
index b822c1193..0839518d5 100644
--- a/services/broker/.circleci/config.yml
+++ b/services/broker/.circleci/config.yml
@@ -1,19 +1,12 @@
 version: 2.1
 
 orbs: 
-  docker: circleci/docker@2.0.3
-  ggshield: gitguardian/ggshield@1.1.0
+  docker: circleci/docker@2.5.0
+  ggshield: gitguardian/ggshield@1.1.4
 
 workflows:
   build-and-publish:
     jobs:
-      # - ggshield/scan:
-      #     name: Scan using Gitguardian shield
-      #     base_revision: <<pipeline.git.base_revision>>
-      #     revision: <<pipeline.git.revision>>
-      #     context:
-      #       - gitguardian
-
       - docker/publish:
           name: Build and Publish to Docker Hub
           image: thinxcloud/mosquitto
diff --git a/services/broker/Dockerfile.test b/services/broker/Dockerfile.test
index 55a9f3510..bccbb4202 100644
--- a/services/broker/Dockerfile.test
+++ b/services/broker/Dockerfile.test
@@ -2,9 +2,13 @@ FROM thinxcloud/mosquitto
 
 LABEL name="thinxcloud/mosquitto" version="1.5.8"
 
+RUN RUN apt-get update --fix-missing \
+    && apt-get install -y software-properties-common
+
 # for early testing
-RUN apt-get update --fix-missing \
-    && apt-get install -y software-properties-common \
+RUN wget http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key \
+    && apt-key add mosquitto-repo.gpg.key \
+    && cd /etc/apt/sources.list.d/ && wget http://repo.mosquitto.org/debian/mosquitto-buster.list \
     && apt-add-repository ppa:mosquitto-dev/mosquitto-ppa \
     && apt-get update \
     && apt-get install mosquitto-clients \