diff --git a/src/main/java/com/uid2/admin/vertx/Endpoints.java b/src/main/java/com/uid2/admin/vertx/Endpoints.java
index a5d85d27..414d4377 100644
--- a/src/main/java/com/uid2/admin/vertx/Endpoints.java
+++ b/src/main/java/com/uid2/admin/vertx/Endpoints.java
@@ -132,8 +132,6 @@ public enum Endpoints {
     ADM_SALT("/adm/salt.html"),
     ADM_OPERATOR_KEY("/adm/operator-key.html"),
     ADM_ENCLAVE_ID("/adm/enclave-id.html"),
-    ADM_ENCLAVE_GCP("/adm/enclave-gcp.html"),
-    ADM_ENCLAVE_GCP_V2("/adm/enclave-gcp-v2.html"),
     ADM_PARTNER_CONFIG("/adm/partner-config.html"),
     ADM_KEY_ACL("/adm/key-acl.html");
 
diff --git a/src/main/java/com/uid2/admin/vertx/RequestUtil.java b/src/main/java/com/uid2/admin/vertx/RequestUtil.java
index 6ff39f76..140ad097 100644
--- a/src/main/java/com/uid2/admin/vertx/RequestUtil.java
+++ b/src/main/java/com/uid2/admin/vertx/RequestUtil.java
@@ -17,7 +17,6 @@ public class RequestUtil {
     private final static ImmutableSet<String> SupportedProtocols = ImmutableSet.of(
             "trusted",
             "aws-nitro",
-            "gcp-vmid",
             "gcp-oidc",
             "azure-cc"
     );
diff --git a/webroot/adm/enclave-gcp-v2.html b/webroot/adm/enclave-gcp-v2.html
deleted file mode 100644
index 1be551bb..00000000
--- a/webroot/adm/enclave-gcp-v2.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<html>
-<head>
-  <meta charset="UTF-8">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-  <script src="/js/main.js"></script>
-  <link rel="stylesheet" href="/css/style.css">
-  <style>
-    label.bold {
-      font-weight: bold
-    }
-    .gcp-examples-box {
-      margin-top: 30px;
-      padding: 20px;
-      border: 1px solid #ddd;
-      border-radius: 6px;
-      background-color: #f9f9f9;
-    }
-    .gcp-examples-box h3 {
-      margin-top: 0;
-      margin-bottom: 20px;
-      color: #333;
-      font-size: 20px;
-    }
-    .gcp-examples-box label {
-      font-weight: bold;
-      display: block;
-      margin-top: 20px;
-      margin-bottom: 5px;
-      color: #555;
-    }
-    .gcp-examples-box pre, .gcp-examples-box textarea {
-      margin-bottom: 15px;
-    }
-    .gcp-examples-box pre {
-      background-color: #fff;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-      padding: 10px;
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    }
-    #gcloudCli {
-      width: 100%;
-      height: 200px;
-      resize: vertical;
-      background-color: #fff;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-      padding: 10px;
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    }
-  </style>
-</head>
-<body>
-<h1>UID2 Env - GCP Enclave ID Tool(V2)</h1>
-
-<a href="/">Back</a>
-
-<div class="main-content">
-  <div class="operations-container"></div>
-</div>
-
-<!-- GCP Examples Section - positioned below operations and output -->
-<div class="gcp-examples-box">
-  <h3>Generated Examples</h3>
-  
-  <label for="gcloudCli">Example gcloud command to bring up Confidential Space VM:</label>
-  <textarea id="gcloudCli" name="gcloudCli" readonly></textarea>
-  
-  <label for="enclaveId">Generated GCP Enclave ID:</label>
-  <pre><label id="enclaveId">TBD</label></pre>
-</div>
-
-<script type="module">
-import { initializeOperations } from '/js/component/operations.js';
-import { initializeOutput } from '/js/component/output.js';
-
-document.addEventListener('DOMContentLoaded', function () {
-  const gcloudCli = `$ gcloud compute instances create <INSTANCE_NAME> \\
-    --zone <ZONE> \\
-    --machine-type <MACHINE_TYPE> \\
-    --confidential-compute \\
-    --shielded-secure-boot \\
-    --maintenance-policy Terminate \\
-    --scopes cloud-platform \\
-    --image-project confidential-space-images \\
-    --image-family <IMAGE_FAMILY> \\
-    --service-account <SERVICE_ACCOUNT> \\
-    --metadata ^~^tee-image-reference=us-docker.pkg.dev/uid2-prod-project/iabtechlab/uid2-operator@<IMAGE_SHA>~tee-restart-policy=Never~tee-container-log-redirect=true~tee-env-DEPLOYMENT_ENVIRONMENT=<DEPLOYMENT_ENVIRONMENT>~tee-env-API_TOKEN_SECRET_NAME=<API_TOKEN_SECRET_NAME>`;
-
-  $('#gcloudCli').val(gcloudCli);
-
-  function sha256base64(string) {
-    const utf8 = new TextEncoder().encode(string);
-    return crypto.subtle.digest('SHA-256', utf8).then((hashBuffer) => {
-      return btoa(String.fromCharCode(...new Uint8Array(hashBuffer)));
-    });
-  }
-
-  // Check PolicyValidator.generateEnclaveId for enclaveId generation logic.
-  // image sha: string format "sha256:111111", start with "sha256"
-  // isDebug: true/false
-  function generateEnclaveId(imageSha, isDebug = false) {
-    const str = 'V1,' + isDebug + "," + imageSha;
-    return sha256base64(str);
-  }
-
-  const operationConfig = {
-    write: [
-        {
-          id: 'generateGcpV2EnclaveConfig',
-          title: 'Generate Enclave ID and gcloud command',
-          role: 'elevated',
-          inputs: [
-            {
-              name: 'imageId',
-              label: 'Operator Docker Image ID',
-              required: true,
-              size: 3,
-              placeholder: 'The full digest for the image, with or without \'sha256:\''
-            },
-            {
-              name: 'envId',
-              label: 'Environment',
-              type: 'select',
-              required: true,
-              defaultValue: 'integ',
-              options: [
-                { value: 'integ', label: 'Integration' },
-                { value: 'prod', label: 'Production' }
-              ]
-            },
-            {
-              name: 'debugMode',
-              label: 'Debug Mode (Integration Only)',
-              type: 'checkbox',
-            }
-          ],
-          description: 'Set Debug Mode to true if you want to use DebugMode Confidential Space host image in integration env. (You need to generate a new enclaveId.)',
-          preProcess: async (inputs) => {
-            if (!inputs.imageId) {
-              throw new Error('Operator Docker Image ID is required');
-            }
-
-            let imageSha = inputs.imageId;
-            if (!imageSha.startsWith('sha256:')) {
-              imageSha = 'sha256:' + imageSha;
-            }
-
-            const env = inputs.envId;
-            const isDebug = inputs.debugMode && env !== 'prod'; // Debug mode only allowed for non-prod
-            const isProd = env === 'prod';
-
-            // Generate and display enclave ID
-            const enclaveId = await generateEnclaveId(imageSha, isDebug);
-            document.getElementById('enclaveId').textContent = enclaveId;
-
-            // Update gcloud CLI command
-            const imageFamily = isDebug ? 'confidential-space-debug' : 'confidential-space';
-            const machineType = isProd ? 'n2d-standard-16' : 'n2d-standard-2';
-            let cli = gcloudCli
-              .replaceAll('<MACHINE_TYPE>', machineType)
-              .replaceAll('<IMAGE_FAMILY>', imageFamily)
-              .replaceAll('<IMAGE_SHA>', imageSha)
-              .replaceAll('<DEPLOYMENT_ENVIRONMENT>', env);
-
-            document.getElementById('gcloudCli').value = cli;
-
-            return {
-              ...inputs,
-              processedImageSha: imageSha,
-              enclaveId: enclaveId,
-              isDebug: isDebug,
-              machineType: machineType,
-              imageFamily: imageFamily
-            };
-          },
-          // No API call needed - everything is handled in preProcess
-          postProcess: (response, inputs) => {
-            return {
-              message: 'GCP Enclave V2 configuration generated successfully',
-              imageSha: inputs.processedImageSha,
-              enclaveId: inputs.enclaveId,
-              environment: inputs.envId,
-              debugMode: inputs.isDebug,
-              machineType: inputs.machineType,
-              imageFamily: inputs.imageFamily
-            };
-          }
-        }
-      ]
-  };
-
-  initializeOperations(operationConfig);
-});
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/webroot/adm/enclave-gcp.html b/webroot/adm/enclave-gcp.html
deleted file mode 100644
index a0e15027..00000000
--- a/webroot/adm/enclave-gcp.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<html>
-<head>
-  <meta charset="UTF-8">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-  <script src="/js/main.js"></script>
-  <link rel="stylesheet" href="/css/style.css">
-  <style>
-    .gcp-examples-box {
-      margin-top: 30px;
-      padding: 20px;
-      border: 1px solid #ddd;
-      border-radius: 6px;
-      background-color: #f9f9f9;
-    }
-    .gcp-examples-box h3 {
-      margin-top: 0;
-      margin-bottom: 20px;
-      color: #333;
-      font-size: 20px;
-    }
-    .gcp-examples-box label {
-      font-weight: bold;
-      display: block;
-      margin-top: 20px;
-      margin-bottom: 5px;
-      color: #555;
-    }
-    .gcp-examples-box pre, .gcp-examples-box textarea {
-      margin-bottom: 15px;
-    }
-    .gcp-examples-box pre {
-      background-color: #fff;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-      padding: 10px;
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    }
-    #gcloudCli {
-      width: 100%;
-      height: 200px;
-      resize: vertical;
-      background-color: #fff;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-      padding: 10px;
-      font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
-    }
-  </style>
-</head>
-<body>
-<h1>UID2 Env - GCP Enclave ID Tool</h1>
-
-<a href="/">Back</a>
-
-<div class="main-content">
-  <div class="operations-container"></div>
-</div>
-
-<!-- GCP Examples Section - positioned below operations and output -->
-<div class="gcp-examples-box">
-  <h3>Generated Examples</h3>
-
-  <label for="cloudInitSha256">cloud-init sha256, make sure your downloaded cloud-init config matches exactly the value below:</label>
-  <pre><label id="cloudInitSha256">TBD</label></pre>
-
-  <label for="gcloudCli">Example gcloud command to create GCP Operator Enclave VM:</label>
-  <textarea id="gcloudCli" name="gcloudCli" readonly></textarea>
-
-  <label for="enclaveId">Generated GCP Enclave ID:</label>
-  <pre><label id="enclaveId">TBD</label></pre>
-</div>
-
-<script type="module">
-import { initializeOperations } from '/js/component/operations.js';
-import { initializeOutput } from '/js/component/output.js';
-
-document.addEventListener('DOMContentLoaded', function () {
-  const gcloudCliOrig = `$ sha256sum < ./<CLOUD_INIT_FN> # !!! check if sha256 matches exactly below !!!\\
-<CLOUD_INIT_MD>
-
-$ gcloud compute instances \\
-    create uid2-operator-gcp-01 \\
-    --confidential-compute \\
-    --maintenance-policy Terminate \\
-    --image <DISK_URI> \\
-    --metadata-from-file user-data=./<CLOUD_INIT_FN> \\
-    --tags http-server`;
-
-  $('#gcloudCli').val(gcloudCliOrig);
-
-  const cloudInitInitial = `#cloud-config
-
-bootcmd:
-- iptables -D INPUT -p tcp -m tcp --dport 22 -j ACCEPT
-- iptables -A INPUT -p tcp -m tcp --dport 22 -j DROP
-- systemctl mask --now serial-getty@ttyS0.service
-
-runcmd:
-- systemctl daemon-reload
-- systemctl start uid2-operator.service
-
-write_files:
-- path: /etc/systemd/system/uid2-operator.service
-  permissions: 0644
-  owner: root
-  content: |
-    [Unit]
-    Description=Start UID 2.0 operator as docker container
-
-    [Service]
-    Environment="UID2_ENCLAVE_API_TOKEN=dummy"
-    Environment="UID2_ENCLAVE_IMAGE_ID=dummy"
-    Environment="GHCR_RO_ACCESS_TOKEN=<token>"
-    Environment="HOME=/run/uid2"
-    ExecStartPre=mkdir -p /run/uid2/.config/gcloud
-    ExecStartPre=docker login ghcr.io -u gcp-uid2-docker -p \${GHCR_RO_ACCESS_TOKEN}
-    ExecStartPre=/usr/bin/docker-credential-gcr configure-docker
-    ExecStart=/usr/bin/docker run --rm --name uid2-operator -v /run/uid2/operator.json:/app/conf/config.json -e KUBERNETES_SERVICE_HOST=1 -e core_api_token=\${UID2_ENCLAVE_API_TOKEN} -e optout_api_token=\${UID2_ENCLAVE_API_TOKEN} -p 80:8080 ghcr.io/iabtechlab/uid2-operator@sha256:\${UID2_ENCLAVE_IMAGE_ID}
-    ExecStop=/usr/bin/docker stop uid2-operator
-    ExecStopPost=/usr/bin/docker rm uid2-operator
-- path: /run/uid2/operator.json
-  permissions: 0644
-  owner: root
-  content: |
-    {
-      "clients_metadata_path": "https://core-<environment>.uidapi.com/clients/refresh",
-      "keys_metadata_path": "https://core-<environment>.uidapi.com/key/refresh",
-      "keys_acl_metadata_path": "https://core-<environment>.uidapi.com/key/acl/refresh",
-      "salts_metadata_path": "https://core-<environment>.uidapi.com/salt/refresh",
-      "core_attest_url": "https://core-<environment>.uidapi.com/attest",
-      "optout_metadata_path": "https://optout-<environment>.uidapi.com/optout/refresh",
-      "optout_api_uri": "https://optout-<environment>.uidapi.com/optout/replicate",
-      "optout_s3_folder": "optout-v2/",
-      "optout_inmem_cache": true,
-      "identity_token_expires_after_seconds": 86400,
-      "refresh_token_expires_after_seconds": 2592000,
-      "refresh_identity_token_after_seconds": 3600,
-      "enclave_platform": "gcp-vmid",
-      "enforce_https": true,
-      "service_instances": 16,
-      "allow_legacy_api": false
-    }
-`;
-
-  function sha256hex(string) {
-    const utf8 = new TextEncoder().encode(string);
-    return crypto.subtle.digest('SHA-256', utf8).then((hashBuffer) => {
-      const hashArray = Array.from(new Uint8Array(hashBuffer));
-      const hashHex = hashArray
-        .map((bytes) => bytes.toString(16).padStart(2, '0'))
-        .join('');
-      return hashHex;
-    });
-  }
-
-  function sha256base64(string) {
-    const utf8 = new TextEncoder().encode(string);
-    return crypto.subtle.digest('SHA-256', utf8).then((hashBuffer) => {
-      return btoa(String.fromCharCode(...new Uint8Array(hashBuffer)));
-    });
-  }
-
-  function download(filename, text) {
-    let element = document.createElement('a');
-    element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
-    element.setAttribute('download', filename);
-
-    element.style.display = 'none';
-    document.body.appendChild(element);
-
-    element.click();
-
-    document.body.removeChild(element);
-  }
-
-  function normalizeCloudInit(text) {
-    return text
-      .replace(/([^\n])$/g, '$1\n')
-      .replace(/\n+$/g, '\n');
-  }
-
-  const operationConfig = {
-    write: [
-        {
-          id: 'generateGcpEnclaveConfig',
-          title: 'Generate GCP cloud-init, Enclave ID and gcloud command',
-          role: 'elevated',
-          inputs: [
-
-            {
-              name: 'diskUri',
-              label: 'GCP Disk URI',
-              required: true,
-              size: 3,
-              placeholder: 'To get the latest: gcloud compute images list --filter="name~\'cos-stable\'" --standard-images --uri'
-            },
-            {
-              name: 'apiToken',
-              label: 'Operator Api Key',
-              required: true,
-              size: 3,
-              placeholder: 'Enter the operator API key'
-            },
-            {
-              name: 'imageId',
-              label: 'Operator Docker Image ID',
-              required: true,
-              size: 3,
-              placeholder: 'The full digest for the image, with or without \'sha256:\''
-            },
-            {
-              name: 'envId',
-              label: 'Environment',
-              type: 'select',
-              required: true,
-              size: 1,
-              defaultValue: 'integ',
-              options: [
-                { value: 'integ', label: 'Integration' },
-                { value: 'prod', label: 'Production' }
-              ]
-            },
-            {
-              name: 'accesstokenId',
-              label: 'Docker Registry Access Token',
-              required: true,
-              size: 3,
-              placeholder: 'Personal Access Token that allows read access to ghcr.io'
-            }
-          ],
-          description: 'Generates GCP cloud-init configuration file, calculates Enclave ID, and provides gcloud command for VM creation.<br><br><strong>Note:</strong> The Operator Api Key can be found in <a href="operator-key.html">Operator Key Management</a> using the "Reveal Operator Key" operation.',
-          preProcess: async (inputs) => {
-            const env = inputs.envId;
-            const ghcrAccessToken = inputs.accesstokenId;
-            const ts = Math.floor(new Date() / 1000);
-
-            const fn = 'cloud-init-' + ts + '.yaml';
-            const diskUri = inputs.diskUri;
-
-            let cloudInit = cloudInitInitial;
-            cloudInit = cloudInit.replaceAll('<environment>', env);
-            cloudInit = cloudInit.replaceAll('<token>', ghcrAccessToken);
-            cloudInit = normalizeCloudInit(cloudInit);
-
-            const apiToken = inputs.apiToken;
-
-            let imageId = inputs.imageId;
-            if (imageId.startsWith('sha256:')) {
-              imageId = imageId.replace('sha256:', '');
-            }
-
-            cloudInit = cloudInit
-              .replace(/^([ \t]*Environment=.UID2_ENCLAVE_API_TOKEN)=.*?"$/gm, '$1=' + apiToken + '"')
-              .replace(/^([ \t]*Environment=.UID2_ENCLAVE_IMAGE_ID)=.*?"$/gm, '$1=' + imageId + '"');
-
-            // Download the cloud-init file
-            download(fn, cloudInit);
-
-            // Calculate and display cloud-init SHA256
-            const hex = await sha256hex(cloudInit);
-            document.getElementById('cloudInitSha256').textContent = hex;
-
-            // Update gcloud CLI command
-            const cli = gcloudCliOrig
-              .replaceAll('<CLOUD_INIT_FN>', fn)
-              .replaceAll('<CLOUD_INIT_MD>', hex)
-              .replaceAll('<DISK_URI>', diskUri);
-
-            document.getElementById('gcloudCli').value = cli;
-
-            // Calculate Enclave ID
-            let tplCloudInit = cloudInit;
-            let enclaveParams = "API_TOKEN,IMAGE_ID";
-            if (env == 'prod') {
-              enclaveParams = "API_TOKEN";
-            }
-            const enclaveParamsList = enclaveParams.split(',');
-
-            enclaveParamsList.forEach(p => {
-              const enclaveParam = "UID2_ENCLAVE_" + p;
-              const reMaskParam = new RegExp('^([ \t]*Environment=.' + enclaveParam + ')=.*?"$', 'gm');
-              tplCloudInit = tplCloudInit.replace(reMaskParam, '$1=dummy"');
-            });
-
-            const s1 = await sha256base64(diskUri);
-            const s2 = await sha256base64(tplCloudInit);
-            const enclaveId = await sha256base64(s1 + s2);
-            document.getElementById('enclaveId').textContent = enclaveId;
-
-            return {
-              ...inputs,
-              cloudInitFile: fn,
-              cloudInitHash: hex,
-              enclaveId: enclaveId
-            };
-          },
-          // No API call needed - everything is handled in preProcess
-          postProcess: (response, inputs) => {
-            return {
-              message: 'GCP Enclave configuration generated successfully',
-              cloudInitFile: inputs.cloudInitFile,
-              cloudInitHash: inputs.cloudInitHash,
-              enclaveId: inputs.enclaveId,
-              environment: inputs.envId
-            };
-          }
-        }
-      ]
-  };
-
-  initializeOperations(operationConfig);
-});
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/webroot/index.html b/webroot/index.html
index 561261b6..4f0678c1 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -61,8 +61,6 @@ <h3>Operators</h3>
     <ul>
         <li><a href="/adm/operator-key.html">Operator Key Management</a></li>
         <li><a href="/adm/enclave-id.html">Enclave ID Management</a></li>
-        <li><a href="/adm/enclave-gcp.html">GCP Enclave ID Tool</a></li>
-        <li><a href="/adm/enclave-gcp-v2.html">GCP Enclave ID Tool (V2)</a></li>
         <li><a href="/adm/partner-config.html">OptOut Partner Management</a></li>
     </ul>
 
