diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml
index b834e11a37..f4ae9bdba1 100644
--- a/.github/workflows/cut-release.yml
+++ b/.github/workflows/cut-release.yml
@@ -53,7 +53,7 @@ jobs:
   release-binaries:
     name: Create Release Binaries
     runs-on: 'ubuntu-latest'
-    container: docker.io/library/golang:1.15
+    container: quay.io/projectquay/golang:1.15
     needs: release-archive
     strategy:
       matrix:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04a382fb51..158b1be2f0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
   tidy:
     name: Tidy
     runs-on: ubuntu-latest
-    container: quay.io/claircore/golang:1.15
+    container: quay.io/projectquay/golang:1.15
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -68,7 +68,7 @@ jobs:
   tests:
     name: Tests
     runs-on: ubuntu-latest
-    container: quay.io/claircore/golang:${{ matrix.go }}
+    container: quay.io/projectquay/golang:${{ matrix.go }}
     env:
       POSTGRES_CONNECTION_STRING: "host=clair-db port=5432 user=clair dbname=clair sslmode=disable"
       RABBITMQ_CONNECTION_STRING: "amqp://guest:guest@clair-rabbitmq:5672/"
diff --git a/Dockerfile b/Dockerfile
index 085541a1f3..b2f6380b5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/claircore/golang:1.15 AS build
+FROM quay.io/projectquay/golang:1.15 AS build
 WORKDIR /build/
 ADD . /build/
 ARG CLAIR_VERSION=dev
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7b9662bb13..be75fdadf5 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -74,7 +74,7 @@ services:
       
   notifier:
     container_name: clair-notifier
-    image: quay.io/claircore/golang:1.15.2
+    image: quay.io/projectquay/golang:1.15.2
     volumes:
       - "./:/src/clair/"
     environment:
@@ -93,7 +93,7 @@ services:
   # this should only be created and deleted via the make target "local-dev-notifier-test"
   notifier-test-mode:
     container_name: clair-notifier
-    image: quay.io/claircore/golang:1.15.2
+    image: quay.io/projectquay/golang:1.15.2
     volumes:
       - "./:/src/clair/"
     environment:
@@ -112,7 +112,7 @@ services:
 
   indexer:
     container_name: clair-indexer
-    image: quay.io/claircore/golang:1.15.2
+    image: quay.io/projectquay/golang:1.15.2
     volumes:
       - "./:/src/clair/"
     environment:
@@ -134,7 +134,7 @@ services:
   ## allows layer fetching over localhost
   indexer-quay:
     container_name: clair-indexer
-    image: quay.io/claircore/golang:1.15.2
+    image: quay.io/projectquay/golang:1.15.2
     volumes:
       - "./:/src/clair/"
     environment:
@@ -155,7 +155,7 @@ services:
 
   matcher:
     container_name: clair-matcher
-    image: quay.io/claircore/golang:1.15.2
+    image: quay.io/projectquay/golang:1.15.2
     volumes:
       - "./:/src/clair/"
     environment: