diff --git a/space/next.config.js b/space/next.config.js
index 16450199c..18b9275a1 100644
--- a/space/next.config.js
+++ b/space/next.config.js
@@ -3,10 +3,24 @@ require("dotenv").config({ path: ".env" });
 const { withSentryConfig } = require("@sentry/nextjs");
 
 const nextConfig = {
+  async headers() {
+    return [
+      {
+        source: "/",
+        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],
+      },
+    ];
+  },
   basePath: process.env.NEXT_PUBLIC_DEPLOY_WITH_NGINX === "1" ? "/spaces" : "",
   reactStrictMode: false,
   swcMinify: true,
   images: {
+    remotePatterns: [
+      {
+        protocol: "https",
+        hostname: "**",
+      },
+    ],
     unoptimized: true,
   },
   output: "standalone",
diff --git a/web/next.config.js b/web/next.config.js
index 29925a312..e018ea317 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -2,6 +2,14 @@ require("dotenv").config({ path: ".env" });
 const { withSentryConfig } = require("@sentry/nextjs");
 
 const nextConfig = {
+  async headers() {
+    return [
+      {
+        source: "/(.*)?",
+        headers: [{ key: "X-Frame-Options", value: "SAMEORIGIN" }],
+      },
+    ];
+  },
   reactStrictMode: false,
   swcMinify: true,
   images: {