diff --git a/cloudflare/_headers b/cloudflare/_headers
new file mode 100644
index 00000000..a3b63f1d
--- /dev/null
+++ b/cloudflare/_headers
@@ -0,0 +1,7 @@
+# Remove the ACAO header which is added by default on Cloudflare Pages
+/*
+  ! Access-Control-Allow-Origin
+
+# Add ACAO header for images
+/images/*
+  Access-Control-Allow-Origin: *
diff --git a/package.json b/package.json
index 63c6ec12..b0afbbb8 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "start": "node scripts/serve-local.js",
-    "build": "node scripts/build.js"
+    "build": "node scripts/build.js && cp cloudflare/_headers build/"
   },
   "devDependencies": {
     "@babel/core": "^7.11.1",