diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9619fca9..77a1d6d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,21 +22,21 @@ commands:
           command: |
             export TAG="$(git describe --tags --abbrev=10)"
             docker build images/ -f << parameters.dockerfile-path >> \
-              -t "stackrox/apollo-ci:snapshot-<< parameters.tag-prefix >>$TAG" \
-              -t "stackrox/apollo-ci:<< parameters.tag-prefix >>$TAG"
+              -t "quay.io/cgorman1/apollo-ci:snapshot-<< parameters.tag-prefix >>$TAG" \
+              -t "quay.io/cgorman1/apollo-ci:<< parameters.tag-prefix >>$TAG"
 
       - run:
           name: Push image
           command: |
-            docker login -u "$DOCKER_IO_PUSH_USERNAME" -p "$DOCKER_IO_PUSH_PASSWORD"
+            docker login -u "$QUAY_CGORMAN1_RW_USER" -p "$QUAY_CGORMAN1_RW_PASSWORD" quay.io
 
             export TAG="<< parameters.tag-prefix >>$(git describe --tags --abbrev=10)"
             if [[ $CIRCLE_BRANCH = master || -n $CIRCLE_TAG ]]; then
               echo "Pushing release image"
-              image_to_push="stackrox/apollo-ci:$TAG"
+              image_to_push="quay.io/cgorman1/apollo-ci:$TAG"
             else
               echo "Pushing snapshot image"
-              image_to_push="stackrox/apollo-ci:snapshot-$TAG"
+              image_to_push="quay.io/cgorman1/apollo-ci:snapshot-$TAG"
             fi
             docker push "${image_to_push}" | cat
             echo "${image_to_push}" > /tmp/pushed_image
@@ -84,7 +84,7 @@ jobs:
           git checkout "${branch_name}" || git checkout -b "${branch_name}"
           git reset --hard origin/HEAD
 
-          sed -i 's@stackrox/apollo-ci:.*@'"${pushed_image}"' # TODO(do not merge): After upstream PR is merged, cut a tag and update this@g' .circleci/config.yml
+          sed -i 's@quay.io/cgorman1/apollo-ci:.*@'"${pushed_image}"' # TODO(do not merge): After upstream PR is merged, cut a tag and update this@g' .circleci/config.yml
           git commit -am "Bump base image to ${pushed_image##:}"
           git push origin "${branch_name}" --force
 
@@ -113,24 +113,23 @@ workflows:
   build:
     jobs:
     - build-and-push-rox:
-        context: docker-io-push
+        context: quay-cgorman1-readwrite
         filters:
           tags:
             only: /.*/
     - create-or-update-dependent-rox-pr:
-        context: docker-io-pull
         filters:
           branches:
             ignore: master
         requires:
         - build-and-push-rox
     - build-and-push-collector:
-        context: docker-io-push
+        context: quay-cgorman1-readwrite
         filters:
           tags:
             only: /.*/
     - build-and-push-jenkins-plugin:
-        context: docker-io-push
+        context: quay-cgorman1-readwrite
         filters:
           tags:
             only: /.*/
diff --git a/images/Dockerfile.rox b/images/Dockerfile.rox
index 0622b1a3..90ae6767 100644
--- a/images/Dockerfile.rox
+++ b/images/Dockerfile.rox
@@ -112,8 +112,8 @@ RUN set -ex \
 
 # Install Go
 # https://golang.org/dl/
-ARG GOLANG_VERSION=1.16.5
-ARG GOLANG_SHA256=b12c23023b68de22f74c0524f10b753e7b08b1504cb7e417eccebdd3fae49061
+ARG GOLANG_VERSION=1.16.7
+ARG GOLANG_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
 ENV GOPATH=/go
 ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
 RUN set -ex \