diff --git a/.github/containers/ci_image/Dockerfile b/.github/containers/Dockerfile
similarity index 100%
rename from .github/containers/ci_image/Dockerfile
rename to .github/containers/Dockerfile
diff --git a/.github/containers/ci_image/Makefile b/.github/containers/Makefile
similarity index 100%
rename from .github/containers/ci_image/Makefile
rename to .github/containers/Makefile
diff --git a/.github/containers/firestore/docker-compose.yml b/.github/containers/firestore/docker-compose.yml
deleted file mode 100644
index d88ad1120f..0000000000
--- a/.github/containers/firestore/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3'
-
-services: 
-  app:
-    image: gcr.io/google.com/cloudsdktool/google-cloud-cli:437.0.1-emulators
-    command: ["gcloud", "emulators", "firestore", "start", "--host-port=0.0.0.0:8080"]
-    ports:
-      - 8080:8080
-      - 8081:8080
diff --git a/.github/containers/ci_image/install-python.sh b/.github/containers/install-python.sh
similarity index 100%
rename from .github/containers/ci_image/install-python.sh
rename to .github/containers/install-python.sh
diff --git a/.github/containers/ci_image/requirements.txt b/.github/containers/requirements.txt
similarity index 100%
rename from .github/containers/ci_image/requirements.txt
rename to .github/containers/requirements.txt
diff --git a/.github/workflows/build-ci-image.yml b/.github/workflows/build-ci-image.yml
index 92cacadcae..5bd0e6f692 100644
--- a/.github/workflows/build-ci-image.yml
+++ b/.github/workflows/build-ci-image.yml
@@ -62,7 +62,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: ${{ github.event_name != 'pull_request' }}
-          context: .github/containers/ci_image
+          context: .github/containers
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}