diff --git a/Dockerfile.ci b/Dockerfile.ci
index 433bb507e..cd854f369 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM gcr.io/distroless/cc
 
 ARG IGGY_CMD_PATH
 RUN test -n "$IGGY_CMD_PATH" || (echo "IGGY_CMD_PATH not set" && false)
diff --git a/Dockerfile.ci.dockerignore b/Dockerfile.ci.dockerignore
new file mode 100644
index 000000000..99e9112c0
--- /dev/null
+++ b/Dockerfile.ci.dockerignore
@@ -0,0 +1,11 @@
+.config
+.github
+/assets
+/local_data
+/certs
+/scripts
+Dockerfile
+docker-compose.yml
+.dockerignore
+.git
+.gitignore
diff --git a/Dockerfile.cross.dockerignore b/Dockerfile.cross.dockerignore
new file mode 100644
index 000000000..99e9112c0
--- /dev/null
+++ b/Dockerfile.cross.dockerignore
@@ -0,0 +1,11 @@
+.config
+.github
+/assets
+/local_data
+/certs
+/scripts
+Dockerfile
+docker-compose.yml
+.dockerignore
+.git
+.gitignore