diff --git a/package.json b/package.json
index 1cf6ff9..4e0ba2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vectorize-io/vectorize-connect",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "description": "A simple package for Google Drive authorization and file selection",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
diff --git a/src/baseOAuth/core/oauth.ts b/src/baseOAuth/core/oauth.ts
index a300df8..158c163 100644
--- a/src/baseOAuth/core/oauth.ts
+++ b/src/baseOAuth/core/oauth.ts
@@ -110,9 +110,10 @@ export abstract class BaseOAuth {
   /**
    * Create an error response for the OAuth callback
    * @param error The error to include in the response
+   * @param nonce Optional nonce for Content Security Policy
    * @returns A Response object with the error
    */
-  protected static createErrorResponse(error: OAuthError): Response {
+  protected static createErrorResponse(error: OAuthError, nonce?: string): Response {
     const htmlContent = `
       <!DOCTYPE html>
       <html>
@@ -122,7 +123,7 @@ export abstract class BaseOAuth {
           body { font-family: Arial, sans-serif; text-align: center; margin-top: 50px; }
           .error { color: #f44336; }
         </style>
-        <script>
+        <script${nonce ? ` nonce="${nonce}"` : ''}>
           window.onload = function() {
             if (window.opener && window.opener.__oauthHandler) {
               const errorObj = ${JSON.stringify({
@@ -130,7 +131,7 @@ export abstract class BaseOAuth {
                 code: error.code,
                 details: error.details
               })};
-              
+
               window.opener.__oauthHandler.onError(
                 new window.opener.__oauthHandler.OAuthError(
                   errorObj.message,
diff --git a/src/baseOAuth/types/index.ts b/src/baseOAuth/types/index.ts
index 864e1d5..39b3ec1 100644
--- a/src/baseOAuth/types/index.ts
+++ b/src/baseOAuth/types/index.ts
@@ -38,6 +38,7 @@ export class OAuthError extends Error {
   export interface OAuthConfig {
     redirectUri: string;
     scopes?: string[];
+    nonce?: string;
     onSuccess?: (selectedFields?: any) => void;
     onError?: (error: OAuthError) => void;
   }
diff --git a/src/baseOAuth/utils/validation.ts b/src/baseOAuth/utils/validation.ts
index 65dd068..0d1871f 100644
--- a/src/baseOAuth/utils/validation.ts
+++ b/src/baseOAuth/utils/validation.ts
@@ -27,9 +27,10 @@ export function validateConfig(config: OAuthConfig): void {
 /**
  * Creates an error response for OAuth callbacks
  * @param error The error to include in the response
+ * @param nonce Optional nonce for Content Security Policy
  * @returns A Response object with the error
  */
-export function createErrorResponse(error: OAuthError): Response {
+export function createErrorResponse(error: OAuthError, nonce?: string): Response {
   const htmlContent = `
     <!DOCTYPE html>
     <html>
@@ -39,7 +40,7 @@ export function createErrorResponse(error: OAuthError): Response {
         body { font-family: Arial, sans-serif; text-align: center; margin-top: 50px; }
         .error { color: #f44336; }
       </style>
-      <script>
+      <script${nonce ? ` nonce="${nonce}"` : ''}>
         window.onload = function() {
           if (window.opener && window.opener.__oauthHandler) {
             const errorObj = ${JSON.stringify({
@@ -47,7 +48,7 @@ export function createErrorResponse(error: OAuthError): Response {
               code: error.code,
               details: error.details
             })};
-            
+
             window.opener.__oauthHandler.onError(
               new window.opener.__oauthHandler.OAuthError(
                 errorObj.message,
diff --git a/src/dropBoxOAuth/core/oauth.ts b/src/dropBoxOAuth/core/oauth.ts
index 82e807e..9aefed2 100644
--- a/src/dropBoxOAuth/core/oauth.ts
+++ b/src/dropBoxOAuth/core/oauth.ts
@@ -95,7 +95,7 @@ export class DropboxOAuth extends BaseOAuth {
   ): Promise<Response> {
     if (error) {
       const errorObj = typeof error === 'string' ? new OAuthError(error, 'CALLBACK_ERROR') : error;
-      return this.createErrorResponse(errorObj);
+      return this.createErrorResponse(errorObj, nonce);
     }
 
     try {
@@ -116,7 +116,8 @@ export class DropboxOAuth extends BaseOAuth {
           error instanceof Error ? error.message : 'Failed to create callback page',
           'CALLBACK_ERROR',
           error
-        )
+        ),
+        nonce
       );
     }
   }
diff --git a/src/dropBoxOAuth/core/selection.ts b/src/dropBoxOAuth/core/selection.ts
index 32606f6..94b66a1 100644
--- a/src/dropBoxOAuth/core/selection.ts
+++ b/src/dropBoxOAuth/core/selection.ts
@@ -50,15 +50,16 @@ export class DropboxSelection extends BaseSelection {
         
         // Generate the Dropbox file picker content
         const content = DropboxPicker.createPickerHTML(
-          { 
+          {
             access_token: tokens.access_token,
             refresh_token: refreshToken,
             expires_in: tokens.expires_in,
             token_type: tokens.token_type
-          }, 
-          config, 
-          refreshToken, 
-          selectedFiles
+          },
+          config,
+          refreshToken,
+          selectedFiles,
+          config.nonce
         );
         
         // Write content to the popup
diff --git a/src/dropBoxOAuth/ui/picker.ts b/src/dropBoxOAuth/ui/picker.ts
index e5ff4a3..4039397 100644
--- a/src/dropBoxOAuth/ui/picker.ts
+++ b/src/dropBoxOAuth/ui/picker.ts
@@ -68,6 +68,7 @@ export class DropboxPicker extends BasePicker {
           script.id = 'dropboxjs';
           script.src = 'https://www.dropbox.com/static/api/2/dropins.js';
           script.setAttribute('data-app-key', '${config.appKey}');
+          ${nonce ? `script.setAttribute('nonce', '${nonce}');` : ''}
           script.onload = () => {
             if (isDropboxAvailable()) {
               resolve(true);
diff --git a/src/googleDriveOAuth/core/oauth.ts b/src/googleDriveOAuth/core/oauth.ts
index 8a0064b..370b72e 100644
--- a/src/googleDriveOAuth/core/oauth.ts
+++ b/src/googleDriveOAuth/core/oauth.ts
@@ -100,7 +100,7 @@ export class GoogleDriveOAuth extends BaseOAuth {
   ): Promise<Response> {
     if (error) {
       const errorObj = typeof error === 'string' ? new OAuthError(error, 'CALLBACK_ERROR') : error;
-      return this.createErrorResponse(errorObj);
+      return this.createErrorResponse(errorObj, nonce);
     }
 
     try {
@@ -121,7 +121,8 @@ export class GoogleDriveOAuth extends BaseOAuth {
           error instanceof Error ? error.message : 'Failed to create callback page',
           'CALLBACK_ERROR',
           error
-        )
+        ),
+        nonce
       );
     }
   }
diff --git a/src/googleDriveOAuth/core/selection.ts b/src/googleDriveOAuth/core/selection.ts
index 792b3b9..748b300 100644
--- a/src/googleDriveOAuth/core/selection.ts
+++ b/src/googleDriveOAuth/core/selection.ts
@@ -51,15 +51,16 @@ export class GoogleDriveSelection extends BaseSelection {
         
         // Generate the Google Drive file picker content
         const content = GoogleDrivePicker.createPickerHTML(
-          { 
+          {
             access_token: tokens.access_token,
             refresh_token: refreshToken,
             expires_in: tokens.expires_in,
             token_type: tokens.token_type
-          }, 
-          config, 
-          refreshToken, 
-          selectedFiles
+          },
+          config,
+          refreshToken,
+          selectedFiles,
+          config.nonce
         );
         
         // Write content to the popup
diff --git a/src/googleDriveOAuth/ui/picker.ts b/src/googleDriveOAuth/ui/picker.ts
index 36e2986..6a4eff5 100644
--- a/src/googleDriveOAuth/ui/picker.ts
+++ b/src/googleDriveOAuth/ui/picker.ts
@@ -140,8 +140,8 @@ export class GoogleDrivePicker extends BasePicker {
 
     // Google-specific head includes
     const googleHead = `
-      <script src="https://apis.google.com/js/api.js"></script>
-      <script src="https://apis.google.com/js/platform.js"></script>
+      <script src="https://apis.google.com/js/api.js"${nonce ? ` nonce="${nonce}"` : ''}></script>
+      <script src="https://apis.google.com/js/platform.js"${nonce ? ` nonce="${nonce}"` : ''}></script>
     `;
 
     // Assemble the complete HTML
diff --git a/src/googleDriveOAuth/utils/validation.ts b/src/googleDriveOAuth/utils/validation.ts
index 6832ba3..d9c1264 100644
--- a/src/googleDriveOAuth/utils/validation.ts
+++ b/src/googleDriveOAuth/utils/validation.ts
@@ -23,9 +23,10 @@ export function validateConfig(config: OAuthConfig): void {
 /**
  * Creates an HTML error response for the OAuth popup
  * @param error The error to embed in the response
+ * @param nonce Optional nonce for Content Security Policy
  * @returns A Response object with the error handling HTML
  */
-export function createErrorResponse(error: OAuthError): Response {
+export function createErrorResponse(error: OAuthError, nonce?: string): Response {
   // Create a plain object with all properties we want to transfer
   const errorData = {
     message: error.message,
@@ -35,7 +36,7 @@ export function createErrorResponse(error: OAuthError): Response {
   };
 
   return new Response(
-    `<script>
+    `<script${nonce ? ` nonce="${nonce}"` : ''}>
       const errorObj = ${JSON.stringify(errorData)};
       window.opener.__oauthHandler?.onError(errorObj);
       window.close();
diff --git a/src/notionOAuth/core/oauth.ts b/src/notionOAuth/core/oauth.ts
index cf18169..b0ad762 100644
--- a/src/notionOAuth/core/oauth.ts
+++ b/src/notionOAuth/core/oauth.ts
@@ -84,16 +84,18 @@ export class NotionOAuth extends BaseOAuth {
    * @param code Authorization code from the OAuth redirect
    * @param config The OAuth configuration
    * @param error Optional error from the OAuth process
+   * @param nonce Optional nonce for Content Security Policy
    * @returns A Response object with the callback page
    */
   public static override async createCallbackResponse(
     code: string,
     config: NotionOAuthConfig,
-    error?: string | OAuthError
+    error?: string | OAuthError,
+    nonce?: string
   ): Promise<Response> {
     if (error) {
       const errorObj = typeof error === 'string' ? new OAuthError(error, 'CALLBACK_ERROR') : error;
-      return this.createErrorResponse(errorObj);
+      return this.createErrorResponse(errorObj, nonce);
     }
 
     try {
@@ -105,8 +107,8 @@ export class NotionOAuth extends BaseOAuth {
       );
 
       // Use the Notion picker template
-      const htmlContent = NotionPicker.createPickerHTML(tokens, config, tokens.access_token);
-      
+      const htmlContent = NotionPicker.createPickerHTML(tokens, config, tokens.access_token, undefined, nonce);
+
       return new Response(htmlContent, { headers: { 'Content-Type': 'text/html' } });
     } catch (error) {
       return this.createErrorResponse(
@@ -114,7 +116,8 @@ export class NotionOAuth extends BaseOAuth {
           error instanceof Error ? error.message : 'Failed to create callback page',
           'CALLBACK_ERROR',
           error
-        )
+        ),
+        nonce
       );
     }
   }
