diff --git a/docker-compose.yaml b/docker-compose.yaml
index ac53a946..95d33170 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
 
   api:
     container_name: 'kernelci-api'
-    image: ${KERNELCI_API_IMAGE:-kernelci/staging-api}:${KERNELCI_API_TAG:-latest}
+    image: ${KERNELCI_API_IMAGE:-kernelci/staging-kernelci}:${KERNELCI_API_TAG:-api}
     ports:
       - '${API_HOST_PORT:-8001}:8000'
     env_file:
diff --git a/test-docker-compose.yaml b/test-docker-compose.yaml
index 513124c4..4575a79a 100644
--- a/test-docker-compose.yaml
+++ b/test-docker-compose.yaml
@@ -8,7 +8,7 @@ services:
 
   api:
     container_name: 'test-kernelci-api'
-    image: '${KERNELCI_API_IMAGE:-kernelci/staging-api}:${KERNELCI_API_TAG:-latest}'
+    image: '${KERNELCI_API_IMAGE:-kernelci/staging-kernelci}:${KERNELCI_API_TAG:-api}'
     ports:
       - '${API_HOST_PORT:-8001}:8000'
     env_file:
@@ -50,7 +50,7 @@ services:
 
   test:
     container_name: 'kernelci-api-tests'
-    image: '${KERNELCI_API_IMAGE:-kernelci/staging-api}:${KERNELCI_API_TAG:-latest}'
+    image: '${KERNELCI_API_IMAGE:-kernelci/staging-kernelci}:${KERNELCI_API_TAG:-api}'
     volumes:
       - './api:/home/kernelci/api'
       - './tests:/home/kernelci/tests'